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/pit/ndn-pit-entry.cc

diff --git a/model/pit/ndn-pit-entry.cc b/model/pit/ndn-pit-entry.cc
index 0a06ed2..77c7578 100644
--- a/model/pit/ndn-pit-entry.cc
+++ b/model/pit/ndn-pit-entry.cc
@@ -22,7 +22,7 @@
 
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-name-components.h"
-#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-interest.h"
 
 #include "ns3/simulator.h"
 #include "ns3/log.h"

model/pit/ndn-pit-impl.cc

diff --git a/model/pit/ndn-pit-impl.cc b/model/pit/ndn-pit-impl.cc
index 04acd0f..29b029f 100644
--- a/model/pit/ndn-pit-impl.cc
+++ b/model/pit/ndn-pit-impl.cc
@@ -20,8 +20,8 @@
 
 #include "ndn-pit-impl.h"
 
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 #include "ns3/ndn-forwarding-strategy.h"
 
 #include "../../utils/trie/empty-policy.h"

model/pit/ndn-pit.cc

diff --git a/model/pit/ndn-pit.cc b/model/pit/ndn-pit.cc
index 48a1747..ad8f4a2 100644
--- a/model/pit/ndn-pit.cc
+++ b/model/pit/ndn-pit.cc
@@ -20,8 +20,8 @@
 
 #include "ndn-pit.h"
 
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 
 #include "ns3/log.h"
 #include "ns3/string.h"