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-data.cc

diff --git a/model/wire/ccnb/wire-ccnb-data.cc b/model/wire/ccnb/wire-ccnb-data.cc
index 6349971..0cb0b81 100644
--- a/model/wire/ccnb/wire-ccnb-data.cc
+++ b/model/wire/ccnb/wire-ccnb-data.cc
@@ -194,9 +194,9 @@
   Ccnb::AppendTaggedBlobWithPadding (start, CcnbParser::CCN_DTAG_SignatureBits, 16, m_data->GetSignature ()); // <SignatureBits />
   Ccnb::AppendCloser (start);                                    // </Signature>
 
-  Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);    // <Name>
+  // Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);    // <Name>
   Ccnb::SerializeName (start, m_data->GetName());                                      //   <Component>...</Component>...
-  Ccnb::AppendCloser (start);                                                          // </Name>
+  // Ccnb::AppendCloser (start);                                                          // </Name>
 
   // fake signature
   Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_SignedInfo, CcnbParser::CCN_DTAG); // <SignedInfo>
@@ -234,9 +234,9 @@
       {
         Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_KeyName, CcnbParser::CCN_DTAG);    // <KeyName>
         {
-          Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);       // <Name>
+          // Ccnb::AppendBlockHeader (start, CcnbParser::CCN_DTAG_Name, CcnbParser::CCN_DTAG);       // <Name>
           Ccnb::SerializeName (start, *m_data->GetKeyLocator ());         //   <Component>...</Component>...
-          Ccnb::AppendCloser (start);                                     // </Name>
+          // Ccnb::AppendCloser (start);                                     // </Name>
         }
         Ccnb::AppendCloser (start);                                     // </KeyName>
       }
@@ -276,9 +276,9 @@
   // written += Ccnb::EstimateTaggedBlob (CcnbParser::CCN_DTAG_SignatureBits, sizeof (m_data->GetSignature ()));      // <SignatureBits />
   written += 1;                                    // </Signature>
 
-  written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);    // <Name>
+  //written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);    // <Name>
   written += Ccnb::SerializedSizeName (m_data->GetName ()); //   <Component>...</Component>...
-  written += 1;                                  // </Name>
+  //written += 1;                                  // </Name>
 
   // fake signature
   written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_SignedInfo); // <SignedInfo>
@@ -313,9 +313,9 @@
       {
         written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_KeyName);    // <KeyName>
         {
-          written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);       // <Name>
+          //written += Ccnb::EstimateBlockHeader (CcnbParser::CCN_DTAG_Name);       // <Name>
           written += Ccnb::SerializedSizeName (*m_data->GetKeyLocator ());        //   <Component>...</Component>...
-          written += 1;                                               // </Name>
+          //written += 1;                                               // </Name>
         }
         written += 1;                                               // </KeyName>
       }