F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 985: WiMAX Invalid management message type on wimax-simple

Browse Source
This commit is contained in:
Flavio Kubota
2010-12-28 22:23:38 -02:00
parent a23f3761d6
commit 4eaecca5ee
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/helper/wimax-helper.cc
View File

@@ -545,26 +545,16 @@ WimaxHelper::EnableAsciiInternal (Ptr<OutputStreamWrapper> stream,
}
static void PcapSniffTxEvent (Ptr<PcapFileWrapper> file,
static void PcapSniffTxRxEvent (Ptr<PcapFileWrapper> file,
Ptr<const PacketBurst> burst)
{
std::list<Ptr<Packet> > packets = burst->GetPackets ();
for (std::list<Ptr<Packet> >::iterator iter = packets.begin (); iter != packets.end (); ++iter)
{
WimaxMacToMacHeader m2m ((*iter)->GetSize ());
(*iter)->AddHeader (m2m);
file->Write (Simulator::Now (), (*iter));
}
}
static void PcapSniffRxEvent (Ptr<PcapFileWrapper> file, Ptr<const PacketBurst> burst)
{
std::list<Ptr<Packet> > packets = burst->GetPackets ();
for (std::list<Ptr<Packet> >::iterator iter = packets.begin (); iter != packets.end (); ++iter)
{
WimaxMacToMacHeader m2m ((*iter)->GetSize ());
(*iter)->AddHeader (m2m);
file->Write (Simulator::Now (), (*iter));
Ptr<Packet> p = (*iter)->Copy ();
WimaxMacToMacHeader m2m (p->GetSize ());
p->AddHeader (m2m);
file->Write (Simulator::Now (), p);
}
}
@@ -597,8 +587,8 @@ WimaxHelper::EnablePcapInternal (std::string prefix, Ptr<NetDevice> nd, bool exp
Ptr<PcapFileWrapper> file = pcapHelper.CreateFile (filename, std::ios::out, PcapHelper::DLT_EN10MB);
phy->TraceConnectWithoutContext ("Tx", MakeBoundCallback (&PcapSniffTxEvent, file));
phy->TraceConnectWithoutContext ("Rx", MakeBoundCallback (&PcapSniffRxEvent, file));
phy->TraceConnectWithoutContext ("Tx", MakeBoundCallback (&PcapSniffTxRxEvent, file));
phy->TraceConnectWithoutContext ("Rx", MakeBoundCallback (&PcapSniffTxRxEvent, file));
}
} // namespace ns3