commit dfd52497652189dffe378d999d0c35131a08bda6
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 03 12:48:41 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 03 12:48:41 2013 -0700
tree 75454deb5e268ed5fea86252d63e400e251b1553
parent 51c9f9b32fa216d4260327a885957e7f79e67bb1

model: Fixing bug with CCNb name encoding/decoding

Name object was not properly formatted using Wire::FromName call (was
missing outer Name block)

model/wire/ccnb/wire-ccnb.cc

diff --git a/model/wire/ccnb/wire-ccnb.cc b/model/wire/ccnb/wire-ccnb.cc
index 7b92408..3403611 100644
--- a/model/wire/ccnb/wire-ccnb.cc
+++ b/model/wire/ccnb/wire-ccnb.cc
@@ -220,11 +220,13 @@
 Ccnb::SerializeName (Buffer::Iterator &start, const Name &name)
 {
   size_t written = 0;
+  written += AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);
   BOOST_FOREACH (const name::Component &component, name)
     {
       written += AppendTaggedBlob (start, CcnbParser::CCN_DTAG_Component,
                                    reinterpret_cast<const uint8_t*>(component.buf ()), component.size());
     }
+  written += AppendCloser (start);
   return written;
 }
 
@@ -232,10 +234,12 @@
 Ccnb::SerializedSizeName (const Name &name)
 {
   size_t written = 0;
+  written += EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);
   BOOST_FOREACH (const name::Component &component, name)
     {
       written += EstimateTaggedBlob (CcnbParser::CCN_DTAG_Component, component.size ());
     }
+  written += 1;
   return written;
 }