[MS-NRTP] do not use 'type' attribute (#4909)

Author: gpotter2

scapy/layers/ms_nrtp.py

@@ -602,7 +602,7 @@ def _members_cb(pkt, lst, cur, remain):
                 ].Value
                 return functools.partial(
                     NRBFMemberPrimitiveUnTyped,
-                    type=PrimitiveTypeEnum(primitiveType),
+                    primtype=PrimitiveTypeEnum(primitiveType),
                 )
     return NRBFRecord
 
@@ -639,14 +639,14 @@ class NRBFClassInfo(Packet):
 
 
 class NRBFAdditionalInfo(Packet):
-    __slots__ = ["type"]
+    __slots__ = ["bintype"]
 
     fields_desc = [
         MultipleTypeField(
             [
                 (
                     ByteEnumField("Value", 0, PrimitiveTypeEnum),
-                    lambda pkt: pkt.type
+                    lambda pkt: pkt.bintype
                     in [
                         BinaryTypeEnum.Primitive,
                         BinaryTypeEnum.PrimitiveArray,
@@ -656,30 +656,30 @@ class NRBFAdditionalInfo(Packet):
                     PacketField(
                         "Value", NRBFLengthPrefixedString(), NRBFLengthPrefixedString
                     ),
-                    lambda pkt: pkt.type == BinaryTypeEnum.SystemClass,
+                    lambda pkt: pkt.bintype == BinaryTypeEnum.SystemClass,
                 ),
                 (
                     PacketField("Value", NRBFClassTypeInfo(), NRBFClassTypeInfo),
-                    lambda pkt: pkt.type == BinaryTypeEnum.Class,
+                    lambda pkt: pkt.bintype == BinaryTypeEnum.Class,
                 ),
             ],
             StrFixedLenField("Value", b"", length=0),
         ),
     ]
 
     def __init__(self, _pkt=None, **kwargs):
-        self.type = kwargs.pop("type", BinaryTypeEnum.Primitive)
-        assert isinstance(self.type, BinaryTypeEnum)
+        self.bintype = kwargs.pop("bintype", BinaryTypeEnum.Primitive)
+        assert isinstance(self.bintype, BinaryTypeEnum)
         super(NRBFAdditionalInfo, self).__init__(_pkt, **kwargs)
 
     def clone_with(self, *args, **kwargs):
         pkt = super(NRBFAdditionalInfo, self).clone_with(*args, **kwargs)
-        pkt.type = self.type
+        pkt.bintype = self.bintype
         return pkt
 
     def copy(self):
         pkt = super(NRBFAdditionalInfo, self).copy()
-        pkt.type = self.type
+        pkt.bintype = self.bintype
         return pkt
 
     def default_payload_class(self, payload):
@@ -715,7 +715,7 @@ def _member_type_infos_cb(pkt, lst, cur, remain):
     # Return BinaryTypeEnum tainted with a pre-selected type.
     return functools.partial(
         NRBFAdditionalInfo,
-        type=typeEnum,
+        bintype=typeEnum,
     )
 
 
@@ -752,30 +752,30 @@ class NRBFClassWithId(NRBFRecord):
 
 
 class NRBFMemberPrimitiveUnTyped(Packet):
-    __slots__ = ["type"]
+    __slots__ = ["primtype"]
 
     fields_desc = [
         NRBFValueWithCode.fields_desc[1],
     ]
 
     def __init__(self, _pkt=None, **kwargs):
-        self.type = kwargs.pop("type", PrimitiveTypeEnum.Byte)
-        assert isinstance(self.type, PrimitiveTypeEnum)
+        self.primtype = kwargs.pop("primtype", PrimitiveTypeEnum.Byte)
+        assert isinstance(self.primtype, PrimitiveTypeEnum)
         super(NRBFMemberPrimitiveUnTyped, self).__init__(_pkt, **kwargs)
 
     def clone_with(self, *args, **kwargs):
         pkt = super(NRBFMemberPrimitiveUnTyped, self).clone_with(*args, **kwargs)
-        pkt.type = self.type
+        pkt.primtype = self.primtype
         return pkt
 
     def copy(self):
         pkt = super(NRBFMemberPrimitiveUnTyped, self).copy()
-        pkt.type = self.type
+        pkt.primtype = self.primtype
         return pkt
 
     @property
     def PrimitiveType(self):
-        return self.type
+        return self.primtype
 
     def default_payload_class(self, payload):
         return conf.padding_layer
@@ -848,7 +848,7 @@ def _values_singleprim_cb(pkt, lst, cur, remain):
         return None
     return functools.partial(
         NRBFMemberPrimitiveUnTyped,
-        type=PrimitiveTypeEnum(pkt.PrimitiveTypeEnum),
+        primtype=PrimitiveTypeEnum(pkt.PrimitiveTypeEnum),
     )
 
 

test/scapy/layers/msnrtp.uts

@@ -80,7 +80,7 @@ pkt = NRBF(
             ],
             AdditionalInfos=[
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.SystemClass,
+                    bintype=BinaryTypeEnum.SystemClass,
                     Value=NRBFClassTypeInfo(
                         TypeName=NRBFLengthPrefixedString(
                             String=b"System.Data.SerializationFormat"
@@ -89,23 +89,23 @@ pkt = NRBF(
                     )
                 ),
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.Primitive,
+                    bintype=BinaryTypeEnum.Primitive,
                     Value=PrimitiveTypeEnum.Boolean,
                 ),
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.Primitive,
+                    bintype=BinaryTypeEnum.Primitive,
                     Value=PrimitiveTypeEnum.Int32,
                 ),
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.Primitive,
+                    bintype=BinaryTypeEnum.Primitive,
                     Value=PrimitiveTypeEnum.Boolean,
                 ),
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.Primitive,
+                    bintype=BinaryTypeEnum.Primitive,
                     Value=PrimitiveTypeEnum.Int32,
                 ),
                 NRBFAdditionalInfo(
-                    type=BinaryTypeEnum.PrimitiveArray,
+                    bintype=BinaryTypeEnum.PrimitiveArray,
                     Value=PrimitiveTypeEnum.Byte,
                 ),
             ],
