1.1 --- a/src/routing/olsr/olsr-state.cc	Wed Apr 16 11:32:55 2008 +0100
     1.2 +++ b/src/routing/olsr/olsr-state.cc	Tue Dec 02 18:42:24 2008 +0000
     1.3 @@ -83,6 +83,25 @@
     1.4    m_mprSelectorSet.push_back (tuple);
     1.5  }
     1.6  
     1.7 +std::string
     1.8 +OlsrState::PrintMprSelectorSet () const
     1.9 +{
    1.10 +  std::ostringstream os;
    1.11 +  os << "[";
    1.12 +  for (MprSelectorSet::const_iterator iter = m_mprSelectorSet.begin ();
    1.13 +       iter != m_mprSelectorSet.end (); iter++)
    1.14 +    {
    1.15 +      MprSelectorSet::const_iterator next = iter;
    1.16 +      next++;
    1.17 +      os << iter->mainAddr;
    1.18 +      if (next != m_mprSelectorSet.end ())
    1.19 +        os << ", ";
    1.20 +    }
    1.21 +  os << "]";
    1.22 +  return os.str ();
    1.23 +}
    1.24 +  
    1.25 +
    1.26  /********** Neighbor Set Manipulation **********/
    1.27  
    1.28  NeighborTuple*
    1.29 @@ -130,7 +149,6 @@
    1.30        if (*it == tuple)
    1.31          {
    1.32            m_neighborSet.erase (it);
    1.33 -          m_modified = true;
    1.34            break;
    1.35          }
    1.36      }
    1.37 @@ -145,7 +163,6 @@
    1.38        if (it->neighborMainAddr == mainAddr)
    1.39          {
    1.40            it = m_neighborSet.erase (it);
    1.41 -          m_modified = true;
    1.42            break;
    1.43          }
    1.44      }
    1.45 @@ -161,7 +178,6 @@
    1.46          {
    1.47            // Update it
    1.48            *it = tuple;
    1.49 -          m_modified = true;
    1.50            return;
    1.51          }
    1.52      }
    1.53 @@ -195,7 +211,6 @@
    1.54        if (*it == tuple)
    1.55          {
    1.56            m_twoHopNeighborSet.erase(it);
    1.57 -          m_modified = true;
    1.58            break;
    1.59          }
    1.60      }
    1.61 @@ -212,7 +227,6 @@
    1.62            && it->twoHopNeighborAddr == twoHopNeighborAddr)
    1.63          {
    1.64            it = m_twoHopNeighborSet.erase (it);
    1.65 -          m_modified = true;
    1.66          }
    1.67        else
    1.68          {
    1.69 @@ -230,7 +244,6 @@
    1.70        if (it->neighborMainAddr == neighborMainAddr)
    1.71          {
    1.72            it = m_twoHopNeighborSet.erase (it);
    1.73 -          m_modified = true;
    1.74          }
    1.75        else
    1.76          {
    1.77 @@ -243,7 +256,6 @@
    1.78  OlsrState::InsertTwoHopNeighborTuple (TwoHopNeighborTuple const &tuple)
    1.79  {
    1.80    m_twoHopNeighborSet.push_back (tuple);
    1.81 -  m_modified = true;
    1.82  }
    1.83  
    1.84  /********** MPR Set Manipulation **********/
    1.85 @@ -335,7 +347,6 @@
    1.86        if (*it == tuple)
    1.87          {
    1.88            m_linkSet.erase (it);
    1.89 -          m_modified = true;
    1.90            break;
    1.91          }
    1.92      }
    1.93 @@ -345,7 +356,6 @@
    1.94  OlsrState::InsertLinkTuple (LinkTuple const &tuple)
    1.95  {
    1.96    m_linkSet.push_back (tuple);
    1.97 -  m_modified = true;
    1.98    return m_linkSet.back ();
    1.99  }
   1.100  
   1.101 @@ -385,7 +395,6 @@
   1.102        if (*it == tuple)
   1.103          {
   1.104            m_topologySet.erase (it);
   1.105 -          m_modified = true;
   1.106            break;
   1.107          }
   1.108      }
   1.109 @@ -400,7 +409,6 @@
   1.110        if (it->lastAddr == lastAddr && it->sequenceNumber < ansn)
   1.111          {
   1.112            it = m_topologySet.erase (it);
   1.113 -          m_modified = true;
   1.114          }
   1.115        else
   1.116          {
   1.117 @@ -413,7 +421,6 @@
   1.118  OlsrState::InsertTopologyTuple (TopologyTuple const &tuple)
   1.119  {
   1.120    m_topologySet.push_back (tuple);
   1.121 -  m_modified = true;
   1.122  }
   1.123  
   1.124  /********** Interface Association Set Manipulation **********/
   1.125 @@ -451,7 +458,6 @@
   1.126        if (*it == tuple)
   1.127          {
   1.128            m_ifaceAssocSet.erase (it);
   1.129 -          m_modified = true;
   1.130            break;
   1.131          }
   1.132      }
   1.133 @@ -461,7 +467,6 @@
   1.134  OlsrState::InsertIfaceAssocTuple (const IfaceAssocTuple &tuple)
   1.135  {
   1.136    m_ifaceAssocSet.push_back (tuple);
   1.137 -  m_modified = true;
   1.138  }
   1.139  
   1.140  std::vector<Ipv4Address>