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/helper/ccnx-stack-helper.h b/helper/ccnx-stack-helper.h
index 060b0a7..1e587e3 100644
--- a/helper/ccnx-stack-helper.h
+++ b/helper/ccnx-stack-helper.h
@@ -72,11 +72,6 @@
CcnxStackHelper &operator = (const CcnxStackHelper &o);
/**
- * \brief Return helper internal state to that of a newly constructed one
- */
- void Reset ();
-
- /**
* Set forwarding strategy helper
*
* \param forwarding a new forwarding helper
@@ -142,12 +137,15 @@
InstallAll () const;
/**
- * \brief Enable/disable ccnx stack install.
+ * \brief Add forwarding entry in FIB
*
- * \param enable enable state
+ * \param nodeName Node name
+ * \param prefix Routing prefix
+ * \param faceId Face index
+ * \param metric Routing metric
*/
void
- SetCcnxStackInstall (bool enable);
+ AddRoute (std::string nodeName, std::string prefix, uint32_t faceId, int32_t metric);
private:
/**
@@ -179,14 +177,10 @@
uint32_t interface,
bool explicitFilename);
- void Initialize (void);
- ObjectFactory m_tcpFactory;
- const CcnxForwardingHelper *m_forwarding;
-
- /**
- * \internal
- */
- static void CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId);
+ // /**
+ // * \internal
+ // */
+ // static void CreateAndAggregateObjectFromTypeId (Ptr<Node> node, const std::string typeId);
/**
* \internal
@@ -202,11 +196,6 @@
* \internal
*/
bool AsciiHooked (Ptr<Ccnx> ccnx);
-
- /**
- * \brief Ccnx install state (enabled/disabled) ?
- */
- bool m_ccnxEnabled;
};
} // namespace ns3