daemon+tests: avoid deprecated ndn-cxx functions
Change-Id: Idfa341629919d63fac140eda0b465f8f8abd38e6
diff --git a/daemon/face/websocket-transport.cpp b/daemon/face/websocket-transport.cpp
index 33ae643..2d118ec 100644
--- a/daemon/face/websocket-transport.cpp
+++ b/daemon/face/websocket-transport.cpp
@@ -83,7 +83,7 @@
NFD_LOG_FACE_TRACE(__func__);
websocketpp::lib::error_code error;
- m_server.send(m_handle, packet.wire(), packet.size(),
+ m_server.send(m_handle, packet.data(), packet.size(),
websocketpp::frame::opcode::binary, error);
if (error)
return processErrorCode(error);
diff --git a/daemon/table/dead-nonce-list.cpp b/daemon/table/dead-nonce-list.cpp
index 5805842..55bf346 100644
--- a/daemon/table/dead-nonce-list.cpp
+++ b/daemon/table/dead-nonce-list.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -109,7 +109,7 @@
const auto& nameWire = name.wireEncode();
uint32_t n;
std::memcpy(&n, nonce.data(), sizeof(n));
- return CityHash64WithSeed(reinterpret_cast<const char*>(nameWire.wire()), nameWire.size(), n);
+ return CityHash64WithSeed(reinterpret_cast<const char*>(nameWire.data()), nameWire.size(), n);
}
size_t
diff --git a/daemon/table/name-tree-hashtable.cpp b/daemon/table/name-tree-hashtable.cpp
index 7d20a34..30e4ca3 100644
--- a/daemon/table/name-tree-hashtable.cpp
+++ b/daemon/table/name-tree-hashtable.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -64,7 +64,7 @@
HashValue h = 0;
for (size_t i = 0, last = std::min(prefixLen, name.size()); i < last; ++i) {
const name::Component& comp = name[i];
- h ^= HashFunc::compute(comp.wire(), comp.size());
+ h ^= HashFunc::compute(comp.data(), comp.size());
}
return h;
}
@@ -83,7 +83,7 @@
for (size_t i = 0; i < last; ++i) {
const name::Component& comp = name[i];
- h ^= HashFunc::compute(comp.wire(), comp.size());
+ h ^= HashFunc::compute(comp.data(), comp.size());
seq.push_back(h);
}
return seq;
diff --git a/tests/daemon/face/websocket-channel-fixture.hpp b/tests/daemon/face/websocket-channel-fixture.hpp
index e6e1e9f..3072992 100644
--- a/tests/daemon/face/websocket-channel-fixture.hpp
+++ b/tests/daemon/face/websocket-channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -93,7 +93,7 @@
clientSendInterest(const Interest& interest)
{
const Block& payload = interest.wireEncode();
- client.send(clientHandle, payload.wire(), payload.size(), websocketpp::frame::opcode::binary);
+ client.send(clientHandle, payload.data(), payload.size(), websocketpp::frame::opcode::binary);
}
private:
diff --git a/tests/daemon/face/websocket-transport.t.cpp b/tests/daemon/face/websocket-transport.t.cpp
index c0b8367..008a41f 100644
--- a/tests/daemon/face/websocket-transport.t.cpp
+++ b/tests/daemon/face/websocket-transport.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -147,7 +147,7 @@
TRANSPORT_TEST_INIT();
auto pkt1 = ndn::encoding::makeStringBlock(300, "hello");
- this->client.send(this->clientHdl, pkt1.wire(), pkt1.size(), websocketpp::frame::opcode::binary);
+ this->client.send(this->clientHdl, pkt1.data(), pkt1.size(), websocketpp::frame::opcode::binary);
BOOST_CHECK_EQUAL(this->limitedIo.run(1, // serverHandleMessage
1_s), LimitedIo::EXCEED_OPS);
@@ -155,7 +155,7 @@
BOOST_CHECK_EQUAL(this->transport->getCounters().nInBytes, pkt1.size());
auto pkt2 = ndn::encoding::makeStringBlock(301, "world!");
- this->client.send(this->clientHdl, pkt2.wire(), pkt2.size(), websocketpp::frame::opcode::binary);
+ this->client.send(this->clientHdl, pkt2.data(), pkt2.size(), websocketpp::frame::opcode::binary);
BOOST_CHECK_EQUAL(this->limitedIo.run(1, // serverHandleMessage
1_s), LimitedIo::EXCEED_OPS);
@@ -175,7 +175,7 @@
TRANSPORT_TEST_INIT();
auto pkt1 = ndn::encoding::makeStringBlock(300, "hello");
- this->client.send(this->clientHdl, pkt1.wire(), pkt1.size() - 1, // truncated
+ this->client.send(this->clientHdl, pkt1.data(), pkt1.size() - 1, // truncated
websocketpp::frame::opcode::binary);
BOOST_CHECK_EQUAL(this->limitedIo.run(1, // serverHandleMessage
1_s), LimitedIo::EXCEED_OPS);
@@ -185,7 +185,7 @@
BOOST_CHECK_EQUAL(this->serverReceivedPackets->size(), 0);
auto pkt2 = ndn::encoding::makeStringBlock(301, "world!");
- this->client.send(this->clientHdl, pkt2.wire(), pkt2.size(), websocketpp::frame::opcode::binary);
+ this->client.send(this->clientHdl, pkt2.data(), pkt2.size(), websocketpp::frame::opcode::binary);
BOOST_CHECK_EQUAL(this->limitedIo.run(1, // serverHandleMessage
1_s), LimitedIo::EXCEED_OPS);
diff --git a/tests/daemon/mgmt/command-authenticator.t.cpp b/tests/daemon/mgmt/command-authenticator.t.cpp
index c52c81b..7db02ca 100644
--- a/tests/daemon/mgmt/command-authenticator.t.cpp
+++ b/tests/daemon/mgmt/command-authenticator.t.cpp
@@ -297,8 +297,7 @@
BOOST_CHECK_EQUAL(authorize1(
[] (Interest& interest) {
ndn::SignatureInfo sigInfo(tlv::SignatureSha256WithRsa);
- setNameComponent(interest, ndn::signed_interest::POS_SIG_INFO,
- sigInfo.wireEncode().begin(), sigInfo.wireEncode().end());
+ setNameComponent(interest, ndn::signed_interest::POS_SIG_INFO, ndn::make_span(sigInfo.wireEncode()));
}
), false);
BOOST_CHECK(lastRejectReply == ndn::mgmt::RejectReply::SILENT);
@@ -313,8 +312,7 @@
{0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD}));
ndn::SignatureInfo sigInfo(tlv::SignatureSha256WithRsa);
sigInfo.setKeyLocator(kl);
- setNameComponent(interest, ndn::signed_interest::POS_SIG_INFO,
- sigInfo.wireEncode().begin(), sigInfo.wireEncode().end());
+ setNameComponent(interest, ndn::signed_interest::POS_SIG_INFO, ndn::make_span(sigInfo.wireEncode()));
}
), false);
BOOST_CHECK(lastRejectReply == ndn::mgmt::RejectReply::SILENT);
diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index 0e43944..828325f 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -216,18 +216,16 @@
auto face2 = addFace(REMOVE_LAST_NOTIFICATION | SET_SCOPE_LOCAL); // dummy://, local
auto face3 = addFace(REMOVE_LAST_NOTIFICATION | SET_URI_TEST); // test://
- auto generateQuery = [] (const FaceQueryFilter& filter) {
- return Interest(Name("/localhost/nfd/faces/query")
- .append(filter.wireEncode().begin(), filter.wireEncode().end()))
+ auto generateQuery = [] (const auto& filter) {
+ return Interest(Name("/localhost/nfd/faces/query").append(tlv::GenericNameComponent, filter.wireEncode()))
.setCanBePrefix(true);
};
auto schemeQuery = generateQuery(FaceQueryFilter().setUriScheme("dummy"));
auto idQuery = generateQuery(FaceQueryFilter().setFaceId(face1->getId()));
auto scopeQuery = generateQuery(FaceQueryFilter().setFaceScope(ndn::nfd::FACE_SCOPE_NON_LOCAL));
- auto invalidContent = ndn::makeStringBlock(tlv::Content, "invalid");
auto invalidQueryName = Name("/localhost/nfd/faces/query")
- .append(invalidContent.begin(), invalidContent.end());
+ .append(tlv::GenericNameComponent, ndn::makeStringBlock(tlv::Content, "invalid"));
auto invalidQuery = Interest(invalidQueryName).setCanBePrefix(true);
receiveInterest(schemeQuery); // face1 and face2 expected
diff --git a/tests/daemon/mgmt/manager-common-fixture.cpp b/tests/daemon/mgmt/manager-common-fixture.cpp
index db207e9..83136be 100644
--- a/tests/daemon/mgmt/manager-common-fixture.cpp
+++ b/tests/daemon/mgmt/manager-common-fixture.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -47,7 +47,7 @@
const ControlParameters& params,
const Name& identity)
{
- commandName.append(params.wireEncode());
+ commandName.append(tlv::GenericNameComponent, params.wireEncode());
return this->makeCommandInterest(commandName, identity);
}
@@ -155,12 +155,11 @@
}
ndn::EncodingBuffer encoder;
- size_t valueLength = 0;
+ size_t length = 0;
for (size_t i = startIndex; i < endIndex ; i ++) {
- valueLength += encoder.appendByteArray(m_responses[i].getContent().value(),
- m_responses[i].getContent().value_size());
+ length += encoder.appendBytes(m_responses[i].getContent().value_bytes());
}
- encoder.prependVarNumber(valueLength);
+ encoder.prependVarNumber(length);
encoder.prependVarNumber(tlv::Content);
return encoder.block();
}
diff --git a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
index 616b6e8..597bad4 100644
--- a/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
+++ b/tests/daemon/mgmt/rib-manager-sl-announce.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2020, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -153,13 +153,11 @@
std::string
getIdentityCertificateBase64(const Name& identity) const
{
- auto cert = m_keyChain.getPib().getIdentity(identity).getDefaultKey().getDefaultCertificate();
- const auto& block = cert.wireEncode();
-
namespace tr = ndn::security::transform;
- std::ostringstream oss;
- tr::bufferSource(block.wire(), block.size()) >> tr::base64Encode(false) >> tr::streamSink(oss);
+ auto cert = m_keyChain.getPib().getIdentity(identity).getDefaultKey().getDefaultCertificate();
+ std::ostringstream oss;
+ tr::bufferSource(cert.wireEncode()) >> tr::base64Encode(false) >> tr::streamSink(oss);
return oss.str();
}
diff --git a/wscript b/wscript
index afec2fc..b08fbf6 100644
--- a/wscript
+++ b/wscript
@@ -94,8 +94,9 @@
conf.find_program('bash', var='BASH')
conf.find_program('dot', var='DOT', mandatory=False)
- conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'], uselib_store='NDN_CXX',
- pkg_config_path=os.environ.get('PKG_CONFIG_PATH', '%s/pkgconfig' % conf.env.LIBDIR))
+ pkg_config_path = os.environ.get('PKG_CONFIG_PATH', f'{conf.env.LIBDIR}/pkgconfig')
+ conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.0', '--cflags', '--libs'],
+ uselib_store='NDN_CXX', pkg_config_path=pkg_config_path)
if not conf.options.without_systemd:
conf.check_cfg(package='libsystemd', args=['--cflags', '--libs'],