SunnyQjm/NFD
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: ndn-autoconfig continue proceeding with existing face

Browse Source 
refs #4008

Change-Id: Ic264d1e3ba31cf0a743d6f190272e67f9c28e595
This commit is contained in:
Qi Zhao authored and Junxiao Shi committed 2017-04-05 16:53:10 +00:00
1 parent 5d3e481956
commit 6fc57a69fa
2 files changed
+28 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/ndn-autoconfig/base.cpp
+24 -9
View File
@@ -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 @@ Base::onHubConnectSuccess(const ControlParameters& resp)
{
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
+4 -1
View File
@@ -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,
@@ -98,6 +98,9 @@ private:
void
onHubConnectError(const ControlResponse& response);
void
registerAutoConfigNames(uint64_t faceId);
void
registerPrefix(const Name& prefix, uint64_t faceId);