diff --git a/scapy/fields.py b/scapy/fields.py index 91df1adaa4d6927c1e14e8a2bc784fd33454c2b1..fa6cba4d7ad22a90bd80da8fb9bb0c177b7c8280 100644 --- a/scapy/fields.py +++ b/scapy/fields.py @@ -372,7 +372,6 @@ class PacketField(StrField): return remain,i class PacketLenField(PacketField): - holds_packets=1 def __init__(self, name, default, cls, length_from=None): PacketField.__init__(self, name, default, cls) self.length_from = length_from @@ -389,7 +388,6 @@ class PacketLenField(PacketField): class PacketListField(PacketField): islist = 1 - holds_packets=1 def __init__(self, name, default, cls, count_from=None, length_from=None): if default is None: default = [] # Create a new list for each instance diff --git a/scapy/layers/dhcp6.py b/scapy/layers/dhcp6.py index 2bd215d055d3877185c895f2ed83b238a41d3ac2..fba74898b7b61ea1926f6a9425c5620f51461e0d 100644 --- a/scapy/layers/dhcp6.py +++ b/scapy/layers/dhcp6.py @@ -256,7 +256,6 @@ class DHCP6OptUnknown(_DHCP6OptGuessPayload): # A generic DHCPv6 Option length_from = lambda pkt: pkt.optlen)] class _DUIDField(PacketField): - holds_packets=1 def __init__(self, name, default, length_from=None): StrField.__init__(self, name, default) self.length_from = length_from diff --git a/scapy/layers/dns.py b/scapy/layers/dns.py index 533db6c20c2bc4f1bae02e926abf785a9ba6ce1e..17123070818ebd51da0976c65dd0bf935de9039d 100644 --- a/scapy/layers/dns.py +++ b/scapy/layers/dns.py @@ -158,7 +158,6 @@ class DNSRRField(StrField): class DNSQRField(DNSRRField): - holds_packets=1 def decodeRR(self, name, s, p): ret = s[p:p+4] p += 4 diff --git a/scapy/layers/inet6.py b/scapy/layers/inet6.py index 5346a1f3235e2931d002d79fcb1640533184d7b7..28978fe49b3a1add3d290773f315be03d2a82586 100644 --- a/scapy/layers/inet6.py +++ b/scapy/layers/inet6.py @@ -741,8 +741,6 @@ _hbhoptcls = { 0x00: Pad1, ######################## Hop-by-Hop Extension Header ######################## class _HopByHopOptionsField(PacketListField): - islist = 1 - holds_packet = 1 def __init__(self, name, default, cls, curpos, count_from=None, length_from=None): self.curpos = curpos PacketListField.__init__(self, name, default, cls, count_from=count_from, length_from=length_from) @@ -2609,9 +2607,6 @@ class MIP6MH_Generic(_MobilityHeader): # Mainly for decoding of unknown msg # TODO: make a generic _OptionsField class _MobilityOptionsField(PacketListField): - islist = 1 - holds_packet = 1 - def __init__(self, name, default, cls, curpos, count_from=None, length_from=None): self.curpos = curpos PacketListField.__init__(self, name, default, cls, count_from=count_from, length_from=length_from) diff --git a/scapy/layers/sctp.py b/scapy/layers/sctp.py index 632becb1bdca08ab5d6ec08170e15db3c8e856c0..299e49c1d3d85926c94b0d7e411097094fb0ab5e 100644 --- a/scapy/layers/sctp.py +++ b/scapy/layers/sctp.py @@ -207,8 +207,6 @@ class SCTP(_SCTPChunkGuessPayload, Packet): ############## SCTP Chunk variable params class ChunkParamField(PacketListField): - islist = 1 - holds_packets=1 def __init__(self, name, default, count_from=None, length_from=None): PacketListField.__init__(self, name, default, conf.raw_layer, count_from=count_from, length_from=length_from) def m2i(self, p, m):