model: Removing more legacy code and make code to compile
diff --git a/helper/ndn-global-routing-helper.cpp b/helper/ndn-global-routing-helper.cpp
index 972f1d8..54b032b 100644
--- a/helper/ndn-global-routing-helper.cpp
+++ b/helper/ndn-global-routing-helper.cpp
@@ -29,7 +29,6 @@
#include "ns3/ndn-l3-protocol.hpp"
#include "../model/ndn-net-device-face.hpp"
#include "../model/ndn-global-router.hpp"
-#include "ns3/ndn-fib.hpp"
#include "ns3/node.h"
#include "ns3/node-container.h"
@@ -79,7 +78,7 @@
node->AggregateObject(gr);
for (uint32_t faceId = 0; faceId < ndn->GetNFaces(); faceId++) {
- Ptr<NetDeviceFace> face = DynamicCast<NetDeviceFace>(ndn->GetFace(faceId));
+ shared_ptr<NetDeviceFace> face = DynamicCast<NetDeviceFace>(ndn->GetFace(faceId));
if (face == 0) {
NS_LOG_DEBUG("Skipping non-netdevice face");
continue;
@@ -249,13 +248,14 @@
.distance_combine(boost::WeightCombine()));
// NS_LOG_DEBUG (predecessors.size () << ", " << distances.size ());
-
- Ptr<Fib> fib = source->GetObject<Fib>();
- if (invalidatedRoutes) {
- fib->InvalidateAll();
- }
- NS_ASSERT(fib != 0);
-
+ /*
+ Ptr<Fib> fib = source->GetObject<Fib> ();
+ if (invalidatedRoutes)
+ {
+ fib->InvalidateAll ();
+ }
+ NS_ASSERT (fib != 0);
+*/
NS_LOG_DEBUG("Reachability from Node: " << source->GetObject<Node>()->GetId());
for (DistancesMap::iterator i = distances.begin(); i != distances.end(); i++) {
if (i->first == source)
@@ -271,20 +271,21 @@
<< " with distance " << i->second.get<1>() << " with delay "
<< i->second.get<2>());
- Ptr<fib::Entry> entry = fib->Add(prefix, i->second.get<0>(), i->second.get<1>());
- entry->SetRealDelayToProducer(i->second.get<0>(), Seconds(i->second.get<2>()));
+ // Ptr<fib::Entry> entry = fib->Add (prefix, i->second.get<0> (), i->second.get<1> ());
+ // entry->SetRealDelayToProducer (i->second.get<0> (), Seconds (i->second.get<2> ()));
- Ptr<Limits> faceLimits = i->second.get<0>()->GetObject<Limits>();
+ // Ptr<Limits> faceLimits = i->second.get<0> ()->GetObject<Limits> ();
- Ptr<Limits> fibLimits = entry->GetObject<Limits>();
- if (fibLimits != 0) {
- // if it was created by the forwarding strategy via DidAddFibEntry event
- fibLimits->SetLimits(faceLimits->GetMaxRate(), 2 * i->second.get<2>() /*exact RTT*/);
- NS_LOG_DEBUG("Set limit for prefix "
- << *prefix << " " << faceLimits->GetMaxRate() << " / "
- << 2 * i->second.get<2>() << "s ("
- << faceLimits->GetMaxRate() * 2 * i->second.get<2>() << ")");
- }
+ // Ptr<Limits> fibLimits = entry->GetObject<Limits> ();
+ // if (fibLimits != 0)
+ //{
+ // if it was created by the forwarding strategy via DidAddFibEntry event
+ // fibLimits->SetLimits (faceLimits->GetMaxRate (), 2 * i->second.get<2> () /*exact
+ // RTT*/);
+ // NS_LOG_DEBUG ("Set limit for prefix " << *prefix << " " << faceLimits->GetMaxRate ()
+ // << " / " << 2*i->second.get<2> () << "s (" << faceLimits->GetMaxRate () * 2 *
+ // i->second.get<2> () << ")");
+ //}
}
}
}
@@ -317,11 +318,11 @@
continue;
}
- Ptr<Fib> fib = source->GetObject<Fib>();
+ // Ptr<Fib> fib = source->GetObject<Fib> ();
if (invalidatedRoutes) {
- fib->InvalidateAll();
+ // fib->InvalidateAll ();
}
- NS_ASSERT(fib != 0);
+ // NS_ASSERT (fib != 0);
NS_LOG_DEBUG("===========");
NS_LOG_DEBUG("Reachability from Node: " << source->GetObject<Node>()->GetId() << " ("
@@ -379,21 +380,22 @@
if (i->second.get<0>()->GetMetric() == std::numeric_limits<uint16_t>::max() - 1)
continue;
- Ptr<fib::Entry> entry = fib->Add(prefix, i->second.get<0>(), i->second.get<1>());
- entry->SetRealDelayToProducer(i->second.get<0>(), Seconds(i->second.get<2>()));
+ // Ptr<fib::Entry> entry = fib->Add (prefix, i->second.get<0> (), i->second.get<1>
+ // ());
+ // entry->SetRealDelayToProducer (i->second.get<0> (), Seconds (i->second.get<2> ()));
- Ptr<Limits> faceLimits = i->second.get<0>()->GetObject<Limits>();
+ // Ptr<Limits> faceLimits = i->second.get<0> ()->GetObject<Limits> ();
- Ptr<Limits> fibLimits = entry->GetObject<Limits>();
- if (fibLimits != 0) {
- // if it was created by the forwarding strategy via DidAddFibEntry event
- fibLimits->SetLimits(faceLimits->GetMaxRate(),
- 2 * i->second.get<2>() /*exact RTT*/);
- NS_LOG_DEBUG("Set limit for prefix "
- << *prefix << " " << faceLimits->GetMaxRate() << " / "
- << 2 * i->second.get<2>() << "s ("
- << faceLimits->GetMaxRate() * 2 * i->second.get<2>() << ")");
- }
+ // Ptr<Limits> fibLimits = entry->GetObject<Limits> ();
+ // if (fibLimits != 0)
+ //{
+ // if it was created by the forwarding strategy via DidAddFibEntry event
+ // fibLimits->SetLimits (faceLimits->GetMaxRate (), 2 * i->second.get<2> () /*exact
+ // RTT*/);
+ // NS_LOG_DEBUG ("Set limit for prefix " << *prefix << " " << faceLimits->GetMaxRate
+ // () << " / " << 2*i->second.get<2> () << "s (" << faceLimits->GetMaxRate () * 2 *
+ // i->second.get<2> () << ")");
+ //}
}
}
}