commit bd9c18e0950c0bbd336334028c745f7cf53c47a9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 19 15:23:41 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 19 15:23:41 2012 -0800
tree 4a6f3633f3147cbefae71df5f0e5ffb0d855282e
parent 5d79e6827a8c873701a6b0f417690407a72ea787

Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet

model/ndn-app-face.cc

diff --git a/model/ndn-app-face.cc b/model/ndn-app-face.cc
index 538b10c..e735b9a 100644
--- a/model/ndn-app-face.cc
+++ b/model/ndn-app-face.cc
@@ -31,8 +31,8 @@
 #include "ns3/ndn-header-helper.h"
 #include "ns3/ndn-app.h"
 
-#include "ndn-interest-header.h"
-#include "ndn-content-object-header.h"
+#include "ndn-interest.h"
+#include "ndn-content-object.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.AppFace");
 
@@ -101,7 +101,7 @@
       HeaderHelper::Type type = HeaderHelper::GetNdnHeaderType (p);
       switch (type)
         {
-        case HeaderHelper::INTEREST:
+        case HeaderHelper::INTEREST_NDNSIM:
           {
             Ptr<InterestHeader> header = Create<InterestHeader> ();
             p->RemoveHeader (*header);
@@ -113,7 +113,7 @@
           
             break;
           }
-        case HeaderHelper::CONTENT_OBJECT:
+        case HeaderHelper::CONTENT_OBJECT_NDNSIM:
           {
             static ContentObjectTail tail;
             Ptr<ContentObjectHeader> header = Create<ContentObjectHeader> ();
@@ -123,6 +123,9 @@
           
             break;
           }
+        default:
+          NS_FATAL_ERROR ("ccnb support is currently broken");
+          break;
         }
       
       return true;