commit dd038fc9cbcae214cd95bab2b3d6aec5f2576026
author Jeff Thompson <jeff@thefirst.org> Sat Mar 16 16:29:47 2013 -0700
committer Jeff Thompson <jeff@thefirst.org> Sat Mar 16 16:29:47 2013 -0700
tree b678a70eed499a4ef7310c6e194b691f2e0766e4
parent 9c7d69128cfe31626cb486453053864c1ffc4684

In ContentClosure, only compute the content digest if there is a content digest in the name to check.

ndnProtocol/components/ndnProtocolService.js

diff --git a/ndnProtocol/components/ndnProtocolService.js b/ndnProtocol/components/ndnProtocolService.js
index bd67721..6e595a6 100644
--- a/ndnProtocol/components/ndnProtocolService.js
+++ b/ndnProtocol/components/ndnProtocolService.js
@@ -129,7 +129,7 @@
     this.segmentTemplate = segmentTemplate;

     

     this.segmentStore = new SegmentStore();

-    this.contentSha256 = new Sha256();

+    this.contentSha256 = null;

     this.didRequestFinalSegment = false;

     this.finalSegmentNumber = null;

     this.didOnStart = false;

@@ -223,15 +223,20 @@
         this.contentListener.onStart(contentTypeEtc.contentType, contentTypeEtc.contentCharset, 

             ioService.newURI(contentUriSpec, this.aURI.originCharset, null));

 

+        if (contentObject.name.getContentDigestValue() != null)

+            // Prepare to compute the content digest.

+            this.contentSha256 = new Sha256();

+

         if (segmentNumber == null) {

             // We are not doing segments, so just finish.

             this.contentListener.onReceivedContent(DataUtils.toString(contentObject.content));

-            this.contentSha256.update(contentObject.content);

+            if (this.contentSha256 != null)

+                this.contentSha256.update(contentObject.content);

             this.contentListener.onStop();

 

             if (!this.uriEndsWithSegmentNumber) {

                 var nameContentDigest = contentObject.name.getContentDigestValue();

-                if (nameContentDigest != null &&

+                if (nameContentDigest != null && this.contentSha256 != null &&

                     !DataUtils.arraysEqual(nameContentDigest, this.contentSha256.finalize()))

                     // TODO: How to show the user an error for invalid digest?

                     dump("Content does not match digest in name " + contentObject.name.to_uri());

@@ -264,13 +269,14 @@
         segmentNumber = entry.key;

         contentObject = entry.value;

         this.contentListener.onReceivedContent(DataUtils.toString(contentObject.content));

-        this.contentSha256.update(contentObject.content);

+        if (this.contentSha256 != null)

+            this.contentSha256.update(contentObject.content);

         

         if (this.finalSegmentNumber != null && segmentNumber == this.finalSegmentNumber) {

             // Finished.

             this.contentListener.onStop();

             var nameContentDigest = contentObject.name.getContentDigestValue();

-            if (nameContentDigest != null &&

+            if (nameContentDigest != null && this.contentSha256 != null &&

                 !DataUtils.arraysEqual(nameContentDigest, this.contentSha256.finalize()))

                 // TODO: How to show the user an error for invalid digest?

                 dump("Content does not match digest in name " + contentObject.name.to_uri());