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

face+mgmt: enable local fields through ProtocolFactory::createFace

Browse Source 
refs #3731

Change-Id: I569dae59cda150ffcb1c0ff1d01a575d8850beca
This commit is contained in:
Eric Newberry committed 2016-09-23 01:16:23 -07:00
1 parent d8205106cc
commit f40551a061
25 files changed
+206 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

daemon/face/ethernet-factory.cpp
+1
View File
@@ -58,6 +58,7 @@ EthernetFactory::createMulticastFace(const NetworkInterfaceInfo& interface,
void
EthernetFactory::createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onFailure)
{
daemon/face/ethernet-factory.hpp
+1
View File
@@ -79,6 +79,7 @@ public: // from ProtocolFactory
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onFailure) override;
daemon/face/protocol-factory.hpp
+10 -4
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -55,14 +55,20 @@ public:
* This method should automatically choose channel, based on supplied FaceUri
* and create face.
*
* \throw Error Factory does not support connect operation
* \throw Error specified \p persistency is not supported
* \param uri remote URI of the new face
* \param persistency persistency of the new face
* \param wantLocalFieldsEnabled whether local fields should be enabled on the face
* \param onCreated callback if face creation succeeds
* If a face with the same remote URI already exists, its persistency and
* LocalFieldsEnabled setting will not be modified.
* \param onFailure callback if face creation fails
*/
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) = 0;
const FaceCreationFailedCallback& onFailure) = 0;
virtual std::vector<shared_ptr<const Channel>>
getChannels() const = 0;
daemon/face/tcp-channel.cpp
+14 -6
View File
@@ -66,6 +66,7 @@ TcpChannel::listen(const FaceCreatedCallback& onFaceCreated,
void
TcpChannel::connect(const tcp::Endpoint& remoteEndpoint,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onFaceCreated,
const FaceCreationFailedCallback& onConnectFailed,
const time::seconds& timeout/* = time::seconds(4)*/)
@@ -83,8 +84,8 @@ TcpChannel::connect(const tcp::Endpoint& remoteEndpoint,
clientSocket->async_connect(remoteEndpoint,
bind(&TcpChannel::handleConnect, this,
boost::asio::placeholders::error,
clientSocket, connectTimeoutEvent,
boost::asio::placeholders::error, clientSocket,
wantLocalFieldsEnabled, connectTimeoutEvent,
onFaceCreated, onConnectFailed));
}
@@ -96,8 +97,9 @@ TcpChannel::size() const
void
TcpChannel::createFace(ip::tcp::socket&& socket,
const FaceCreatedCallback& onFaceCreated,
bool isOnDemand)
bool isOnDemand,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onFaceCreated)
{
shared_ptr<Face> face;
tcp::Endpoint remoteEndpoint = socket.remote_endpoint();
@@ -107,7 +109,12 @@ TcpChannel::createFace(ip::tcp::socket&& socket,
auto persistency = isOnDemand ? ndn::nfd::FACE_PERSISTENCY_ON_DEMAND
: ndn::nfd::FACE_PERSISTENCY_PERSISTENT;
auto linkService = make_unique<face::GenericLinkService>();
auto options = linkService->getOptions();
options.allowLocalFields = wantLocalFieldsEnabled;
linkService->setOptions(options);
auto transport = make_unique<face::TcpTransport>(std::move(socket), persistency);
face = make_shared<Face>(std::move(linkService), std::move(transport));
m_channelFaces[remoteEndpoint] = face;
@@ -157,7 +164,7 @@ TcpChannel::handleAccept(const boost::system::error_code& error,
NFD_LOG_DEBUG("[" << m_localEndpoint << "] Connection from " << m_acceptSocket.remote_endpoint());
createFace(std::move(m_acceptSocket), onFaceCreated, true);
createFace(std::move(m_acceptSocket), true, false, onFaceCreated);
// prepare accepting the next connection
accept(onFaceCreated, onAcceptFailed);
@@ -166,6 +173,7 @@ TcpChannel::handleAccept(const boost::system::error_code& error,
void
TcpChannel::handleConnect(const boost::system::error_code& error,
const shared_ptr<ip::tcp::socket>& socket,
bool wantLocalFieldsEnabled,
const scheduler::EventId& connectTimeoutEvent,
const FaceCreatedCallback& onFaceCreated,
const FaceCreationFailedCallback& onConnectFailed)
@@ -195,7 +203,7 @@ TcpChannel::handleConnect(const boost::system::error_code& error,
NFD_LOG_DEBUG("[" << m_localEndpoint << "] Connected to " << socket->remote_endpoint());
createFace(std::move(*socket), onFaceCreated, false);
createFace(std::move(*socket), false, wantLocalFieldsEnabled, onFaceCreated);
}
void
daemon/face/tcp-channel.hpp
+6 -3
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
* Copyright (c) 2014-2015, Regents of the University of California,
* Copyright (c) 2014-2016, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -73,6 +73,7 @@ public:
*/
void
connect(const tcp::Endpoint& remoteEndpoint,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onFaceCreated,
const FaceCreationFailedCallback& onConnectFailed,
const time::seconds& timeout = time::seconds(4));
@@ -89,8 +90,9 @@ public:
private:
void
createFace(boost::asio::ip::tcp::socket&& socket,
const FaceCreatedCallback& onFaceCreated,
bool isOnDemand);
bool isOnDemand,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onFaceCreated);
void
accept(const FaceCreatedCallback& onFaceCreated,
@@ -104,6 +106,7 @@ private:
void
handleConnect(const boost::system::error_code& error,
const shared_ptr<boost::asio::ip::tcp::socket>& socket,
bool wantLocalFieldsEnabled,
const scheduler::EventId& connectTimeoutEvent,
const FaceCreatedCallback& onFaceCreated,
const FaceCreationFailedCallback& onConnectFailed);
daemon/face/tcp-factory.cpp
+13 -6
View File
@@ -99,14 +99,15 @@ TcpFactory::createChannel(const std::string& localIp, const std::string& localPo
void
TcpFactory::createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed)
const FaceCreationFailedCallback& onFailure)
{
BOOST_ASSERT(uri.isCanonical());
if (persistency != ndn::nfd::FACE_PERSISTENCY_PERSISTENT) {
NFD_LOG_TRACE("createFace only supports FACE_PERSISTENCY_PERSISTENT");
onConnectFailed(406, "Outgoing TCP faces only support persistent persistency");
onFailure(406, "Outgoing TCP faces only support persistent persistency");
return;
}
@@ -115,14 +116,20 @@ TcpFactory::createFace(const FaceUri& uri,
if (endpoint.address().is_multicast()) {
NFD_LOG_TRACE("createFace cannot create multicast faces");
onConnectFailed(406, "Cannot create multicast TCP faces");
onFailure(406, "Cannot create multicast TCP faces");
return;
}
if (m_prohibitedEndpoints.find(endpoint) != m_prohibitedEndpoints.end()) {
NFD_LOG_TRACE("Requested endpoint is prohibited "
"(reserved by NFD or disallowed by face management protocol)");
onConnectFailed(406, "Requested endpoint is prohibited");
onFailure(406, "Requested endpoint is prohibited");
return;
}
if (wantLocalFieldsEnabled && !endpoint.address().is_loopback()) {
NFD_LOG_TRACE("createFace cannot create non-local face with local fields enabled");
onFailure(406, "Local fields can only be enabled on faces with local scope");
return;
}
@@ -130,13 +137,13 @@ TcpFactory::createFace(const FaceUri& uri,
for (const auto& i : m_channels) {
if ((i.first.address().is_v4() && endpoint.address().is_v4()) ||
(i.first.address().is_v6() && endpoint.address().is_v6())) {
i.second->connect(endpoint, onCreated, onConnectFailed);
i.second->connect(endpoint, wantLocalFieldsEnabled, onCreated, onFailure);
return;
}
}
NFD_LOG_TRACE("No channels available to connect to " + boost::lexical_cast<std::string>(endpoint));
onConnectFailed(504, "No channels available to connect");
onFailure(504, "No channels available to connect");
}
std::vector<shared_ptr<const Channel>>
daemon/face/tcp-factory.hpp
+3 -17
View File
@@ -34,19 +34,6 @@ namespace nfd {
class TcpFactory : public ProtocolFactory
{
public:
/**
* \brief Exception of TcpFactory
*/
class Error : public ProtocolFactory::Error
{
public:
explicit
Error(const std::string& what)
: ProtocolFactory::Error(what)
{
}
};
/**
* \brief Create TCP-based channel using tcp::Endpoint
*
@@ -59,8 +46,6 @@ public:
* \returns always a valid pointer to a TcpChannel object, an exception
* is thrown if it cannot be created.
*
* \throws TcpFactory::Error
*
* \see http://www.boost.org/doc/libs/1_42_0/doc/html/boost_asio/reference/ip__tcp/endpoint.html
* for details on ways to create tcp::Endpoint
*/
@@ -73,7 +58,7 @@ public:
* This method is just a helper that converts a string representation of localIp and port to
* tcp::Endpoint and calls the other createChannel overload.
*
* \throws TcpFactory::Error or std::runtime_error
* \throws std::runtime_error
*/
shared_ptr<TcpChannel>
createChannel(const std::string& localIp, const std::string& localPort);
@@ -82,8 +67,9 @@ public: // from ProtocolFactory
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) override;
const FaceCreationFailedCallback& onFailure) override;
virtual std::vector<shared_ptr<const Channel>>
getChannels() const override;
daemon/face/udp-channel.cpp
+3 -1
View File
@@ -146,8 +146,10 @@ UdpChannel::createFace(const udp::Endpoint& remoteEndpoint, ndn::nfd::FacePersis
{
auto it = m_channelFaces.find(remoteEndpoint);
if (it != m_channelFaces.end()) {
// we already have a face for this endpoint, just reuse it
// we already have a face for this endpoint, so reuse it
auto face = it->second;
// TODO #3232: Remove persistency transitions from faces/create
// only on-demand -> persistent -> permanent transition is allowed
bool isTransitionAllowed = persistency != face->getPersistency() &&
(face->getPersistency() == ndn::nfd::FACE_PERSISTENCY_ON_DEMAND ||
daemon/face/udp-factory.cpp
+14 -6
View File
@@ -233,14 +233,15 @@ UdpFactory::createMulticastFace(const std::string& localIp,
void
UdpFactory::createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed)
const FaceCreationFailedCallback& onFailure)
{
BOOST_ASSERT(uri.isCanonical());
if (persistency == ndn::nfd::FACE_PERSISTENCY_ON_DEMAND) {
NFD_LOG_TRACE("createFace does not support FACE_PERSISTENCY_ON_DEMAND");
onConnectFailed(406, "Outgoing unicast UDP faces do not support on-demand persistency");
onFailure(406, "Outgoing unicast UDP faces do not support on-demand persistency");
return;
}
@@ -249,14 +250,21 @@ UdpFactory::createFace(const FaceUri& uri,
if (endpoint.address().is_multicast()) {
NFD_LOG_TRACE("createFace does not support multicast faces");
onConnectFailed(406, "Cannot create multicast UDP faces");
onFailure(406, "Cannot create multicast UDP faces");
return;
}
if (m_prohibitedEndpoints.find(endpoint) != m_prohibitedEndpoints.end()) {
NFD_LOG_TRACE("Requested endpoint is prohibited "
"(reserved by this NFD or disallowed by face management protocol)");
onConnectFailed(406, "Requested endpoint is prohibited");
onFailure(406, "Requested endpoint is prohibited");
return;
}
if (wantLocalFieldsEnabled) {
// UDP faces are never local
NFD_LOG_TRACE("createFace cannot create non-local face with local fields enabled");
onFailure(406, "Local fields can only be enabled on faces with local scope");
return;
}
@@ -264,13 +272,13 @@ UdpFactory::createFace(const FaceUri& uri,
for (const auto& i : m_channels) {
if ((i.first.address().is_v4() && endpoint.address().is_v4()) ||
(i.first.address().is_v6() && endpoint.address().is_v6())) {
i.second->connect(endpoint, persistency, onCreated, onConnectFailed);
i.second->connect(endpoint, persistency, onCreated, onFailure);
return;
}
}
NFD_LOG_TRACE("No channels available to connect to " + boost::lexical_cast<std::string>(endpoint));
onConnectFailed(504, "No channels available to connect");
onFailure(504, "No channels available to connect");
}
std::vector<shared_ptr<const Channel>>
daemon/face/udp-factory.hpp
+2 -1
View File
@@ -149,8 +149,9 @@ public: // from ProtocolFactory
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) override;
const FaceCreationFailedCallback& onFailure) override;
virtual std::vector<shared_ptr<const Channel>>
getChannels() const override;
daemon/face/unix-stream-factory.cpp
+3 -2
View File
@@ -48,10 +48,11 @@ UnixStreamFactory::createChannel(const std::string& unixSocketPath)
void
UnixStreamFactory::createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed)
const FaceCreationFailedCallback& onFailure)
{
onConnectFailed(406, "Unsupported protocol");
onFailure(406, "Unsupported protocol");
}
std::vector<shared_ptr<const Channel>>
daemon/face/unix-stream-factory.hpp
+2 -16
View File
@@ -34,19 +34,6 @@ namespace nfd {
class UnixStreamFactory : public ProtocolFactory
{
public:
/**
* \brief Exception of UnixStreamFactory
*/
class Error : public ProtocolFactory::Error
{
public:
explicit
Error(const std::string& what)
: ProtocolFactory::Error(what)
{
}
};
/**
* \brief Create stream-oriented Unix channel using specified socket path
*
@@ -56,8 +43,6 @@ public:
*
* \returns always a valid pointer to a UnixStreamChannel object,
* an exception will be thrown if the channel cannot be created.
*
* \throws UnixStreamFactory::Error
*/
shared_ptr<UnixStreamChannel>
createChannel(const std::string& unixSocketPath);
@@ -66,8 +51,9 @@ public: // from ProtocolFactory
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) override;
const FaceCreationFailedCallback& onFailure) override;
virtual std::vector<shared_ptr<const Channel>>
getChannels() const override;
daemon/face/websocket-factory.cpp
+3 -2
View File
@@ -53,10 +53,11 @@ WebSocketFactory::createChannel(const std::string& localIp, const std::string& l
void
WebSocketFactory::createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed)
const FaceCreationFailedCallback& onFailure)
{
onConnectFailed(406, "Unsupported protocol");
onFailure(406, "Unsupported protocol");
}
std::vector<shared_ptr<const Channel>>
daemon/face/websocket-factory.hpp
+2 -18
View File
@@ -34,19 +34,6 @@ namespace nfd {
class WebSocketFactory : public ProtocolFactory
{
public:
/**
* \brief Exception of WebSocketFactory
*/
class Error : public ProtocolFactory::Error
{
public:
explicit
Error(const std::string& what)
: ProtocolFactory::Error(what)
{
}
};
/**
* \brief Create WebSocket-based channel using websocket::Endpoint
*
@@ -58,8 +45,6 @@ public:
*
* \returns always a valid pointer to a WebSocketChannel object, an exception
* is thrown if it cannot be created.
*
* \throws WebSocketFactory::Error
*/
shared_ptr<WebSocketChannel>
createChannel(const websocket::Endpoint& localEndpoint);
@@ -69,8 +54,6 @@ public:
*
* This method is just a helper that converts a string representation of localIp and port to
* websocket::Endpoint and calls the other createChannel overload.
*
* \throws WebSocketFactory::Error
*/
shared_ptr<WebSocketChannel>
createChannel(const std::string& localIp, const std::string& localPort);
@@ -79,8 +62,9 @@ public: // from ProtocolFactory
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) override;
const FaceCreationFailedCallback& onFailure) override;
virtual std::vector<shared_ptr<const Channel>>
getChannels() const override;
daemon/mgmt/face-manager.cpp
+41 -10
View File
@@ -115,6 +115,8 @@ FaceManager::createFace(const Name& topPrefix, const Interest& interest,
try {
factory->second->createFace(uri,
parameters.getFacePersistency(),
parameters.hasFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) ?
parameters.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) : false,
bind(&FaceManager::afterCreateFaceSuccess,
this, parameters, _1, done),
bind(&FaceManager::afterCreateFaceFailure,
@@ -140,20 +142,45 @@ FaceManager::createFace(const Name& topPrefix, const Interest& interest,
*/
void
FaceManager::afterCreateFaceSuccess(const ControlParameters& parameters,
const shared_ptr<Face>& newFace,
const shared_ptr<Face>& face,
const ndn::mgmt::CommandContinuation& done)
{
// TODO: Re-enable check in #3232
//if (face->getId() != face::INVALID_FACEID) {
//// Face already exists
//ControlParameters response;
//response.setFaceId(face->getId());
//response.setUri(face->getRemoteUri().toString());
//response.setFacePersistency(face->getPersistency());
//
//auto linkService = dynamic_cast<face::GenericLinkService*>(face->getLinkService());
//BOOST_ASSERT(linkService != nullptr);
//auto options = linkService->getOptions();
//response.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, options.allowLocalFields, false);
//
// NFD_LOG_TRACE("Attempted to create duplicate face of " << face->getId());
// done(ControlResponse(409, "Face with remote URI already exists").setBody(response.wireEncode()));
//}
//else {
// If scope non-local and flags set to enable local fields, request shouldn't
// have made it this far
BOOST_ASSERT(face->getScope() == ndn::nfd::FACE_SCOPE_LOCAL ||
!parameters.hasFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) ||
(parameters.hasFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) &&
!parameters.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED)));
m_faceTable.add(face);
ControlParameters response;
m_faceTable.add(newFace);
// TODO: #3731: Verify and add Flags
// Set ControlResponse parameters
response.setFaceId(newFace->getId());
response.setFacePersistency(newFace->getPersistency());
response.setFaceId(face->getId());
response.setFacePersistency(face->getPersistency());
response.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED,
parameters.hasFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) ?
parameters.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) : false,
false);
done(ControlResponse(200, "OK").setBody(response.wireEncode()));
//}
}
void
@@ -222,9 +249,13 @@ FaceManager::updateFace(const Name& topPrefix, const Interest& interest,
setLinkServiceOptions(*face, parameters, response);
// Set remaining ControlResponse fields
// Set ControlResponse fields
response.setFaceId(faceId);
response.setFacePersistency(face->getPersistency());
response.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED,
parameters.hasFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) ?
parameters.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED) : false,
false);
done(ControlResponse(200, "OK").setBody(response.wireEncode()));
}
tests/daemon/face/ethernet-factory.t.cpp
+3
View File
@@ -69,16 +69,19 @@ BOOST_AUTO_TEST_CASE(UnsupportedFaceCreate)
createFace(factory,
FaceUri("ether://[08:00:27:01:01:01]"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("ether://[08:00:27:01:01:01]"),
ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("ether://[08:00:27:01:01:01]"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
}
tests/daemon/face/factory-test-common.hpp
+2 -1
View File
@@ -44,9 +44,10 @@ inline void
createFace(ProtocolFactory& factory,
const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const CreateFaceExpectedResult& expected)
{
factory.createFace(uri, persistency,
factory.createFace(uri, persistency, wantLocalFieldsEnabled,
[expected] (const shared_ptr<Face>& newFace) {
BOOST_CHECK_EQUAL(CreateFaceExpectedResult::SUCCESS, expected.result);
},
tests/daemon/face/tcp-channel.t.cpp
+2 -2
View File
@@ -77,7 +77,7 @@ protected:
void
connect(TcpChannel& channel)
{
channel.connect(listenerEp,
channel.connect(listenerEp, false,
[this] (const shared_ptr<Face>& newFace) {
BOOST_REQUIRE(newFace != nullptr);
connectFaceClosedSignal(*newFace, [this] { limitedIo.afterOp(); });
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(ConnectTimeout, A, AddressFamilies)
// do not listen
auto channel = makeChannel(A());
channel->connect(tcp::Endpoint(address, 7040),
channel->connect(tcp::Endpoint(address, 7040), false,
[this] (const shared_ptr<Face>&) {
BOOST_FAIL("Connect succeeded when it should have failed");
this->limitedIo.afterOp();
tests/daemon/face/tcp-factory.t.cpp
+5
View File
@@ -79,6 +79,7 @@ BOOST_AUTO_TEST_CASE(FaceCreate)
createFace(factory,
FaceUri("tcp4://127.0.0.1:6363"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::FAILURE, 504, "No channels available to connect"});
factory.createChannel("127.0.0.1", "20071");
@@ -86,6 +87,7 @@ BOOST_AUTO_TEST_CASE(FaceCreate)
createFace(factory,
FaceUri("tcp4://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::SUCCESS, 0, ""});
}
@@ -99,12 +101,14 @@ BOOST_AUTO_TEST_CASE(UnsupportedFaceCreate)
createFace(factory,
FaceUri("tcp4://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::FAILURE, 406,
"Outgoing TCP faces only support persistent persistency"});
createFace(factory,
FaceUri("tcp4://127.0.0.1:20071"),
ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
false,
{CreateFaceExpectedResult::FAILURE, 406,
"Outgoing TCP faces only support persistent persistency"});
}
@@ -143,6 +147,7 @@ BOOST_FIXTURE_TEST_CASE(FaceCreateTimeout, FaceCreateTimeoutFixture)
factory.createFace(FaceUri("tcp4://192.0.2.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
bind(&FaceCreateTimeoutFixture::onFaceCreated, this, _1),
bind(&FaceCreateTimeoutFixture::onConnectFailed, this, _2));
tests/daemon/face/udp-factory.t.cpp
+5
View File
@@ -151,6 +151,7 @@ BOOST_AUTO_TEST_CASE(FaceCreate)
createFace(factory,
FaceUri("udp4://127.0.0.1:6363"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::FAILURE, 504, "No channels available to connect"});
factory.createChannel("127.0.0.1", "20071");
@@ -158,16 +159,19 @@ BOOST_AUTO_TEST_CASE(FaceCreate)
createFace(factory,
FaceUri("udp4://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::SUCCESS, 0, ""});
//test the upgrade
createFace(factory,
FaceUri("udp4://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::SUCCESS, 0, ""});
createFace(factory,
FaceUri("udp4://127.0.0.1:20072"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::SUCCESS, 0, ""});
}
@@ -180,6 +184,7 @@ BOOST_AUTO_TEST_CASE(UnsupportedFaceCreate)
createFace(factory,
FaceUri("udp4://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
false,
{CreateFaceExpectedResult::FAILURE, 406,
"Outgoing unicast UDP faces do not support on-demand persistency"});
}
tests/daemon/face/unix-stream-factory.t.cpp
+3
View File
@@ -80,16 +80,19 @@ BOOST_AUTO_TEST_CASE(UnsupportedFaceCreate)
createFace(factory,
FaceUri("unix:///var/run/nfd.sock"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("unix:///var/run/nfd.sock"),
ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("unix:///var/run/nfd.sock"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
}
tests/daemon/face/websocket-factory.t.cpp
+3
View File
@@ -62,16 +62,19 @@ BOOST_AUTO_TEST_CASE(UnsupportedFaceCreate)
createFace(factory,
FaceUri("ws://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERMANENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("ws://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
createFace(factory,
FaceUri("ws://127.0.0.1:20070"),
ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
false,
{CreateFaceExpectedResult::FAILURE, 406, "Unsupported protocol"});
}
tests/daemon/mgmt/face-manager-create-face.t.cpp
+63 -4
View File
@@ -120,6 +120,58 @@ public:
}
};
class LocalTcpFaceLocalFieldsEnabled
{
public:
ControlParameters
getParameters()
{
return ControlParameters()
.setUri("tcp4://127.0.0.1:26363")
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true);
}
};
class LocalTcpFaceLocalFieldsDisabled
{
public:
ControlParameters
getParameters()
{
return ControlParameters()
.setUri("tcp4://127.0.0.1:26363")
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, false);
}
};
class NonLocalUdpFaceLocalFieldsEnabled // won't work because non-local scope
{
public:
ControlParameters
getParameters()
{
return ControlParameters()
.setUri("udp4://127.0.0.1:26363")
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, true);
}
};
class NonLocalUdpFaceLocalFieldsDisabled
{
public:
ControlParameters
getParameters()
{
return ControlParameters()
.setUri("udp4://127.0.0.1:26363")
.setFacePersistency(ndn::nfd::FACE_PERSISTENCY_PERSISTENT)
.setFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED, false);
}
};
namespace mpl = boost::mpl;
// pairs of CreateCommand and Success/Failure status
@@ -129,7 +181,11 @@ typedef mpl::vector<mpl::pair<TcpFaceOnDemand, CommandFailure<406>>,
mpl::pair<UdpFaceOnDemand, CommandFailure<406>>,
mpl::pair<UdpFacePersistent, CommandSuccess>,
mpl::pair<UdpFacePermanent, CommandSuccess>,
mpl::pair<UdpFaceConnectToSelf, CommandFailure<406>>> Faces;
mpl::pair<UdpFaceConnectToSelf, CommandFailure<406>>,
mpl::pair<LocalTcpFaceLocalFieldsEnabled, CommandSuccess>,
mpl::pair<LocalTcpFaceLocalFieldsDisabled, CommandSuccess>,
mpl::pair<NonLocalUdpFaceLocalFieldsEnabled, CommandFailure<406>>,
mpl::pair<NonLocalUdpFaceLocalFieldsDisabled, CommandSuccess>> Faces;
BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, Faces, FaceManagerCommandFixture)
{
@@ -162,10 +218,12 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, Faces, FaceManagerCommandFixture)
if (actual.getCode() == 200) {
if (expectedParams.hasFlags()) {
// TODO: #3731 check if Flags match
BOOST_CHECK_EQUAL(expectedParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED),
actualParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED));
}
else {
// TODO: #3731 check if Flags at defaults
// local fields are disabled by default
BOOST_CHECK_EQUAL(actualParams.getFlagBit(ndn::nfd::BIT_LOCAL_FIELDS_ENABLED), false);
}
}
else {
@@ -193,7 +251,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(NewFace, T, Faces, FaceManagerCommandFixture)
typedef mpl::vector<// mpl::pair<mpl::pair<TcpFacePersistent, TcpFacePermanent>, TcpFacePermanent>, // no need to check now
// mpl::pair<mpl::pair<TcpFacePermanent, TcpFacePersistent>, TcpFacePermanent>, // no need to check now
// mpl::pair<mpl::pair<TcpFacePermanent, TcpFacePersistent>, TcpFacePersistent>, // no need to check now
mpl::pair<mpl::pair<UdpFacePersistent, UdpFacePermanent>, UdpFacePermanent>,
mpl::pair<mpl::pair<UdpFacePermanent, UdpFacePersistent>, UdpFacePermanent>> FaceTransitions;
@@ -235,6 +293,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(ExistingFace, T, FaceTransitions, FaceManagerCo
ControlResponse actual(response.getContent().blockFromValue());
BOOST_REQUIRE_EQUAL(actual.getCode(), 200);
BOOST_TEST_MESSAGE(actual.getText());
ControlParameters expectedParams(FinalFaceType().getParameters());
ControlParameters actualParams(actual.getBody());
tests/daemon/mgmt/face-manager.t.cpp
+1
View File
@@ -335,6 +335,7 @@ public:
virtual void
createFace(const FaceUri& uri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
const FaceCreatedCallback& onCreated,
const FaceCreationFailedCallback& onConnectFailed) override
{
tests/other/face-benchmark.cpp
+1
View File
@@ -128,6 +128,7 @@ private:
auto port = boost::lexical_cast<uint16_t>(uriR.getPort());
if (uriR.getScheme() == "tcp4") {
m_tcpChannel.connect(tcp::Endpoint(addr, port),
false,
bind(&FaceBenchmark::onRightFaceCreated, this, faceL, _1),
bind(&FaceBenchmark::onFaceCreationFailed, _1, _2));
}