commit dd1f14d44bf8917279d1a0193d3ef9d73a4a7af0
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Mar 13 12:04:28 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 15 13:29:48 2013 -0700
tree 75d47921115fa07430d194de43c2f23563d9b78f
parent 3457ed4670ae3c2cca696edc639cb37d2b288e48

ccnx: Added verifier and a few small changes

Change-Id: Idbdc0597bd9afb3cfa7c7bbc05175ca8aa1c6b1b

src/fetcher.cc

diff --git a/src/fetcher.cc b/src/fetcher.cc
index d59f457..44ab9fc 100644
--- a/src/fetcher.cc
+++ b/src/fetcher.cc
@@ -132,8 +132,8 @@
 
   if (m_forwardingHint == Name ())
   {
-    // check whether data is verified in this case; if verified invoke callback
-    if (data->verified())
+    // check whether data integrity is checked in this case
+    if (data->integrityChecked())
     {
       if (!m_segmentCallback.empty ())
       {
@@ -149,12 +149,12 @@
   }
   else
     {
-      // in this case we don't care whether "data" is verified, in fact, we expect it is unverified
+      // in this case we don't care whether "data" is verified,  in fact, we expect it is unverified
       try {
         PcoPtr pco = make_shared<ParsedContentObject> (*data->contentPtr ());
 
         // we need to verify this pco and apply callback only when verified
-        if (m_ccnx->verifyPco(pco))
+        if (m_ccnx->checkPcoIntegrity(pco))
         {
           if (!m_segmentCallback.empty ())
             {

src/hash-helper.h

diff --git a/src/hash-helper.h b/src/hash-helper.h
index d289bb1..64a625e 100644
--- a/src/hash-helper.h
+++ b/src/hash-helper.h
@@ -41,8 +41,8 @@
   static HashPtr Origin;
 
   Hash ()
-    : m_length(0)
-    , m_buf(0)
+    : m_buf(0)
+    , m_length(0)
   {
   }