commit 388ec2552cbe645664d96e20d3ec4c32d4ed7077
author Junxiao Shi <git@mail1.yoursunny.com> Sun Nov 02 15:19:57 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Sun Nov 02 15:37:05 2014 -0700
tree d37684fa2dbab3e3baa7e7d9455f56bd46f97752
parent 6c63230ac8bc24ede58adfabe2a622f3cb7dd4df

face: specify registerPrefix signing parameters with CommandOptions

refs #2039

Change-Id: I26a49f155a776e38bf04e1a797c1472f3d88178c

src/face.cpp

diff --git a/src/face.cpp b/src/face.cpp
index b24a436..66e61bf 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -239,10 +239,17 @@
   shared_ptr<InterestFilterRecord> filter =
     make_shared<InterestFilterRecord>(interestFilter, onInterest);
 
+  nfd::CommandOptions options;
+  if (certificate.getName().empty()) {
+    options.setSigningDefault();
+  }
+  else {
+    options.setSigningCertificate(certificate);
+  }
+
   return m_impl->registerPrefix(interestFilter.getPrefix(), filter,
                                 onSuccess, onFailure,
-                                flags,
-                                certificate);
+                                flags, options);
 }
 
 const RegisteredPrefixId*
@@ -255,10 +262,17 @@
   shared_ptr<InterestFilterRecord> filter =
     make_shared<InterestFilterRecord>(interestFilter, onInterest);
 
+  nfd::CommandOptions options;
+  if (certificate.getName().empty()) {
+    options.setSigningDefault();
+  }
+  else {
+    options.setSigningCertificate(certificate);
+  }
+
   return m_impl->registerPrefix(interestFilter.getPrefix(), filter,
                                 RegisterPrefixSuccessCallback(), onFailure,
-                                flags,
-                                certificate);
+                                flags, options);
 }
 
 const RegisteredPrefixId*
@@ -272,10 +286,12 @@
   shared_ptr<InterestFilterRecord> filter =
     make_shared<InterestFilterRecord>(interestFilter, onInterest);
 
+  nfd::CommandOptions options;
+  options.setSigningIdentity(identity);
+
   return m_impl->registerPrefix(interestFilter.getPrefix(), filter,
                                 onSuccess, onFailure,
-                                flags,
-                                identity);
+                                flags, options);
 }
 
 const RegisteredPrefixId*
@@ -288,10 +304,12 @@
   shared_ptr<InterestFilterRecord> filter =
     make_shared<InterestFilterRecord>(interestFilter, onInterest);
 
+  nfd::CommandOptions options;
+  options.setSigningIdentity(identity);
+
   return m_impl->registerPrefix(interestFilter.getPrefix(), filter,
                                 RegisterPrefixSuccessCallback(), onFailure,
-                                flags,
-                                identity);
+                                flags, options);
 }
 
 
@@ -314,10 +332,17 @@
                      const IdentityCertificate& certificate,
                      uint64_t flags)
 {
+  nfd::CommandOptions options;
+  if (certificate.getName().empty()) {
+    options.setSigningDefault();
+  }
+  else {
+    options.setSigningCertificate(certificate);
+  }
+
   return m_impl->registerPrefix(prefix, shared_ptr<InterestFilterRecord>(),
                                 onSuccess, onFailure,
-                                flags,
-                                certificate);
+                                flags, options);
 }
 
 const RegisteredPrefixId*
@@ -327,10 +352,12 @@
                      const Name& identity,
                      uint64_t flags)
 {
+  nfd::CommandOptions options;
+  options.setSigningIdentity(identity);
+
   return m_impl->registerPrefix(prefix, shared_ptr<InterestFilterRecord>(),
                                 onSuccess, onFailure,
-                                flags,
-                                identity);
+                                flags, options);
 }
 
 void