Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@lalithsuresh
lalithsuresh committed Mar 29, 2011
2 parents f4c2e86 + 2f769ce commit e32b172
Show file tree
Hide file tree
Showing 14 changed files with 690 additions and 559 deletions.
2 changes: 1 addition & 1 deletion bindings/python/wscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def set_options(opt):
choices=c,
help=("Type of Python bindings to build %r. "
"Warning: the modular bindings are still experimental." % (c,)),
default="monolithic",
default="modular",
dest='bindings_type')
opt.add_option('--disable-python',
help=("Don't build Python bindings."),
Expand Down
290 changes: 0 additions & 290 deletions src/olsr/model/olsr-header.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,293 +501,3 @@ MessageHeader::Hna::Deserialize (Buffer::Iterator start, uint32_t messageSize)

}} // namespace olsr, ns3

#include "ns3/test.h"
#include "ns3/packet.h"

namespace ns3 {

class OlsrEmfTestCase : public TestCase {
public:
OlsrEmfTestCase ();
virtual void DoRun (void);
};

OlsrEmfTestCase::OlsrEmfTestCase ()
: TestCase ("Check Emf olsr time conversion")
{}
void
OlsrEmfTestCase::DoRun (void)
{
for (int time = 1; time <= 30; time++)
{
uint8_t emf = olsr::SecondsToEmf (time);
double seconds = olsr::EmfToSeconds (emf);
NS_TEST_ASSERT_MSG_EQ((seconds < 0 || fabs (seconds - time) > 0.1), false,
"XXX");
}
}


class OlsrMidTestCase : public TestCase {
public:
OlsrMidTestCase ();
virtual void DoRun (void);
};

OlsrMidTestCase::OlsrMidTestCase ()
: TestCase ("Check Mid olsr messages")
{}
void
OlsrMidTestCase::DoRun (void)
{
Packet packet;

{
olsr::PacketHeader hdr;
olsr::MessageHeader msg1;
olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
olsr::MessageHeader msg2;
olsr::MessageHeader::Mid &mid2 = msg2.GetMid ();

// MID message #1
{
std::vector<Ipv4Address> &addresses = mid1.interfaceAddresses;
addresses.clear ();
addresses.push_back (Ipv4Address ("1.2.3.4"));
addresses.push_back (Ipv4Address ("1.2.3.5"));
}

msg1.SetTimeToLive (255);
msg1.SetOriginatorAddress (Ipv4Address ("11.22.33.44"));
msg1.SetVTime (Seconds (9));
msg1.SetMessageSequenceNumber (7);

// MID message #2
{
std::vector<Ipv4Address> &addresses = mid2.interfaceAddresses;
addresses.clear ();
addresses.push_back (Ipv4Address ("2.2.3.4"));
addresses.push_back (Ipv4Address ("2.2.3.5"));
}

msg2.SetTimeToLive (254);
msg2.SetOriginatorAddress (Ipv4Address ("12.22.33.44"));
msg2.SetVTime (Seconds (10));
msg2.SetMessageType (olsr::MessageHeader::MID_MESSAGE);
msg2.SetMessageSequenceNumber (7);

// Build an OLSR packet header
hdr.SetPacketLength (hdr.GetSerializedSize () + msg1.GetSerializedSize () + msg2.GetSerializedSize ());
hdr.SetPacketSequenceNumber (123);


// Now add all the headers in the correct order
packet.AddHeader (msg2);
packet.AddHeader (msg1);
packet.AddHeader (hdr);
}

{
olsr::PacketHeader hdr;
packet.RemoveHeader (hdr);
NS_TEST_ASSERT_MSG_EQ (hdr.GetPacketSequenceNumber (), 123, "XXX");
uint32_t sizeLeft = hdr.GetPacketLength () - hdr.GetSerializedSize ();
{
olsr::MessageHeader msg1;

packet.RemoveHeader (msg1);

NS_TEST_ASSERT_MSG_EQ (msg1.GetTimeToLive (), 255, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetOriginatorAddress (), Ipv4Address ("11.22.33.44"), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetVTime (), Seconds (9), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg1.GetMessageSequenceNumber (), 7, "XXX");

olsr::MessageHeader::Mid &mid1 = msg1.GetMid ();
NS_TEST_ASSERT_MSG_EQ (mid1.interfaceAddresses.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (*mid1.interfaceAddresses.begin (), Ipv4Address ("1.2.3.4"), "XXX");

sizeLeft -= msg1.GetSerializedSize ();
NS_TEST_ASSERT_MSG_EQ((sizeLeft > 0), true, "XXX");
}
{
// now read the second message
olsr::MessageHeader msg2;

packet.RemoveHeader (msg2);

NS_TEST_ASSERT_MSG_EQ (msg2.GetTimeToLive (), 254, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetOriginatorAddress (), Ipv4Address ("12.22.33.44"), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetVTime (), Seconds (10), "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageType (), olsr::MessageHeader::MID_MESSAGE, "XXX");
NS_TEST_ASSERT_MSG_EQ (msg2.GetMessageSequenceNumber (), 7, "XXX");

olsr::MessageHeader::Mid mid2 = msg2.GetMid ();
NS_TEST_ASSERT_MSG_EQ (mid2.interfaceAddresses.size (), 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (*mid2.interfaceAddresses.begin (), Ipv4Address ("2.2.3.4"), "XXX");

sizeLeft -= msg2.GetSerializedSize ();
NS_TEST_ASSERT_MSG_EQ (sizeLeft, 0, "XXX");
}
}
}


class OlsrHelloTestCase : public TestCase {
public:
OlsrHelloTestCase ();
virtual void DoRun (void);
};

OlsrHelloTestCase::OlsrHelloTestCase ()
: TestCase ("Check Hello olsr messages")
{}
void
OlsrHelloTestCase::DoRun (void)
{
Packet packet;
olsr::MessageHeader msgIn;
olsr::MessageHeader::Hello &helloIn = msgIn.GetHello ();

helloIn.SetHTime (Seconds (7));
helloIn.willingness = 66;

{
olsr::MessageHeader::Hello::LinkMessage lm1;
lm1.linkCode = 2;
lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.4"));
lm1.neighborInterfaceAddresses.push_back (Ipv4Address ("1.2.3.5"));
helloIn.linkMessages.push_back (lm1);

olsr::MessageHeader::Hello::LinkMessage lm2;
lm2.linkCode = 3;
lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.4"));
lm2.neighborInterfaceAddresses.push_back (Ipv4Address ("2.2.3.5"));
helloIn.linkMessages.push_back (lm2);
}

packet.AddHeader (msgIn);

olsr::MessageHeader msgOut;
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Hello &helloOut = msgOut.GetHello ();

NS_TEST_ASSERT_MSG_EQ (helloOut.GetHTime (), Seconds (7), "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.willingness, 66, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages.size (), 2, "XXX");

NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].linkCode, 2, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[0],
Ipv4Address ("1.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[0].neighborInterfaceAddresses[1],
Ipv4Address ("1.2.3.5"), "XXX");

NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].linkCode, 3, "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[0],
Ipv4Address ("2.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (helloOut.linkMessages[1].neighborInterfaceAddresses[1],
Ipv4Address ("2.2.3.5"), "XXX");

NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");

}

class OlsrTcTestCase : public TestCase {
public:
OlsrTcTestCase ();
virtual void DoRun (void);
};

OlsrTcTestCase::OlsrTcTestCase ()
: TestCase ("Check Tc olsr messages")
{}
void
OlsrTcTestCase::DoRun (void)
{
Packet packet;
olsr::MessageHeader msgIn;
olsr::MessageHeader::Tc &tcIn = msgIn.GetTc ();

tcIn.ansn = 0x1234;
tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.4"));
tcIn.neighborAddresses.push_back (Ipv4Address ("1.2.3.5"));
packet.AddHeader (msgIn);

olsr::MessageHeader msgOut;
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Tc &tcOut = msgOut.GetTc ();

NS_TEST_ASSERT_MSG_EQ (tcOut.ansn, 0x1234, "XXX");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses.size (), 2, "XXX");

NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[0],
Ipv4Address ("1.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (tcOut.neighborAddresses[1],
Ipv4Address ("1.2.3.5"), "XXX");

NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "XXX");

}

class OlsrHnaTestCase : public TestCase {
public:
OlsrHnaTestCase ();
virtual void DoRun (void);
};

OlsrHnaTestCase::OlsrHnaTestCase ()
: TestCase ("Check Hna olsr messages")
{}

void
OlsrHnaTestCase::DoRun (void)
{
Packet packet;
olsr::MessageHeader msgIn;
olsr::MessageHeader::Hna &hnaIn = msgIn.GetHna ();

hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
{ Ipv4Address ("1.2.3.4"), Ipv4Mask ("255.255.255.0")});
hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association)
{Ipv4Address ("1.2.3.5"), Ipv4Mask ("255.255.0.0")});
packet.AddHeader (msgIn);

