commit 6fc57a69fa0ffde822b1dbfd774e7c27e2de5101
author Qi Zhao <qi.zhao@cs.ucla.edu> Wed Apr 05 16:53:10 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Apr 05 16:53:10 2017 +0000
tree d0285ca30c58b4cf1d1066e404d5c6b8621bab0b
parent 5d3e48195632f794747de84986dd558ef013efec

tools: ndn-autoconfig continue proceeding with existing face

refs #4008

Change-Id: Ic264d1e3ba31cf0a743d6f190272e67f9c28e595

tools/ndn-autoconfig/base.cpp

diff --git a/tools/ndn-autoconfig/base.cpp b/tools/ndn-autoconfig/base.cpp
index 35c6f56..9a1f387 100644
--- a/tools/ndn-autoconfig/base.cpp
+++ b/tools/ndn-autoconfig/base.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -70,19 +70,34 @@
 {
   std::cerr << "Successfully created face: " << resp << std::endl;
 
-  static const Name TESTBED_PREFIX = "/ndn";
-  registerPrefix(TESTBED_PREFIX, resp.getFaceId());
-
-  static const Name LOCALHOP_NFD_PREFIX = "/localhop/nfd";
-  registerPrefix(LOCALHOP_NFD_PREFIX, resp.getFaceId());
+  registerAutoConfigNames(resp.getFaceId());
 }
 
 void
 Base::onHubConnectError(const ControlResponse& response)
 {
-  std::ostringstream os;
-  os << "Failed to create face: " << response.getText() << " (code: " << response.getCode() << ")";
-  BOOST_THROW_EXCEPTION(Error(os.str()));
+  // If face exists, continue proceeding with the existing face
+  if (response.getCode() == 409) {
+    std::cerr << "Face exists. Proceeding with existing face: " << ControlParameters(response.getBody()) << std::endl;
+
+    registerAutoConfigNames(ControlParameters(response.getBody()).getFaceId());
+  }
+  // Otherwise, report the failure and throw out exception
+  else {
+    std::ostringstream os;
+    os << "Failed to create face: " << response.getText() << " (code: " << response.getCode() << ")";
+    BOOST_THROW_EXCEPTION(Error(os.str()));
+  }
+}
+
+void
+Base::registerAutoConfigNames(uint64_t faceId)
+{
+  static const Name TESTBED_PREFIX = "/ndn";
+  registerPrefix(TESTBED_PREFIX, faceId);
+
+  static const Name LOCALHOP_NFD_PREFIX = "/localhop/nfd";
+  registerPrefix(LOCALHOP_NFD_PREFIX, faceId);
 }
 
 void

tools/ndn-autoconfig/base.hpp

diff --git a/tools/ndn-autoconfig/base.hpp b/tools/ndn-autoconfig/base.hpp
index 66d1b8e..a293d0b 100644
--- a/tools/ndn-autoconfig/base.hpp
+++ b/tools/ndn-autoconfig/base.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+ * Copyright (c) 2014-2017,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -99,6 +99,9 @@
   onHubConnectError(const ControlResponse& response);
 
   void
+  registerAutoConfigNames(uint64_t faceId);
+
+  void
   registerPrefix(const Name& prefix, uint64_t faceId);
 
   void