# HG changeset patch
# User Christopher Kosecki <christopher.l.kosecki.ctr@mail.mil>
# Date 1398796534 -7200
# Node ID 82c7c2aabbb114231c6a34c5251287b64dbe4794
# Parent  d2f248f4d563e9568ec3c8a1b47bbc53471c7c61
Bug 1876 - enable OLSR HNA table access

diff -r d2f248f4d563 -r 82c7c2aabbb1 RELEASE_NOTES
--- a/RELEASE_NOTES	Tue Apr 29 10:54:16 2014 +0200
+++ b/RELEASE_NOTES	Tue Apr 29 20:35:34 2014 +0200
@@ -71,6 +71,7 @@
 - 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
diff -r d2f248f4d563 -r 82c7c2aabbb1 src/olsr/bindings/modulegen__gcc_ILP32.py
--- a/src/olsr/bindings/modulegen__gcc_ILP32.py	Tue Apr 29 10:54:16 2014 +0200
+++ b/src/olsr/bindings/modulegen__gcc_ILP32.py	Tue Apr 29 20:35:34 2014 +0200
@@ -7036,6 +7036,11 @@
                    '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 >', 
diff -r d2f248f4d563 -r 82c7c2aabbb1 src/olsr/bindings/modulegen__gcc_LP64.py
--- a/src/olsr/bindings/modulegen__gcc_LP64.py	Tue Apr 29 10:54:16 2014 +0200
+++ b/src/olsr/bindings/modulegen__gcc_LP64.py	Tue Apr 29 20:35:34 2014 +0200
@@ -7036,6 +7036,11 @@
                    '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 >', 
diff -r d2f248f4d563 -r 82c7c2aabbb1 src/olsr/model/olsr-routing-protocol.cc
--- a/src/olsr/model/olsr-routing-protocol.cc	Tue Apr 29 10:54:16 2014 +0200
+++ b/src/olsr/model/olsr-routing-protocol.cc	Tue Apr 29 20:35:34 2014 +0200
@@ -3356,6 +3356,12 @@
 #endif  //NS3_LOG_ENABLE
 }
 
+Ptr<const Ipv4StaticRouting>
+RoutingProtocol::GetRoutingTableAssociation () const
+{
+  return m_hnaRoutingTable;
+}
+
 } // namespace olsr
 } // namespace ns3
 
diff -r d2f248f4d563 -r 82c7c2aabbb1 src/olsr/model/olsr-routing-protocol.h
--- a/src/olsr/model/olsr-routing-protocol.h	Tue Apr 29 10:54:16 2014 +0200
+++ b/src/olsr/model/olsr-routing-protocol.h	Tue Apr 29 20:35:34 2014 +0200
@@ -131,6 +131,12 @@
   /// 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: