1.1 --- a/src/routing/olsr/olsr-header.cc	Fri Nov 13 11:47:02 2009 +0300
     1.2 +++ b/src/routing/olsr/olsr-header.cc	Fri Nov 13 13:23:08 2009 +0300
     1.3 @@ -785,7 +785,7 @@
     1.4  } g_olsrTestSuite;
     1.5  
     1.6  OlsrTestSuite::OlsrTestSuite()
     1.7 -  : TestSuite("Routing-OLSR-header", UNIT)
     1.8 +  : TestSuite("routing-olsr-header", UNIT)
     1.9  {
    1.10    AddTestCase(new OlsrHnaTestCase());
    1.11    AddTestCase(new OlsrTcTestCase());

     2.1 --- a/src/routing/olsr/olsr-routing-protocol.cc	Fri Nov 13 11:47:02 2009 +0300
     2.2 +++ b/src/routing/olsr/olsr-routing-protocol.cc	Fri Nov 13 13:23:08 2009 +0300
     2.3 @@ -2796,83 +2796,83 @@
     2.4  OlsrMprTestCase::DoRun ()
     2.5  {
     2.6    /*
     2.7 -      * Create a 3x3 grid like the following:
     2.8 -      *      3---6---9
     2.9 -      *      |\ /|\ /|
    2.10 -      *      | X | X |
    2.11 -      *      |/ \|/ \|
    2.12 -      *      2---5---8
    2.13 -      *      |\ /|\ /|
    2.14 -      *      | X | X |
    2.15 -      *      |/ \|/ \|
    2.16 -      *      1---4---7
    2.17 -      * PrepareTopology fills all 2-hop neighbors of station 1 and creates a routing protocol
    2.18 -      * We are the station number 2. Obvious, that an only MPR in this case is 5 
    2.19 -      */
    2.20 -   Ptr<RoutingProtocol> m_protocol = CreateObject<RoutingProtocol> ();
    2.21 -   m_protocol->m_mainAddress = Ipv4Address ("10.0.0.2");
    2.22 -   // we fill all possible 2-hop neighborhood
    2.23 -   TwoHopNeighborTuple tuple;
    2.24 -   tuple.expirationTime = Seconds (3600);
    2.25 -   // All neighbor stations which are seen from station 5
    2.26 -   tuple.neighborMainAddr = Ipv4Address ("10.0.0.5");
    2.27 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
    2.28 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.29 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
    2.30 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.31 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
    2.32 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.33 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
    2.34 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.35 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
    2.36 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.37 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
    2.38 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.39 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
    2.40 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.41 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
    2.42 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.43 -   // All neighbor stations which are seen from station 4
    2.44 -   tuple.neighborMainAddr = Ipv4Address ("10.0.0.4");
    2.45 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
    2.46 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.47 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
    2.48 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.49 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
    2.50 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.51 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
    2.52 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.53 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
    2.54 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.55 +   * Create a 3x3 grid like the following:
    2.56 +   *      3---6---9
    2.57 +   *      |\ /|\ /|
    2.58 +   *      | X | X |
    2.59 +   *      |/ \|/ \|
    2.60 +   *      2---5---8
    2.61 +   *      |\ /|\ /|
    2.62 +   *      | X | X |
    2.63 +   *      |/ \|/ \|
    2.64 +   *      1---4---7
    2.65 +   * PrepareTopology fills all 2-hop neighbors of station 1 and creates a routing protocol
    2.66 +   * We are the station number 2. Obvious, that an only MPR in this case is 5 
    2.67 +   */
    2.68 +  Ptr<RoutingProtocol> m_protocol = CreateObject<RoutingProtocol> ();
    2.69 +  m_protocol->m_mainAddress = Ipv4Address ("10.0.0.2");
    2.70 +  // we fill all possible 2-hop neighborhood
    2.71 +  TwoHopNeighborTuple tuple;
    2.72 +  tuple.expirationTime = Seconds (3600);
    2.73 +  // All neighbor stations which are seen from station 5
    2.74 +  tuple.neighborMainAddr = Ipv4Address ("10.0.0.5");
    2.75 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
    2.76 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.77 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
    2.78 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.79 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
    2.80 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.81 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
    2.82 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.83 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
    2.84 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.85 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
    2.86 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.87 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
    2.88 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.89 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
    2.90 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.91 +  // All neighbor stations which are seen from station 4
    2.92 +  tuple.neighborMainAddr = Ipv4Address ("10.0.0.4");
    2.93 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
    2.94 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.95 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
    2.96 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.97 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
    2.98 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
    2.99 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
   2.100 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.101 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
   2.102 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.103  
   2.104 -   // All neighbor stations which are seen from station 6
   2.105 -   tuple.neighborMainAddr = Ipv4Address ("10.0.0.6");
   2.106 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
   2.107 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.108 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.109 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.110 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.111 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.112 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
   2.113 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.114 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
   2.115 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.116 +  // All neighbor stations which are seen from station 6
   2.117 +  tuple.neighborMainAddr = Ipv4Address ("10.0.0.6");
   2.118 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
   2.119 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.120 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.121 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.122 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.123 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.124 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
   2.125 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.126 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
   2.127 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.128  
   2.129 -   // All neighbor stations which are seen from station 1
   2.130 -   tuple.neighborMainAddr = Ipv4Address ("10.0.0.1");
   2.131 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.132 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.133 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.134 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.135 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
   2.136 +  // All neighbor stations which are seen from station 1
   2.137 +  tuple.neighborMainAddr = Ipv4Address ("10.0.0.1");
   2.138 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.139 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.140 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.141 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.142 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
   2.143  
   2.144 -   // All neighbor stations which are seen from station 3
   2.145 -   tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
   2.146 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.147 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.148 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.149 -   m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.150 -   tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
   2.151 +  // All neighbor stations which are seen from station 3
   2.152 +  tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
   2.153 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
   2.154 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.155 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
   2.156 +  m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
   2.157 +  tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
   2.158    // First, we fill all neighbors
   2.159    // If neighbors willingness = OLSR_WILL_DEFAULT, an only station number 5 will be an MPR
   2.160    NeighborTuple neigbor;
   2.161 @@ -2903,7 +2903,7 @@
   2.162  } g_olsrProtocolTestSuite;
   2.163  
   2.164  OlsrProtocolTestSuite::OlsrProtocolTestSuite()
   2.165 -  : TestSuite("Routing-OLSR", UNIT)
   2.166 +  : TestSuite("routing-olsr", UNIT)
   2.167  {
   2.168    AddTestCase (new OlsrMprTestCase ());
   2.169  }