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

Merge with ns-3-dev and fix doxygen.

Browse Source
This commit is contained in:
Sebastien Vincent
2009-11-15 11:30:20 +01:00
parent 875145ac3a 1444849d7b
commit 4eef9e4fb8
122 changed files with 2846 additions and 2082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/routing/list-routing/ipv4-list-routing.cc
View File

@@ -68,6 +68,19 @@ Ipv4ListRouting::DoDispose (void)
m_ipv4 = 0;
}
void
Ipv4ListRouting::DoStart (void)
{
for (Ipv4RoutingProtocolList::iterator rprotoIter = m_routingProtocols.begin ();
rprotoIter != m_routingProtocols.end (); rprotoIter++)
{
Ptr<Ipv4RoutingProtocol> protocol = (*rprotoIter).second;
protocol->Start ();
}
Ipv4RoutingProtocol::DoStart ();
}
Ptr<Ipv4Route>
Ipv4ListRouting::RouteOutput (Ptr<Packet> p, const Ipv4Header &header, uint32_t oif, enum Socket::SocketErrno &sockerr)
{

1
src/routing/list-routing/ipv4-list-routing.h
View File

@@ -88,6 +88,7 @@ public:
protected:
void DoDispose (void);
void DoStart (void);
private:
typedef std::pair<int16_t, Ptr<Ipv4RoutingProtocol> > Ipv4RoutingProtocolEntry;
typedef std::list<Ipv4RoutingProtocolEntry> Ipv4RoutingProtocolList;

2
src/routing/olsr/olsr-header.cc
View File

@@ -785,7 +785,7 @@ public:
} g_olsrTestSuite;
OlsrTestSuite::OlsrTestSuite()
: TestSuite("olsr-routing", UNIT)
: TestSuite("routing-olsr-header", UNIT)
{
AddTestCase(new OlsrHnaTestCase());
AddTestCase(new OlsrTcTestCase());

137
src/routing/olsr/olsr-routing-protocol.cc
View File

@@ -213,8 +213,6 @@ RoutingProtocol::SetIpv4 (Ptr<Ipv4> ipv4)
m_linkTupleTimerFirstTime = true;
m_ipv4 = ipv4;
Simulator::ScheduleNow (&RoutingProtocol::Start, this);
}
void RoutingProtocol::DoDispose ()
@@ -231,7 +229,7 @@ void RoutingProtocol::DoDispose ()
Ipv4RoutingProtocol::DoDispose ();
}
void RoutingProtocol::Start ()
void RoutingProtocol::DoStart ()
{
if (m_mainAddress == Ipv4Address ())
{
@@ -716,6 +714,10 @@ RoutingProtocol::MprComputation()
if (max == NULL || nb_tuple->willingness > max->willingness)
{
max = nb_tuple;
for (TwoHopNeighborSet::iterator newCovered = N2.begin (); newCovered != N2.end (); newCovered++)
{
coveredTwoHopNeighbors.insert (newCovered->twoHopNeighborAddr);
}
max_r = r;
}
else if (nb_tuple->willingness == max->willingness)
@@ -740,11 +742,12 @@ RoutingProtocol::MprComputation()
if (max != NULL)
{
mprSet.insert (max->neighborMainAddr);
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin ();
twoHopNeigh != N2.end (); )
// Remove the nodes from N2 which are now covered by a node in the MPR set.
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); )
{
if (twoHopNeigh->neighborMainAddr == max->neighborMainAddr)
if (coveredTwoHopNeighbors.find (twoHopNeigh->twoHopNeighborAddr) != coveredTwoHopNeighbors.end ())
{
NS_LOG_LOGIC ("2-hop neigh. " << twoHopNeigh->twoHopNeighborAddr << " is already covered by an MPR.");
twoHopNeigh = N2.erase (twoHopNeigh);
}
else
@@ -2780,6 +2783,128 @@ RoutingProtocol::GetEntries () const
}
return retval;
}
OlsrMprTestCase::OlsrMprTestCase ()
: TestCase ("Check OLSR MPR computing mechanism")
{
}
OlsrMprTestCase::~OlsrMprTestCase ()
{
}
bool
OlsrMprTestCase::DoRun ()
{
/*
* Create a 3x3 grid like the following:
* 3---6---9
* |\ /|\ /|
* | X | X |
* |/ \|/ \|
* 2---5---8
* |\ /|\ /|
* | X | X |
* |/ \|/ \|
* 1---4---7
* PrepareTopology fills all 2-hop neighbors of station 1 and creates a routing protocol
* We are the station number 2. Obvious, that an only MPR in this case is 5
*/
Ptr<RoutingProtocol> m_protocol = CreateObject<RoutingProtocol> ();
m_protocol->m_mainAddress = Ipv4Address ("10.0.0.2");
// we fill all possible 2-hop neighborhood
TwoHopNeighborTuple tuple;
tuple.expirationTime = Seconds (3600);
// All neighbor stations which are seen from station 5
tuple.neighborMainAddr = Ipv4Address ("10.0.0.5");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 4
tuple.neighborMainAddr = Ipv4Address ("10.0.0.4");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 6
tuple.neighborMainAddr = Ipv4Address ("10.0.0.6");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 1
tuple.neighborMainAddr = Ipv4Address ("10.0.0.1");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
// All neighbor stations which are seen from station 3
tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
// First, we fill all neighbors
// If neighbors willingness = OLSR_WILL_DEFAULT, an only station number 5 will be an MPR
NeighborTuple neigbor;
neigbor.status = NeighborTuple::STATUS_SYM;
neigbor.willingness = OLSR_WILL_DEFAULT;
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.6");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.4");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertNeighborTuple (neigbor);
//Now, calculateMPR
m_protocol->MprComputation ();
//Check results
NS_TEST_ASSERT_MSG_EQ (m_protocol->m_state.FindMprAddress (Ipv4Address ("10.0.0.5")), true, "MPR is incorrect!");
NS_TEST_ASSERT_MSG_EQ (m_protocol->m_state.GetMprSet ().size (), 1 , "An only address must be chosen!\n");
return false;
}
static class OlsrProtocolTestSuite : public TestSuite
{
public:
OlsrProtocolTestSuite ();
} g_olsrProtocolTestSuite;
OlsrProtocolTestSuite::OlsrProtocolTestSuite()
: TestSuite("routing-olsr", UNIT)
{
AddTestCase (new OlsrMprTestCase ());
}
}} // namespace olsr, ns3

