From 816bc31e00cccd60d4cb2fbe7ccd20271c4fb860 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Tue, 6 Jan 2015 09:40:46 +0100
Subject: [PATCH] Remove inherited values uselessly overwritten
--HG--
branch : issue-5105
---
scapy/fields.py | 2 --
scapy/layers/dhcp6.py | 1 -
scapy/layers/dns.py | 1 -
scapy/layers/inet6.py | 5 -----
scapy/layers/sctp.py | 2 --
5 files changed, 11 deletions(-)
diff --git a/scapy/fields.py b/scapy/fields.py
index 91df1ada..fa6cba4d 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 2bd215d0..fba74898 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 533db6c2..17123070 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 5346a1f3..28978fe4 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 632becb1..299e49c1 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):
--
GitLab