Implementing visitor pattern for CCNx message parsing. Needs debugging.
Altering src/network/model/buffer* to support more Iterator features
diff --git a/model/ccnx-interest-header.cc b/model/ccnx-interest-header.cc
index cab33ea..02ad9af 100644
--- a/model/ccnx-interest-header.cc
+++ b/model/ccnx-interest-header.cc
@@ -26,7 +26,8 @@
#include "ccnx-interest-header.h"
#include "ns3/log.h"
-#include "ns3/ccnx-coding-helper.h"
+#include "ns3/ccnx-encoding-helper.h"
+#include "ns3/ccnx-decoding-helper.h"
NS_LOG_COMPONENT_DEFINE ("CcnxInterestHeader");
@@ -171,19 +172,19 @@
// unfortunately, 2 serialization required...
Buffer tmp;
- return CcnxCodingHelper::Serialize (tmp.Begin(), *this);
+ return CcnxEncodingHelper::Serialize (tmp.Begin(), *this);
}
void
CcnxInterestHeader::Serialize (Buffer::Iterator start) const
{
- CcnxCodingHelper::Serialize (start, *this);
+ CcnxEncodingHelper::Serialize (start, *this);
}
uint32_t
CcnxInterestHeader::Deserialize (Buffer::Iterator start)
{
- return 0; // the most complicated part is here
+ return CcnxDecodingHelper::Deserialize (start, *this); // \todo Debugging is necessary
}
TypeId