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

Adding a figure describing the wimax architecture

Browse Source
This commit is contained in:
Mohamed Amine Ismail
2010-03-16 10:49:16 +01:00
parent 32e966df92
commit 448f5cf6f0
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/WimaxArchitecture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

2
examples/wimax/wimax-simple.cc
View File

@@ -153,6 +153,8 @@ int main (int argc, char *argv[])
clientApps.Stop (Seconds (duration));
Simulator::Stop (Seconds (duration + 0.1));
wimax.EnablePcap("ss0", ssNodes.Get (0)->GetId (), ss[0]->GetIfIndex ());
wimax.EnablePcap("ss1", ssNodes.Get (0)->GetId (), ss[0]->GetIfIndex ());
IpcsClassifierRecord DlClassifierUgs (Ipv4Address ("0.0.0.0"),
Ipv4Mask ("0.0.0.0"),

13
src/devices/wimax/wimax-mac-to-mac-header.cc
View File

@@ -74,7 +74,16 @@ WimaxMacToMacHeader::GetSizeOfLen (void) const
uint32_t
WimaxMacToMacHeader::GetSerializedSize (void) const
{
return 20 + GetSizeOfLen () ;
uint8_t sizeOfLen = GetSizeOfLen ();
if (sizeOfLen==1)
{
return 20 ;
}
else
{
return 20 + sizeOfLen -1 ;
}
//return 19+sizeOfLen;
}
void
@@ -112,7 +121,7 @@ WimaxMacToMacHeader::Serialize (Buffer::Iterator i) const
}
else
{
i.WriteU8 ((lenSize - 1) | 0x80);
i.WriteU8 ((lenSize-1) | 0x80);
for (int j = 0; j < lenSize - 1; j++)
{
i.WriteU8 ((uint8_t)(m_len >> ((lenSize - 1 - 1 - j) * 8)));

2
src/devices/wimax/wimax-tlv.cc
View File

@@ -121,7 +121,7 @@ Tlv::Serialize (Buffer::Iterator i) const
}
else
{
i.WriteU8 ((lenSize - 1) | WIMAX_TLV_EXTENDED_LENGTH_MASK);
i.WriteU8 ((lenSize-1) | WIMAX_TLV_EXTENDED_LENGTH_MASK);
for (int j = 0; j < lenSize - 1; j++)
{
i.WriteU8 ((uint8_t)(m_length >> ((lenSize - 1 - 1 - j) * 8)));

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

@@ -545,7 +545,7 @@ static void PcapSniffTxEvent (Ptr<PcapFileWrapper> file,
std::list<Ptr<Packet> > packets = burst->GetPackets ();
for (std::list<Ptr<Packet> >::iterator iter = packets.begin (); iter != packets.end (); ++iter)
{
WimaxMacToMacHeader m2m((*iter)->GetSize()+1);
WimaxMacToMacHeader m2m((*iter)->GetSize());
(*iter)->AddHeader(m2m);
file->Write (Simulator::Now (), (*iter));
}
@@ -556,7 +556,7 @@ static void PcapSniffRxEvent (Ptr<PcapFileWrapper> file, Ptr<const PacketBurst>
std::list<Ptr<Packet> > packets = burst->GetPackets ();
for (std::list<Ptr<Packet> >::iterator iter = packets.begin (); iter != packets.end (); ++iter)
{
WimaxMacToMacHeader m2m((*iter)->GetSize()+1);
WimaxMacToMacHeader m2m((*iter)->GetSize());
(*iter)->AddHeader(m2m);
file->Write (Simulator::Now (), (*iter));
}