Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions scapy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,12 @@ def __repr__(self):
def register(self, layer):
# type: (Type[Packet]) -> None
self.append(layer)

# Skip arch* modules
if layer.__module__.startswith("scapy.arch."):
return

# Register in module
if layer.__module__ not in self.ldict:
self.ldict[layer.__module__] = []
self.ldict[layer.__module__].append(layer)
Expand Down
3 changes: 3 additions & 0 deletions test/regression.uts
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ pkt = NetflowHeader()/NetflowHeaderV5()/NetflowRecordV5()
conf.layers.filter([NetflowHeader, NetflowHeaderV5])
assert NetflowRecordV5 not in NetflowHeader(bytes(pkt))

# Conf.ifaces.reload() should still work (arch/* is exempt)
conf.ifaces.reload()

conf.layers.unfilter()
assert NetflowRecordV5 in NetflowHeader(bytes(pkt))

Expand Down