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

face: GenericLinkService encodes and decodes CongestionMark field

Browse Source 
refs #3797

Change-Id: Ia6b00a36f3e7ed9ec98e41dee7e2f97eaf235ddd
This commit is contained in:
Eric Newberry authored and Junxiao Shi committed 2016-11-24 14:12:48 +00:00
1 parent e273333fba
commit ee400b5235
3 files changed
+117 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

daemon/face/generic-link-service.cpp
+26 -13
View File
@@ -58,9 +58,7 @@ GenericLinkService::doSendInterest(const Interest& interest)
{
lp::Packet lpPacket(interest.wireEncode());
if (m_options.allowLocalFields) {
encodeLocalFields(interest, lpPacket);
}
encodeLpFields(interest, lpPacket);
this->sendNetPacket(std::move(lpPacket));
}
@@ -70,9 +68,7 @@ GenericLinkService::doSendData(const Data& data)
{
lp::Packet lpPacket(data.wireEncode());
if (m_options.allowLocalFields) {
encodeLocalFields(data, lpPacket);
}
encodeLpFields(data, lpPacket);
this->sendNetPacket(std::move(lpPacket));
}
@@ -83,19 +79,24 @@ GenericLinkService::doSendNack(const lp::Nack& nack)
lp::Packet lpPacket(nack.getInterest().wireEncode());
lpPacket.add<lp::NackField>(nack.getHeader());
if (m_options.allowLocalFields) {
encodeLocalFields(nack, lpPacket);
}
encodeLpFields(nack, lpPacket);
this->sendNetPacket(std::move(lpPacket));
}
void
GenericLinkService::encodeLocalFields(const ndn::TagHost& netPkt, lp::Packet& lpPacket)
GenericLinkService::encodeLpFields(const ndn::TagHost& netPkt, lp::Packet& lpPacket)
{
shared_ptr<lp::IncomingFaceIdTag> incomingFaceIdTag = netPkt.getTag<lp::IncomingFaceIdTag>();
if (incomingFaceIdTag != nullptr) {
lpPacket.add<lp::IncomingFaceIdField>(*incomingFaceIdTag);
if (m_options.allowLocalFields) {
shared_ptr<lp::IncomingFaceIdTag> incomingFaceIdTag = netPkt.getTag<lp::IncomingFaceIdTag>();
if (incomingFaceIdTag != nullptr) {
lpPacket.add<lp::IncomingFaceIdField>(*incomingFaceIdTag);
}
}
shared_ptr<lp::CongestionMarkTag> congestionMarkTag = netPkt.getTag<lp::CongestionMarkTag>();
if (congestionMarkTag != nullptr) {
lpPacket.add<lp::CongestionMarkField>(*congestionMarkTag);
}
}
@@ -241,6 +242,10 @@ GenericLinkService::decodeInterest(const Block& netPkt, const lp::Packet& firstP
NFD_LOG_FACE_WARN("received IncomingFaceId: IGNORE");
}
if (firstPkt.has<lp::CongestionMarkField>()) {
interest->setTag(make_shared<lp::CongestionMarkTag>(firstPkt.get<lp::CongestionMarkField>()));
}
this->receiveInterest(*interest);
}
@@ -279,6 +284,10 @@ GenericLinkService::decodeData(const Block& netPkt, const lp::Packet& firstPkt)
NFD_LOG_FACE_WARN("received IncomingFaceId: IGNORE");
}
if (firstPkt.has<lp::CongestionMarkField>()) {
data->setTag(make_shared<lp::CongestionMarkTag>(firstPkt.get<lp::CongestionMarkField>()));
}
this->receiveData(*data);
}
@@ -307,6 +316,10 @@ GenericLinkService::decodeNack(const Block& netPkt, const lp::Packet& firstPkt)
NFD_LOG_FACE_WARN("received IncomingFaceId: IGNORE");
}
if (firstPkt.has<lp::CongestionMarkField>()) {
nack.setTag(make_shared<lp::CongestionMarkTag>(firstPkt.get<lp::CongestionMarkField>()));
}
this->receiveNack(nack);
}
daemon/face/generic-link-service.hpp
+5 -4
View File
@@ -145,11 +145,12 @@ private: // send path
void
doSendNack(const ndn::lp::Nack& nack) override;
/** \brief encode local fields from tags onto outgoing LpPacket
* \param pkt LpPacket containing a complete network layer packet
/** \brief encode link protocol fields from tags onto an outgoing LpPacket
* \param netPkt network-layer packet to extract tags from
* \param lpPacket LpPacket to add link protocol fields to
*/
static void
encodeLocalFields(const ndn::TagHost& netPkt, lp::Packet& lpPacket);
void
encodeLpFields(const ndn::TagHost& netPkt, lp::Packet& lpPacket);
/** \brief send a complete network layer packet
* \param pkt LpPacket containing a complete network layer packet
tests/daemon/face/generic-link-service.t.cpp
+86 -2
View File
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE(ReassemblyDisabledDropFragCount)
BOOST_AUTO_TEST_SUITE_END() // Fragmentation
BOOST_AUTO_TEST_SUITE(LocalFields)
BOOST_AUTO_TEST_SUITE(LpFields)
BOOST_AUTO_TEST_CASE(ReceiveNextHopFaceId)
{
@@ -637,7 +637,91 @@ BOOST_AUTO_TEST_CASE(ReceiveIncomingFaceIdIgnoreNack)
BOOST_CHECK(receivedNacks.back().getTag<lp::IncomingFaceIdTag>() == nullptr);
}
BOOST_AUTO_TEST_SUITE_END() // LocalFields
BOOST_AUTO_TEST_CASE(SendCongestionMarkInterest)
{
shared_ptr<Interest> interest = makeInterest("/12345678");
interest->setTag(make_shared<lp::CongestionMarkTag>(1));
face->sendInterest(*interest);
BOOST_REQUIRE_EQUAL(transport->sentPackets.size(), 1);
lp::Packet sent(transport->sentPackets.back().packet);
BOOST_REQUIRE(sent.has<lp::CongestionMarkField>());
BOOST_CHECK_EQUAL(sent.get<lp::CongestionMarkField>(), 1);
}
BOOST_AUTO_TEST_CASE(SendCongestionMarkData)
{
shared_ptr<Data> data = makeData("/12345678");
data->setTag(make_shared<lp::CongestionMarkTag>(0));
face->sendData(*data);
BOOST_REQUIRE_EQUAL(transport->sentPackets.size(), 1);
lp::Packet sent(transport->sentPackets.back().packet);
BOOST_REQUIRE(sent.has<lp::CongestionMarkField>());
BOOST_CHECK_EQUAL(sent.get<lp::CongestionMarkField>(), 0);
}
BOOST_AUTO_TEST_CASE(SendCongestionMarkNack)
{
lp::Nack nack = makeNack("/localhost/test", 123, lp::NackReason::NO_ROUTE);
nack.setTag(make_shared<lp::CongestionMarkTag>(std::numeric_limits<uint64_t>::max()));
face->sendNack(nack);
BOOST_REQUIRE_EQUAL(transport->sentPackets.size(), 1);
lp::Packet sent(transport->sentPackets.back().packet);
BOOST_REQUIRE(sent.has<lp::CongestionMarkField>());
BOOST_CHECK_EQUAL(sent.get<lp::CongestionMarkField>(), std::numeric_limits<uint64_t>::max());
}
BOOST_AUTO_TEST_CASE(ReceiveCongestionMarkInterest)
{
shared_ptr<Interest> interest = makeInterest("/12345678");
lp::Packet packet(interest->wireEncode());
packet.set<lp::CongestionMarkField>(1);
transport->receivePacket(packet.wireEncode());
BOOST_REQUIRE_EQUAL(receivedInterests.size(), 1);
shared_ptr<lp::CongestionMarkTag> tag = receivedInterests.back().getTag<lp::CongestionMarkTag>();
BOOST_REQUIRE(tag != nullptr);
BOOST_CHECK_EQUAL(*tag, 1);
}
BOOST_AUTO_TEST_CASE(ReceiveCongestionMarkData)
{
shared_ptr<Data> data = makeData("/12345678");
lp::Packet packet(data->wireEncode());
packet.set<lp::CongestionMarkField>(1);
transport->receivePacket(packet.wireEncode());
BOOST_REQUIRE_EQUAL(receivedData.size(), 1);
shared_ptr<lp::CongestionMarkTag> tag = receivedData.back().getTag<lp::CongestionMarkTag>();
BOOST_REQUIRE(tag != nullptr);
BOOST_CHECK_EQUAL(*tag, 1);
}
BOOST_AUTO_TEST_CASE(ReceiveCongestionMarkNack)
{
lp::Nack nack = makeNack("/localhost/test", 123, lp::NackReason::NO_ROUTE);
lp::Packet packet;
packet.set<lp::FragmentField>(std::make_pair(
nack.getInterest().wireEncode().begin(), nack.getInterest().wireEncode().end()));
packet.set<lp::NackField>(nack.getHeader());
packet.set<lp::CongestionMarkField>(1);
transport->receivePacket(packet.wireEncode());
BOOST_REQUIRE_EQUAL(receivedNacks.size(), 1);
shared_ptr<lp::CongestionMarkTag> tag = receivedNacks.back().getTag<lp::CongestionMarkTag>();
BOOST_REQUIRE(tag != nullptr);
BOOST_CHECK_EQUAL(*tag, 1);
}
BOOST_AUTO_TEST_SUITE_END() // LpFields
BOOST_AUTO_TEST_SUITE(Malformed) // receive malformed packets