@@ -121,12 +121,12 @@ pkt = NRBF(
                     ],
                     BinaryTypeEnums=[BinaryTypeEnum.Primitive],
                     AdditionalInfos=[
-                        NRBFAdditionalInfo(type=BinaryTypeEnum.Primitive,
+                        NRBFAdditionalInfo(bintype=BinaryTypeEnum.Primitive,
                                            Value=PrimitiveTypeEnum.Int32),
                     ],
                     LibraryId=2,
                     Members=[
-                        NRBFMemberPrimitiveUnTyped(type=PrimitiveTypeEnum.Int32, Value=1)
+                        NRBFMemberPrimitiveUnTyped(primtype=PrimitiveTypeEnum.Int32, Value=1)
                     ],
                 ),
                 NRBFBinaryObjectString(
@@ -135,11 +135,11 @@ pkt = NRBF(
                 ),
                 NRBFMemberReference(IdRef=4),
                 NRBFMemberReference(IdRef=4),
-                NRBFMemberPrimitiveUnTyped(type=PrimitiveTypeEnum.Boolean, Value=0),
-                NRBFMemberPrimitiveUnTyped(type=PrimitiveTypeEnum.Int32, Value=1033),
-                NRBFMemberPrimitiveUnTyped(type=PrimitiveTypeEnum.Boolean, Value=0),
+                NRBFMemberPrimitiveUnTyped(primtype=PrimitiveTypeEnum.Boolean, Value=0),
+                NRBFMemberPrimitiveUnTyped(primtype=PrimitiveTypeEnum.Int32, Value=1033),
+                NRBFMemberPrimitiveUnTyped(primtype=PrimitiveTypeEnum.Boolean, Value=0),
                 NRBFObjectNull(),
-                NRBFMemberPrimitiveUnTyped(type=PrimitiveTypeEnum.Int32, Value=1),
+                NRBFMemberPrimitiveUnTyped(primtype=PrimitiveTypeEnum.Int32, Value=1),
                 NRBFMemberReference(IdRef=5),
             ],
         ),