commit b38e6d49c0f9df7b9b468910acf9bc08d76281a1
author Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 16 16:15:28 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 16 16:15:28 2017 +0000
tree 005b5a71068c26ca9228419f16583365b53a9e62
parent 2bea5c4fe032575d41e74f27f6f64daaa284031b

util: ignore NextHopFaceId on Nack in DummyClientFace

refs #4224

Change-Id: Ic2e78eabc83fbeeea8283412c44b10a04c3acd86

src/face.cpp

diff --git a/src/face.cpp b/src/face.cpp
index 8e59ce9..8580720 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -376,13 +376,8 @@
 static void
 extractLpLocalFields(NetPkt& netPacket, const lp::Packet& lpPacket)
 {
-  if (lpPacket.has<lp::IncomingFaceIdField>()) {
-    netPacket.setTag(make_shared<lp::IncomingFaceIdTag>(lpPacket.get<lp::IncomingFaceIdField>()));
-  }
-
-  if (lpPacket.has<lp::CongestionMarkField>()) {
-    netPacket.setTag(make_shared<lp::CongestionMarkTag>(lpPacket.get<lp::CongestionMarkField>()));
-  }
+  addTagFromField<lp::IncomingFaceIdTag, lp::IncomingFaceIdField>(netPacket, lpPacket);
+  addTagFromField<lp::CongestionMarkTag, lp::CongestionMarkField>(netPacket, lpPacket);
 }
 
 void