[Ns-developers] Current Merge Queue for Ns-3.6 Release

[Gustavo Carneiro]

2009/9/15 <craigdo at ee.washington.edu>

>
> Hi All,
>
> Good (very early) morning from your friendly neighborhood ns-3.6 release
> manager.
>
> The following new features have now been merged into ns-3-dev:
>
> 1. Testing and Validation Framework
> 2. PacketBB (RFC 5444)
> 3. 802.11s Mesh Model
>
> The merge queue is now empty.  Now is your chance to get your new feature
> submission integrated into ns-3.6!  The cutoff date is close of business
> (as
> you can see, I close business around Midnight) on Wednesday.
>
> The list of unresolved candidates for merge is:
>
> 1. Flow Monitor
> 2. Nix-Vector Routing
> 3. WiMAX Models
> 4. Multi-Channels in YANS Wifi Phy
> 5. NetAnim Animator Support
> 6. Patch to Pause and Resume an Interface
>
> Who wants to go next?  Time is running very short ...
>

I think I am ready to merge Flow Monitor.

Just to make sure I do not introduce surprising changes, I recently aligned
Ipv6L3Protocol::Drop with the modifications I had done for
Ipv4L3Protocol::Drop.

Mathieu had already remarked earlier, in ns-3-reviews, that there is some
inconsistency with Ipv4L3Protocol trace sources: Drop and the new trace
sources include a separate IP header and the packet without the header,
while Tx and Rx include the packet with header already added.  I did not
touch Tx and Rx because I do not need them, but if asked I am willing to
quickly align Tx and Rx with Drop, i.e. pass the header separated from the
packet payload.

If none of the above is of great concern, I'd like to request to merge Flow
Monitor anyway.  It'd be a pity to miss the 3.6 boat...

Thanks,

-- 
Gustavo J. A. M. Carneiro
INESC Porto, Telecommunications and Multimedia Unit
"The universe is always one step beyond logic." -- Frank Herbert