encoding: Rollback to original Nack encoding.

Fix: #9

Author: zjkmxy

src/ndn/encoding/ndnlp_v2.py

@@ -67,18 +67,6 @@ class LpPacket(TlvModel):
     lp_packet = ModelField(LpTypeNumber.LP_PACKET, LpPacketValue)
 
 
-class NackInterestValue(TlvModel):
-    name = NameField()
-    can_be_prefix = BoolField(TypeNumber.CAN_BE_PREFIX, default=False)
-    must_be_fresh = BoolField(TypeNumber.MUST_BE_FRESH, default=False)
-    forwarding_hint = ModelField(TypeNumber.FORWARDING_HINT, Links)
-    nonce = UintField(TypeNumber.NONCE, fixed_len=4)
-
-
-class NackInterestPacket(TlvModel):
-    nack_interest = ModelField(TypeNumber.INTEREST, NackInterestValue)
-
-
 def parse_network_nack(wire: BinaryStr, with_tl: bool = True) -> (Optional[int], Optional[BinaryStr]):
     if with_tl:
         wire = parse_and_check_tl(wire, LpTypeNumber.LP_PACKET)
@@ -91,24 +79,7 @@ def parse_network_nack(wire: BinaryStr, with_tl: bool = True) -> (Optional[int],
         return None, None
 
 
-def make_network_nack(name: NonStrictName, interest_param: InterestParam, nack_reason: int) -> VarBinaryStr:
-    nack_interest = NackInterestPacket()
-    nack_interest.nack_interest = NackInterestValue()
-    nack_interest.nack_interest.name = name
-    nack_interest.nack_interest.can_be_prefix = interest_param.can_be_prefix
-    nack_interest.nack_interest.must_be_fresh = interest_param.must_be_fresh
-    nack_interest.nack_interest.nonce = interest_param.nonce
-
-    if interest_param.forwarding_hint:
-        nack_interest.nack_interest.forwarding_hint = Links()
-        for preference, delegation in interest_param.forwarding_hint:
-            cur = Delegation()
-            cur.preference = preference
-            cur.delegation = delegation
-            nack_interest.nack_interest.forwarding_hint.delegations.append(cur)
-
-    encoded_interest = nack_interest.encode()
-
+def make_network_nack(encoded_interest: BinaryStr, nack_reason: int) -> VarBinaryStr:
     lp_packet = LpPacket()
     lp_packet.lp_packet = LpPacketValue()
     lp_packet.lp_packet.nack = NetworkNack()

tests/encoding/ndnlp_v2_test.py

@@ -15,7 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # -----------------------------------------------------------------------------
-from ndn.encoding import parse_network_nack, parse_interest, make_network_nack, NackReason, Name, InterestParam
+from ndn.encoding import parse_network_nack, parse_interest, make_network_nack, make_interest,\
+    NackReason, Name, InterestParam
 
 
 class TestNetworkNack:
@@ -33,9 +34,9 @@ def test1():
 
     @staticmethod
     def test2():
-        lp_packet = make_network_nack('/localhost/nfd/faces/events',
-                                      InterestParam(must_be_fresh=True, can_be_prefix=True),
-                                      NackReason.NO_ROUTE)
-        assert lp_packet == (b"\x64\x32\xfd\x03\x20\x05\xfd\x03\x21\x01\x96"
-                             b"\x50\x27\x05\x25\x07\x1f\x08\tlocalhost\x08\x03nfd\x08\x05faces\x08\x06events"
-                             b"\x21\x00\x12\x00")
+        interest = make_interest('/localhost/nfd/faces/events',
+                                 InterestParam(must_be_fresh=True, can_be_prefix=True))
+        lp_packet = make_network_nack(interest, NackReason.NO_ROUTE)
+        assert lp_packet == (b"\x64\x36\xfd\x03\x20\x05\xfd\x03\x21\x01\x96"
+                             b"\x50\x2b\x05\x29\x07\x1f\x08\tlocalhost\x08\x03nfd\x08\x05faces\x08\x06events"
+                             b"\x21\x00\x12\x00\x0c\x02\x0f\xa0")