Many corrections to face/local-face/net-device-face/fib/pit. Now
interest packets actually go down to ccnx stack. Also, now it is
possible to manually configure FIB entries.
CcnxFib now is an object aggregated to the node
diff --git a/model/ccnx-name-components.cc b/model/ccnx-name-components.cc
index 303e987..438e179 100644
--- a/model/ccnx-name-components.cc
+++ b/model/ccnx-name-components.cc
@@ -20,11 +20,14 @@
#include "ccnx-name-components.h"
#include <boost/foreach.hpp>
+#include "ns3/log.h"
#include <iostream>
using namespace std;
+NS_LOG_COMPONENT_DEFINE ("CcnxNameComponents");
+
namespace ns3 {
ATTRIBUTE_HELPER_CPP (CcnxNameComponents);
@@ -33,10 +36,10 @@
{
}
-CcnxNameComponents::CcnxNameComponents (const string &s)
-{
- m_prefix.push_back (s);
-}
+// CcnxNameComponents::CcnxNameComponents (const string &s)
+// {
+// m_prefix.push_back (s);
+// }
CcnxNameComponents::CcnxNameComponents (const std::list<boost::reference_wrapper<const std::string> > &components)
{
@@ -106,19 +109,21 @@
operator >> (std::istream &is, CcnxNameComponents &components)
{
istream_iterator<char> eos; // end of stream
-
+
std::string component = "";
for (istream_iterator<char> it (is); it != eos; it++)
{
if (*it == '/')
{
if (component != "")
- components.Add (component);
+ components.Add (component);
component = "";
}
else
component.push_back (*it);
}
+ if (component != "")
+ components.Add (component);
return is;
}