commit ef56143e6ff73d935499c6c4708bf124aff40407
author Spencer Lee <spencerlee@email.arizona.edu> Sun Dec 13 19:40:22 2015 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Wed Dec 23 03:07:09 2015 -0800
tree ab0063e63aed03408558ce21877a73001e2df8d4
parent 8e99023187ca95014520f2b71835df584c916259

SigningInfo configuration option

Change-Id: If78463ccb2f4f615d61b5af02761d284b5254d79
refs: #6

src/ndn-traffic-server.cpp

diff --git a/src/ndn-traffic-server.cpp b/src/ndn-traffic-server.cpp
index e9ba339..e7a0cb6 100644
--- a/src/ndn-traffic-server.cpp
+++ b/src/ndn-traffic-server.cpp
@@ -32,7 +32,7 @@
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/security/signing-helpers.hpp>
+#include <ndn-cxx/security/signing-info.hpp>
 #include <ndn-cxx/util/backports.hpp>
 
 #include "logger.hpp"
@@ -66,33 +66,31 @@
       , m_contentBytes(-1)
       , m_contentDelay(time::milliseconds(-1))
       , m_nInterestsReceived(0)
-      , m_signWithSha256(false)
+      , m_signingInfo()
     {
     }
 
     void
     printTrafficConfiguration(Logger& logger)
     {
-      std::string detail;
+      std::stringstream detail;
 
       if (!m_name.empty())
-        detail += "Name=" + m_name + ", ";
+        detail << "Name=" << m_name << ", ";
       if (m_contentType >= 0)
-        detail += "ContentType=" + to_string(m_contentType) + ", ";
+        detail << "ContentType=" << to_string(m_contentType) << ", ";
       if (m_freshnessPeriod >= time::milliseconds(0))
-        detail += "FreshnessPeriod=" +
-                  to_string(static_cast<int>(m_freshnessPeriod.count())) + ", ";
+        detail << "FreshnessPeriod=" <<
+                  to_string(static_cast<int>(m_freshnessPeriod.count())) << ", ";
       if (m_contentBytes >= 0)
-        detail += "ContentBytes=" + to_string(m_contentBytes) + ", ";
+        detail << "ContentBytes=" << to_string(m_contentBytes) << ", ";
       if (m_contentDelay >= time::milliseconds(0))
-        detail += "ContentDelay=" + to_string(m_contentDelay.count()) + ", ";
+        detail << "ContentDelay=" << to_string(m_contentDelay.count()) << ", ";
       if (!m_content.empty())
-        detail += "Content=" + m_content + ", ";
-      detail += "SignWithSha256=" + to_string(m_signWithSha256) + ", ";
-      if (detail.length() >= 2)
-        detail = detail.substr(0, detail.length() - 2);
+        detail << "Content=" << m_content << ", ";
+      detail << "SigningInfo=" << m_signingInfo;
 
-      logger.log(detail, false, false);
+      logger.log(detail.str(), false, false);
     }
 
     bool
@@ -149,17 +147,8 @@
         else if (parameter == "Content") {
           m_content = value;
         }
-        else if (parameter == "SignWithSha256") {
-          if (value == "0") {
-            m_signWithSha256 = false;
-          }
-          else if (value == "1") {
-            m_signWithSha256 = true;
-          }
-          else {
-            logger.log("Line " + to_string(lineNumber) +
-                       " \t- Invalid SignWithSha256 Value='" + value + "'", false, true);
-          }
+        else if (parameter == "SigningInfo") {
+          m_signingInfo = security::SigningInfo(value);
         }
         else {
           logger.log("Line " + to_string(lineNumber) +
@@ -189,7 +178,7 @@
     time::milliseconds m_contentDelay;
     std::string m_content;
     int m_nInterestsReceived;
-    bool m_signWithSha256;
+    security::SigningInfo m_signingInfo;
 
     friend class NdnTrafficServer;
   };
@@ -410,13 +399,7 @@
           content = pattern.m_content;
 
         data.setContent(reinterpret_cast<const uint8_t*>(content.c_str()), content.length());
-
-        if (pattern.m_signWithSha256) {
-          m_keyChain.sign(data, security::signingWithSha256());
-        }
-        else {
-          m_keyChain.sign(data);
-        }
+        m_keyChain.sign(data, pattern.m_signingInfo);
 
         m_nInterestsReceived++;
         pattern.m_nInterestsReceived++;