Various fixes for NFD/ndn-cxx 0.7.0

Change-Id: I68e5d4d57d81c3f2e46fc59680cd416b06c8190c

Author: cawka

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "NFD"]
 	path = NFD
 	url = https://github.com/named-data-ndnSIM/NFD
-	branch = NFD-0.6.5-ndnSIM
+branch = NFD-0.7.0-ndnSIM
 [submodule "ndn-cxx"]
 	path = ndn-cxx
 	url = https://github.com/named-data-ndnSIM/ndn-cxx
-	branch = ndn-cxx-0.6.5-ndnSIM
+	branch = ndn-cxx-0.7.0-ndnSIM

bindings/modulegen__gcc_ILP32.py

@@ -202,6 +202,7 @@ def reg_Data(cls):
     def register_L3Protocol(cls):
         cls.add_method('getL3Protocol', 'ns3::Ptr<ns3::ndn::L3Protocol>', [param('ns3::Ptr<ns3::Object>', 'node')], is_static=True)
         cls.add_method('getForwarder', 'std::shared_ptr<ns3::ndn::nfd::Forwarder>', [])
+        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     register_L3Protocol(root_module['ns3::ndn::L3Protocol'])
 
     # shared_ptr<Face>
@@ -220,7 +221,6 @@ def reg_NfdForwarder(cls):
         cls.add_method('getFib', retval('const ns3::ndn::nfd::Fib&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getPit', retval('const ns3::ndn::nfd::Pit&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getCs', retval('const ns3::ndn::nfd::Cs&', caller_manages_return=False), [], is_const=True)
-        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     reg_NfdForwarder(root_module['ns3::ndn::nfd::Forwarder'])
 
     #############
@@ -252,7 +252,7 @@ def reg_Entry(cls):
         reg_Entry(root_module['ns3::ndn::nfd::fib::Entry'])
 
         def reg_NextHop(cls):
-            cls.add_constructor([param('const ns3::ndn::Face&', 'face'), param('uint64_t', 'endpointId')])
+            cls.add_constructor([param('const ns3::ndn::Face&', 'face')])
 
             cls.add_function_as_method('getFaceFromFibNextHop', 'std::shared_ptr<ns3::ndn::Face>',
                                        [param('const ns3::ndn::nfd::fib::NextHop&', 'obj')],

bindings/modulegen__gcc_LP64.py

@@ -202,6 +202,7 @@ def reg_Data(cls):
     def register_L3Protocol(cls):
         cls.add_method('getL3Protocol', 'ns3::Ptr<ns3::ndn::L3Protocol>', [param('ns3::Ptr<ns3::Object>', 'node')], is_static=True)
         cls.add_method('getForwarder', 'std::shared_ptr<ns3::ndn::nfd::Forwarder>', [])
+        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     register_L3Protocol(root_module['ns3::ndn::L3Protocol'])
 
     # shared_ptr<Face>
@@ -220,7 +221,6 @@ def reg_NfdForwarder(cls):
         cls.add_method('getFib', retval('const ns3::ndn::nfd::Fib&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getPit', retval('const ns3::ndn::nfd::Pit&', caller_manages_return=False), [], is_const=True)
         cls.add_method('getCs', retval('const ns3::ndn::nfd::Cs&', caller_manages_return=False), [], is_const=True)
-        cls.add_method('getFaceTable', retval('const ns3::ndn::nfd::FaceTable&', caller_manages_return=False), [], is_const=True)
     reg_NfdForwarder(root_module['ns3::ndn::nfd::Forwarder'])
 
     #############
@@ -252,7 +252,7 @@ def reg_Entry(cls):
         reg_Entry(root_module['ns3::ndn::nfd::fib::Entry'])
 
         def reg_NextHop(cls):
-            cls.add_constructor([param('const ns3::ndn::Face&', 'face'), param('uint64_t', 'endpointId')])
+            cls.add_constructor([param('const ns3::ndn::Face&', 'face')])
 
             cls.add_function_as_method('getFaceFromFibNextHop', 'std::shared_ptr<ns3::ndn::Face>',
                                        [param('const ns3::ndn::nfd::fib::NextHop&', 'obj')],

examples/ndn-cxx-simple/real-app.hpp

@@ -42,7 +42,7 @@ class RealApp
                                      std::bind([]{}), std::bind([]{}));
 
     // use scheduler to send interest later on consumer face
-    m_scheduler.scheduleEvent(ndn::time::seconds(2), [this] {
+    m_scheduler.schedule(ndn::time::seconds(2), [this] {
         m_faceConsumer.expressInterest(ndn::Interest("/hello/world"),
                                        std::bind([] { std::cout << "Hello!" << std::endl; }),
                                        std::bind([] { std::cout << "NACK!" << std::endl; }),

helper/ndn-global-routing-helper.cpp

@@ -80,7 +80,7 @@ GlobalRoutingHelper::Install(Ptr<Node> node)
   gr = CreateObject<GlobalRouter>();
   node->AggregateObject(gr);
 
-  for (auto& face : ndn->getForwarder()->getFaceTable()) {
+  for (auto& face : ndn->getFaceTable()) {
     auto transport = dynamic_cast<NetDeviceTransport*>(face.getTransport());
     if (transport == nullptr) {
       NS_LOG_DEBUG("Skipping non ndnSIM-specific transport face");
@@ -316,15 +316,15 @@ GlobalRoutingHelper::CalculateAllPossibleRoutes()
     // remember interface statuses
     std::list<nfd::FaceId> faceIds;
     std::unordered_map<nfd::FaceId, uint16_t> originalMetrics;
-    for (auto& nfdFace : l3->getForwarder()->getFaceTable()) {
+    for (auto& nfdFace : l3->getFaceTable()) {
       faceIds.push_back(nfdFace.getId());
       originalMetrics[nfdFace.getId()] = nfdFace.getMetric();
       nfdFace.setMetric(std::numeric_limits<uint16_t>::max() - 1);
       // value std::numeric_limits<uint16_t>::max () MUST NOT be used (reserved)
     }
 
     for (auto& faceId : faceIds) {
-      auto* face = l3->getForwarder()->getFaceTable().get(faceId);
+      auto* face = l3->getFaceTable().get(faceId);
       NS_ASSERT(face != nullptr);
       auto transport = dynamic_cast<NetDeviceTransport*>(face->getTransport());
       if (transport == nullptr) {
@@ -381,7 +381,7 @@ GlobalRoutingHelper::CalculateAllPossibleRoutes()
 
     // recover original interface statuses
     for (auto& i : originalMetrics) {
-      l3->getForwarder()->getFaceTable().get(i.first)->setMetric(i.second);
+      l3->getFaceTable().get(i.first)->setMetric(i.second);
     }
   }
 }

helper/ndn-link-control-helper.cpp

@@ -56,7 +56,7 @@ LinkControlHelper::setErrorRate(Ptr<Node> node1, Ptr<Node> node2, double errorRa
   NS_ASSERT(ndn1 != nullptr && ndn2 != nullptr);
 
   // iterate over all faces to find the right one
-  for (const auto& face : ndn1->getForwarder()->getFaceTable()) {
+  for (const auto& face : ndn1->getFaceTable()) {
     auto transport = dynamic_cast<NetDeviceTransport*>(face.getTransport());
     if (transport == nullptr)
       continue;

helper/ndn-stack-helper.cpp

@@ -391,7 +391,7 @@ StackHelper::SetLinkDelayAsFaceMetric()
     if (ndn == nullptr)
       continue;
 
-    for (auto& face : ndn->getForwarder()->getFaceTable()) {
+    for (auto& face : ndn->getFaceTable()) {
       auto transport = dynamic_cast<NetDeviceTransport*>(face.getTransport());
       if (transport == nullptr)
         continue;

model/ndn-app-link-service.cpp

@@ -47,7 +47,7 @@ AppLinkService::~AppLinkService()
 }
 
 void
-AppLinkService::doSendInterest(const Interest& interest)
+AppLinkService::doSendInterest(const Interest& interest, const nfd::EndpointId& endpoint)
 {
   NS_LOG_FUNCTION(this << &interest);
 
@@ -56,7 +56,7 @@ AppLinkService::doSendInterest(const Interest& interest)
 }
 
 void
-AppLinkService::doSendData(const Data& data)
+AppLinkService::doSendData(const Data& data, const nfd::EndpointId& endpoint)
 {
   NS_LOG_FUNCTION(this << &data);
 
@@ -65,7 +65,7 @@ AppLinkService::doSendData(const Data& data)
 }
 
 void
-AppLinkService::doSendNack(const lp::Nack& nack)
+AppLinkService::doSendNack(const lp::Nack& nack, const nfd::EndpointId& endpoint)
 {
   NS_LOG_FUNCTION(this << &nack);
 
@@ -78,19 +78,19 @@ AppLinkService::doSendNack(const lp::Nack& nack)
 void
 AppLinkService::onReceiveInterest(const Interest& interest)
 {
-  this->receiveInterest(interest);
+  this->receiveInterest(interest, 0);
 }
 
 void
 AppLinkService::onReceiveData(const Data& data)
 {
-  this->receiveData(data);
+  this->receiveData(data, 0);
 }
 
 void
 AppLinkService::onReceiveNack(const lp::Nack& nack)
 {
-  this->receiveNack(nack);
+  this->receiveNack(nack, 0);
 }
 
 } // namespace ndn

model/ndn-app-link-service.hpp

@@ -60,16 +60,16 @@ class AppLinkService : public nfd::face::LinkService
 
 private:
   virtual void
-  doSendInterest(const Interest& interest) override;
+  doSendInterest(const Interest& interest, const nfd::EndpointId& endpoint) override;
 
   virtual void
-  doSendData(const Data& data) override;
+  doSendData(const Data& data, const nfd::EndpointId& endpoint) override;
 
   virtual void
-  doSendNack(const lp::Nack& nack) override;
+  doSendNack(const lp::Nack& nack, const nfd::EndpointId& endpoint) override;
 
   virtual void
-  doReceivePacket(nfd::face::Transport::Packet&& packet) override
+  doReceivePacket(const Block& packet, const nfd::EndpointId& endpoint) override
   {
     // does nothing (all operations for now handled by LinkService)
     BOOST_ASSERT(false);

model/ndn-block-header.cpp

@@ -56,8 +56,8 @@ BlockHeader::BlockHeader()
 {
 }
 
-BlockHeader::BlockHeader(const nfdFace::Transport::Packet& packet)
-  : m_block(packet.packet)
+BlockHeader::BlockHeader(const Block& packet)
+  : m_block(packet)
 {
 }