commit 25f7d4dc0afb85417c5e60d1d279bbd670d5dcb2
author Ilya Moiseenko <iliamo@ucla.edu> Thu Sep 29 18:41:06 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:40:12 2011 -0700
tree b160a54ba5934604b11dde3b3aea506f77439a8f
parent e4aae558ce5cb930643b26b959d2a269cc674159

Flooding forwarding strategy added

helper/ccnx-stack-helper.h

diff --git a/helper/ccnx-stack-helper.h b/helper/ccnx-stack-helper.h
index 1e587e3..78cc121 100644
--- a/helper/ccnx-stack-helper.h
+++ b/helper/ccnx-stack-helper.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: 
+ * Author:  Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ *          Ilya Moiseenko <iliamo@cs.ucla.edu> 
  */
 
 #ifndef CCNX_STACK_HELPER_H
@@ -26,11 +27,12 @@
 #include "ns3/object-factory.h"
 
 #include "ccnx-trace-helper.h"
+#include "ns3/ccnx-forwarding-helper.h"
+#include "ns3/ccnx.h"
 
 namespace ns3 {
 
 class Node;
-class CcnxForwardingHelper;
 class CcnxFaceContainer;
 
 /**
@@ -58,11 +60,14 @@
 {
 public:
   /**
-   * \brief Create a new CcnxStackHelper with empty forwarding by default.
-   *
-   * \todo set non-empty default forwarding
+   * \brief Create a new CcnxStackHelper with a default NDN_FLOODING forwarding stategy
    */
-  CcnxStackHelper ();
+  CcnxStackHelper();
+  
+  /**
+   * \brief Create a new CcnxStackHelper with a specified forwarding strategy
+   */
+  CcnxStackHelper (Ccnx::ForwardingStrategy);
 
   /**
    * \brief Destroy the CcnxStackHelper
@@ -82,7 +87,7 @@
    * a single ns3::Ccnx object through its ns3::Ccnx::SetforwardingProtocol.
    */
   void
-  SetForwardingHelper (const CcnxForwardingHelper &forwarding);
+  SetForwardingStrategy (Ccnx::ForwardingStrategy strategy);
 
   /**
    * \brief Install CCNx stack on the node
@@ -148,6 +153,8 @@
   AddRoute (std::string nodeName, std::string prefix, uint32_t faceId, int32_t metric);
 
 private:
+   CcnxForwardingHelper m_forwardingHelper;
+    
   /**
    * @brief Enable pcap output the indicated Ccnx and interface pair.
    * @internal