15
src/routing/olsr/olsr-routing-protocol.h
View File

@@ -25,6 +25,7 @@
#define __OLSR_AGENT_IMPL_H__
#include "olsr-header.h"
#include "ns3/test.h"
#include "olsr-state.h"
#include "olsr-repositories.h"
@@ -58,11 +59,21 @@ struct RoutingTableEntry
destAddr (), nextAddr (),
interface (0), distance (0) {};
};
class RoutingProtocol;
/// Testcase for MPR computation mechanism
class OlsrMprTestCase : public TestCase {
public:
OlsrMprTestCase ();
~OlsrMprTestCase ();
virtual bool DoRun (void);
;
};
class RoutingProtocol : public Ipv4RoutingProtocol
{
public:
friend class OlsrMprTestCase;
static TypeId GetTypeId (void);
RoutingProtocol ();
@@ -70,6 +81,8 @@ public:
void SetMainInterface (uint32_t interface);
protected:
virtual void DoStart (void);
private:
std::map<Ipv4Address, RoutingTableEntry> m_table; ///< Data structure for the routing table.
@@ -100,7 +113,7 @@ private:
Ptr<Ipv4> m_ipv4;
private:
void Start ();
void Clear ();
uint32_t GetSize () const { return m_table.size (); }
std::vector<RoutingTableEntry> GetEntries () const;

5
src/routing/olsr/olsr-state.cc
View File

@@ -272,6 +272,11 @@ OlsrState::SetMprSet (MprSet mprSet)
{
m_mprSet = mprSet;
}
MprSet
OlsrState::GetMprSet () const
{
return m_mprSet;
}
/********** Duplicate Set Manipulation **********/

3
src/routing/olsr/olsr-state.h
View File

@@ -98,7 +98,10 @@ public:
// MPR
bool FindMprAddress (const Ipv4Address &address);
/// MprSet is set by routing protocol after MprCompute
void SetMprSet (MprSet mprSet);
/// Gets an MPR Set needed by tests
MprSet GetMprSet () const;
// Duplicate
DuplicateTuple* FindDuplicateTuple (const Ipv4Address &address,