Bug 1876 - enable OLSR HNA table access

This commit is contained in:
Christopher Kosecki committed 2014-04-29 20:35:34 +02:00
1 parent 332d8f011c
commit 9caeebf0e1
5 files changed
+23

No files matched your search

+1
View File
@@ -71,6 +71,7 @@ Bugs fixed
- Bug 1870 - Remove unnecessary AsInt functions
- Bug 1873 - Energy source checked to be aggregated to the node
- Bug 1874 - Ipv4L3Protocol::ProcessFragment: addressCombination and idProto identifiers not properly computed
- Bug 1876 - enable OLSR HNA table access
- Bug 1882 - int64x64 tests trigger valgrind bug
- Bug 1883 - IPv6 don't consider the prefix and network when choosing output address
- Bug 1887 - Point-to-point traces should contain PPP headers
@@ -7036,6 +7036,11 @@ def register_Ns3OlsrRoutingProtocol_methods(root_module, cls):
'std::set< unsigned int >',
[],
is_const=True)
## olsr-routing-protocol.h (module 'olsr'): ns3::Ptr<const ns3::Ipv4StaticRouting> ns3::olsr::RoutingProtocol::GetRoutingTableAssociation() const [member function]
cls.add_method('GetRoutingTableAssociation',
'ns3::Ptr< ns3::Ipv4StaticRouting const >',
[],
is_const=True)
## olsr-routing-protocol.h (module 'olsr'): std::vector<ns3::olsr::RoutingTableEntry,std::allocator<ns3::olsr::RoutingTableEntry> > ns3::olsr::RoutingProtocol::GetRoutingTableEntries() const [member function]
cls.add_method('GetRoutingTableEntries',
'std::vector< ns3::olsr::RoutingTableEntry >',
+5
View File
@@ -7036,6 +7036,11 @@ def register_Ns3OlsrRoutingProtocol_methods(root_module, cls):
'std::set< unsigned int >',
[],
is_const=True)
## olsr-routing-protocol.h (module 'olsr'): ns3::Ptr<const ns3::Ipv4StaticRouting> ns3::olsr::RoutingProtocol::GetRoutingTableAssociation() const [member function]
cls.add_method('GetRoutingTableAssociation',
'ns3::Ptr< ns3::Ipv4StaticRouting const >',
[],
is_const=True)
## olsr-routing-protocol.h (module 'olsr'): std::vector<ns3::olsr::RoutingTableEntry,std::allocator<ns3::olsr::RoutingTableEntry> > ns3::olsr::RoutingProtocol::GetRoutingTableEntries() const [member function]
cls.add_method('GetRoutingTableEntries',
'std::vector< ns3::olsr::RoutingTableEntry >',
+6
View File
@@ -3356,6 +3356,12 @@ RoutingProtocol::Dump (void)
#endif //NS3_LOG_ENABLE
}
Ptr<const Ipv4StaticRouting>
RoutingProtocol::GetRoutingTableAssociation () const
{
return m_hnaRoutingTable;
}
} // namespace olsr
} // namespace ns3
+6
View File
@@ -131,6 +131,12 @@ public:
/// Inject Associations from an Ipv4StaticRouting instance
void SetRoutingTableAssociation (Ptr<Ipv4StaticRouting> routingTable);
/**
* \brief Returns the internal HNA table
* \returns the internal HNA table
*/
Ptr<const Ipv4StaticRouting> GetRoutingTableAssociation () const;
protected:
virtual void DoInitialize (void);
private: