model: replacing direct usage of fib::FaceMetric variables by inline methods
diff --git a/model/fw/best-route.cc b/model/fw/best-route.cc
index 03400b7..08bbd7c 100644
--- a/model/fw/best-route.cc
+++ b/model/fw/best-route.cc
@@ -58,11 +58,11 @@
;
return tid;
}
-
+
BestRoute::BestRoute ()
{
}
-
+
bool
BestRoute::DoPropagateInterest (Ptr<Face> inFace,
Ptr<const InterestHeader> header,
@@ -77,14 +77,14 @@
return true;
int propagatedCount = 0;
-
+
BOOST_FOREACH (const fib::FaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<fib::i_metric> ())
{
NS_LOG_DEBUG ("Trying " << boost::cref(metricFace));
- if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in front
+ if (metricFace.GetStatus () == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in front
break;
- if (!TrySendOutInterest (inFace, metricFace.m_face, header, origPacket, pitEntry))
+ if (!TrySendOutInterest (inFace, metricFace.GetFace (), header, origPacket, pitEntry))
{
continue;
}
diff --git a/model/fw/flooding.cc b/model/fw/flooding.cc
index 80b863a..0c369b7 100644
--- a/model/fw/flooding.cc
+++ b/model/fw/flooding.cc
@@ -59,7 +59,7 @@
;
return tid;
}
-
+
Flooding::Flooding ()
{
}
@@ -77,14 +77,14 @@
BOOST_FOREACH (const fib::FaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<fib::i_metric> ())
{
NS_LOG_DEBUG ("Trying " << boost::cref(metricFace));
- if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
+ if (metricFace.GetStatus () == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
break;
-
- if (!TrySendOutInterest (inFace, metricFace.m_face, header, origPacket, pitEntry))
+
+ if (!TrySendOutInterest (inFace, metricFace.GetFace (), header, origPacket, pitEntry))
{
continue;
}
-
+
propagatedCount++;
}
diff --git a/model/fw/green-yellow-red.cc b/model/fw/green-yellow-red.cc
index 52acc68..09f3199 100644
--- a/model/fw/green-yellow-red.cc
+++ b/model/fw/green-yellow-red.cc
@@ -72,18 +72,18 @@
NS_ASSERT_MSG (m_pit != 0, "PIT should be aggregated with forwarding strategy");
int propagatedCount = 0;
-
+
BOOST_FOREACH (const fib::FaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<fib::i_metric> ())
{
- if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED ||
- metricFace.m_status == fib::FaceMetric::NDN_FIB_YELLOW)
+ if (metricFace.GetStatus () == fib::FaceMetric::NDN_FIB_RED ||
+ metricFace.GetStatus () == fib::FaceMetric::NDN_FIB_YELLOW)
break; //propagate only to green faces
- if (!TrySendOutInterest (inFace, metricFace.m_face, header, origPacket, pitEntry))
+ if (!TrySendOutInterest (inFace, metricFace.GetFace (), header, origPacket, pitEntry))
{
continue;
}
-
+
propagatedCount++;
break; // propagate only one interest
}
diff --git a/model/fw/per-fib-limits.h b/model/fw/per-fib-limits.h
index 47f9ee6..4affec9 100644
--- a/model/fw/per-fib-limits.h
+++ b/model/fw/per-fib-limits.h
@@ -57,13 +57,13 @@
*/
static std::string
GetLogName ();
-
+
/**
* @brief Default constructor
*/
PerFibLimits ()
{ }
-
+
/// \copydoc ForwardingStrategy::WillEraseTimedOutPendingInterest
virtual void
WillEraseTimedOutPendingInterest (Ptr<pit::Entry> pitEntry);
@@ -86,14 +86,14 @@
DidAddFibEntry (Ptr<fib::Entry> fibEntry)
{
ObjectFactory factory;
- factory.SetTypeId (fibEntry->m_faces.begin ()->m_face->GetObject<Limits> ()->GetInstanceTypeId ());
-
+ factory.SetTypeId (fibEntry->m_faces.begin ()->GetFace ()->GetObject<Limits> ()->GetInstanceTypeId ());
+
Ptr<Limits> limits = factory.template Create<Limits> ();
fibEntry->AggregateObject (limits);
super::DidAddFibEntry (fibEntry);
}
-
+
protected:
/// \copydoc ForwardingStrategy::CanSendOutInterest
virtual bool
@@ -102,7 +102,7 @@
Ptr<const InterestHeader> header,
Ptr<const Packet> origPacket,
Ptr<pit::Entry> pitEntry);
-
+
/// \copydoc ForwardingStrategy::WillSatisfyPendingInterest
virtual void
WillSatisfyPendingInterest (Ptr<Face> inFace,
@@ -110,7 +110,7 @@
protected:
static LogComponent g_log; ///< @brief Logging variable
-
+
private:
std::string m_limitType;
};
@@ -149,7 +149,7 @@
Ptr<Limits> fibLimits = pitEntry->GetFibEntry ()->template GetObject<Limits> ();
// no checks for the limit here. the check should be somewhere elese
-
+
if (fibLimits->IsBelowLimit ())
{
if (super::CanSendOutInterest (inFace, outFace, header, origPacket, pitEntry))
@@ -158,7 +158,7 @@
return true;
}
}
-
+
return false;
}
@@ -184,7 +184,7 @@
Ptr<Limits> fibLimits = pitEntry->GetFibEntry ()->template GetObject<Limits> ();
fibLimits->ReturnLimit ();
-
+
super::WillSatisfyPendingInterest (inFace, pitEntry);
}
diff --git a/model/fw/smart-flooding.cc b/model/fw/smart-flooding.cc
index 3777739..c8b8406 100644
--- a/model/fw/smart-flooding.cc
+++ b/model/fw/smart-flooding.cc
@@ -59,7 +59,7 @@
;
return tid;
}
-
+
SmartFlooding::SmartFlooding ()
{
}
@@ -82,14 +82,14 @@
BOOST_FOREACH (const fib::FaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<fib::i_metric> ())
{
NS_LOG_DEBUG ("Trying " << boost::cref(metricFace));
- if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
+ if (metricFace.GetStatus () == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
break;
-
- if (!TrySendOutInterest (inFace, metricFace.m_face, header, origPacket, pitEntry))
+
+ if (!TrySendOutInterest (inFace, metricFace.GetFace (), header, origPacket, pitEntry))
{
continue;
}
-
+
propagatedCount++;
}