--- a/src/olsr/model/olsr-state.h Fri May 13 14:57:56 2011 -0400
+++ b/src/olsr/model/olsr-state.h Fri May 13 14:58:13 2011 -0400
@@ -35,24 +35,24 @@
class OlsrState
{
// friend class Olsr;
-
+
protected:
- LinkSet m_linkSet; ///< Link Set (RFC 3626, section 4.2.1).
- NeighborSet m_neighborSet; ///< Neighbor Set (RFC 3626, section 4.3.1).
- TwoHopNeighborSet m_twoHopNeighborSet; ///< 2-hop Neighbor Set (RFC 3626, section 4.3.2).
- TopologySet m_topologySet; ///< Topology Set (RFC 3626, section 4.4).
- MprSet m_mprSet; ///< MPR Set (RFC 3626, section 4.3.3).
- MprSelectorSet m_mprSelectorSet; ///< MPR Selector Set (RFC 3626, section 4.3.4).
- DuplicateSet m_duplicateSet; ///< Duplicate Set (RFC 3626, section 3.4).
- IfaceAssocSet m_ifaceAssocSet; ///< Interface Association Set (RFC 3626, section 4.1).
+ LinkSet m_linkSet; ///< Link Set (RFC 3626, section 4.2.1).
+ NeighborSet m_neighborSet; ///< Neighbor Set (RFC 3626, section 4.3.1).
+ TwoHopNeighborSet m_twoHopNeighborSet; ///< 2-hop Neighbor Set (RFC 3626, section 4.3.2).
+ TopologySet m_topologySet; ///< Topology Set (RFC 3626, section 4.4).
+ MprSet m_mprSet; ///< MPR Set (RFC 3626, section 4.3.3).
+ MprSelectorSet m_mprSelectorSet; ///< MPR Selector Set (RFC 3626, section 4.3.4).
+ DuplicateSet m_duplicateSet; ///< Duplicate Set (RFC 3626, section 3.4).
+ IfaceAssocSet m_ifaceAssocSet; ///< Interface Association Set (RFC 3626, section 4.1).
AssociationSet m_associationSet; ///< Association Set (RFC 3626, section12.2). Associations obtained from HNA messages generated by other nodes.
- Associations m_associations; ///< The node's local Host Network Associations that will be advertised using HNA messages.
+ Associations m_associations; ///< The node's local Host Network Associations that will be advertised using HNA messages.
public:
OlsrState ()
{}
-
+
// MPR selector
const MprSelectorSet & GetMprSelectors () const
{
@@ -160,9 +160,9 @@
return m_associations;
}
- AssociationTuple* FindAssociationTuple (const Ipv4Address &gatewayAddr,\
- const Ipv4Address &networkAddr,\
- const Ipv4Mask &netmask);
+ AssociationTuple* FindAssociationTuple (const Ipv4Address &gatewayAddr, \
+ const Ipv4Address &networkAddr, \
+ const Ipv4Mask &netmask);
void EraseAssociationTuple (const AssociationTuple &tuple);
void InsertAssociationTuple (const AssociationTuple &tuple);
void EraseAssociation (const Association &tuple);