olsr::MessageHeader msgOut;
packet.RemoveHeader (msgOut);
olsr::MessageHeader::Hna &hnaOut = msgOut.GetHna ();

NS_TEST_ASSERT_MSG_EQ (hnaOut.associations.size (), 2, "XXX");

NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].address,
Ipv4Address ("1.2.3.4"), "XXX");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[0].mask,
Ipv4Mask ("255.255.255.0"), "XXX");

NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].address,
Ipv4Address ("1.2.3.5"), "XXX");
NS_TEST_ASSERT_MSG_EQ (hnaOut.associations[1].mask,
Ipv4Mask ("255.255.0.0"), "XXX");

NS_TEST_ASSERT_MSG_EQ (packet.GetSize (), 0, "All bytes in packet were not read");

}


static class OlsrTestSuite : public TestSuite
{
public:
OlsrTestSuite ();
} g_olsrTestSuite;

OlsrTestSuite::OlsrTestSuite()
: TestSuite("routing-olsr-header", UNIT)
{
AddTestCase(new OlsrHnaTestCase());
AddTestCase(new OlsrTcTestCase());
AddTestCase(new OlsrHelloTestCase());
AddTestCase(new OlsrMidTestCase());
AddTestCase(new OlsrEmfTestCase());
}

} // namespace ns3

Loading

0 comments on commit e32b172

Please sign in to comment.