commit 46c06514379ca1363f48ee036fccc6dd8fb47749
author Jeff Thompson <jefft0@gmail.com> Sun Jul 14 23:26:09 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Sun Jul 14 23:26:09 2013 -0700
tree 8acae4613374aabd65db01ef71442652f2de0129
parent fc53bc5986052cb08977fb38e5809119a6b5d1fb

In decodeBinaryXMLKeyLocator, skip over the KeyName

ndn-cpp/c/encoding/BinaryXMLKey.c

diff --git a/ndn-cpp/c/encoding/BinaryXMLKey.c b/ndn-cpp/c/encoding/BinaryXMLKey.c
index 8d51b4d..b7583ef 100644
--- a/ndn-cpp/c/encoding/BinaryXMLKey.c
+++ b/ndn-cpp/c/encoding/BinaryXMLKey.c
@@ -5,6 +5,7 @@
  */
 
 #include "BinaryXML.h"
+#include "BinaryXMLStructureDecoder.h"
 #include "BinaryXMLKey.h"
 
 ndn_Error ndn_encodeBinaryXMLKeyLocator(struct ndn_KeyLocator *keyLocator, struct ndn_BinaryXMLEncoder *encoder)
@@ -68,7 +69,16 @@
       if (error = ndn_BinaryXMLDecoder_peekDTag(decoder, ndn_BinaryXML_DTag_KeyName, &gotExpectedTag))
         return error;
       if (gotExpectedTag) {
-        // TODO: Implement keyName
+        // TODO: Implement keyName. For now, just use a structure decoder to skip it.
+        struct ndn_BinaryXMLStructureDecoder structureDecoder;
+        ndn_BinaryXMLStructureDecoder_init(&structureDecoder);
+        
+        ndn_BinaryXMLStructureDecoder_seek(&structureDecoder, decoder->offset);
+        if (error = ndn_BinaryXMLStructureDecoder_findElementEnd(&structureDecoder, decoder->input, decoder->inputLength))
+          return error;
+        if (!structureDecoder.gotElementEnd)
+          return NDN_ERROR_read_past_the_end_of_the_input;
+        ndn_BinaryXMLDecoder_seek(decoder, structureDecoder.offset);        
       }
       else
         return NDN_ERROR_decodeBinaryXMLKeyLocator_unrecognized_key_locator_type;