[Click] Click defines in ns3

[Sascha Alexander Jopen]

Hey,

the patch i submitted is missing a critical part. Currently, only a
single node can be configured with defines and all following nodes are
configured with the same defines. The attached patch fixes this.

Sorry for the inconvenience,
Sascha

On 06.02.2013 16:18, Eddie Kohler wrote:
> The Click part looks good to me, and I've merged it!
> E
> 
> 
> On Sat, Jan 26, 2013 at 2:28 PM, Sascha Alexander Jopen
> <jopen at informatik.uni-bonn.de> wrote:
>> Hi,
>>
>> this is another version of the click defines for ns3 patchset. It makes
>> use of simclick_sim_command to fetch the defines from ns3 at click
>> router instantiation time. This way ns2 or older ns3 variants are not
>> affected, they only do not provide defines.
>>
>> This patchset is to be applied on top of the rng support patchset.
>> Please  review this one for inclusion into click and ns3.
>>
>> Sascha
>>
>> On 23.01.2013 17:36, Sascha Alexander Jopen wrote:
>>> Hey,
>>>
>>> with the current implementation on the ns3 side, using
>>> simclick_click_command is only possible after an instance of the click
>>> router has been created (Ipv4ClickRouting::DoStart ()). However, we
>>> already need the defines at this time to instantiate the router.
>>> I'll try to rearrange this and implement defines the way you suggested,
>>> keeping the API stable.
>>>
>>> Sascha
>>>
>>> On 23.01.2013 16:46, Eddie Kohler wrote:
>>>> Hey,
>>>>
>>>> I'm always bummed out by API changes that require people to keep two
>>>> packages precisely up to date and will therefore request some changes.
>>>>
>>>> (1) Add a new SIMCLICK comamnd constant, SIMCLICK_DEFINE or
>>>> SIMCLICK_CREATE_DEFINE, your choice.
>>>> (2) Change simclick_click_command so that SIMCLICK_SUPPORTS reports
>>>> true for SIMCLICK_DEFINE
>>>> (3) Implement definition support via SIMCLICK_DEFINE, which will
>>>> require changes to click and to ns.
>>>>
>>>> Make sense?
>>>> Eddie
>>>>
>>>>
>>>> On Wed, Jan 23, 2013 at 6:56 AM, Sascha Alexander Jopen
>>>> <jopen at informatik.uni-bonn.de> wrote:
>>>>> Hi,
>>>>>
>>>>> i think this has nothing to do with the Click defines patchset. Please
>>>>> use a new thread for your questions.
>>>>>
>>>>> How packet processing is done in your application depends on the type
>>>>> and format of your packets. There are standard elements in click to deal
>>>>> with Ethernet or IP packets, for example. See
>>>>> http://read.cs.ucla.edu/click/elements
>>>>> For processing of application layer data, you have to write your own
>>>>> elements. See http://www.read.cs.ucla.edu/gitweb?p=click;a=blob;f=FAQ
>>>>> and http://www.read.cs.ucla.edu/click/learning
>>>>>
>>>>> Regards,
>>>>> Sascha
>>>>>
>>>>> On 23.01.2013 11:46, karthick m wrote:
>>>>>> Hi sascha,
>>>>>>
>>>>>>             I am implementing my own publish subscribe architecture using
>>>>>> click router. For that i need to work on packets. Say a publisher is
>>>>>> sending a publish packet, i have to see the packet data and process packet
>>>>>> according to the data and route it.  The problem is that, i do not find any
>>>>>> element which does packet processing for example. Could you please give me
>>>>>> a pointer to it. Thanks in advance.
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Dipl.-Inform. Sascha Jopen
>>>>>
>>>>> University of Bonn                     Tel.:   +49-228-73-54219
>>>>> Institute of Computer Science 4        Fax:    +49-228-73-4571
>>>>> Friedrich-Ebert-Allee 144              E-mail: jopen at cs.uni-bonn.de
>>>>> D-53113 Bonn, Germany
>>>>> _______________________________________________
>>>>> click mailing list
>>>>> click at amsterdam.lcs.mit.edu
>>>>> https://amsterdam.lcs.mit.edu/mailman/listinfo/click
>>>
>>>
>>
>>
>> --
>> Dipl.-Inform. Sascha Jopen
>>
>> University of Bonn                     Tel.:   +49-228-73-54219
>> Institute of Computer Science 4        Fax:    +49-228-73-4571
>> Friedrich-Ebert-Allee 144              E-mail: jopen at cs.uni-bonn.de
>> D-53113 Bonn, Germany
>>
>> _______________________________________________
>> click mailing list
>> click at amsterdam.lcs.mit.edu
>> https://amsterdam.lcs.mit.edu/mailman/listinfo/click
>>


-- 
Dipl.-Inform. Sascha Jopen

University of Bonn                     Tel.:   +49-228-73-54219
Institute of Computer Science 4        Fax:    +49-228-73-4571
Friedrich-Ebert-Allee 144              E-mail: jopen at cs.uni-bonn.de
D-53113 Bonn, Germany
-------------- next part --------------
diff --git a/ns/nsclick.cc b/ns/nsclick.cc
index 3ebc61c..4cfd0ae 100644
--- a/ns/nsclick.cc
+++ b/ns/nsclick.cc
@@ -144,6 +144,7 @@ int simclick_click_create(simclick_node_t *simnode, const char* router_file) {
     }
 
     Router *r = click_read_router(router_file, false, errh, false);
+    click_lexer()->global_scope().clear();
     simnode->clickinfo = r;
     if (!r)
 	return errh->fatal("%s: not a valid router", router_file);