[Ns-developers] ns-3.4 : Final Steps

[craigdo@ee.washington.edu]

> > ======Tracing======
> > There are 2 bugs related to tracing (443 and 505).  The main one is
> > the trace source rework of bug 443.  It is queued up for merge at:
> > http://code.nsnam.org/craigdo/ns-3-tracing
> > This needs a little review, and I have not seen any further comments
> > from others.
> 
> I reviewed the src/devices/wifi part of the last version: 

Thanks for getting to this so quickly, Mathieu.

> there are a
> couple of uneeded changes:
> 
> and wifi-net-device.h:
> void SniffPacket (Ptr<const Packet> packet, Mac48Address to,
> Mac48Address from, uint16_t type);
> 
> wifi-net-device.cc:
> +#include "ns3/ethernet-header.h"
> +#include "ns3/ethernet-trailer.h"

Done and done.

> and, in wifi-net-device.cc: are you sure you need the copy below ?
> 
> -      m_promiscRx (this, packet, llc.GetType (), from, to, type);
> +      m_promiscRx (this, packet->Copy (), llc.GetType (), from, to,
> type);

This was not necessary.  It prompted me to do a sweep through the devices
looking for packet copies and I found a few other instances and fixed them
as well.

I updated CHANGES.html, so ...

Raj, how do you want to proceed with merging this.  There will be massive
trace file changes, so it is probably best if you just let me have ns-3-dev
for a couple of hours and let me get everything tested, consistent and then
plugged back together.  Sound good?

-- Craig