Skip to content

Report the interface ID used to capture pcapng files #4729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Report the interface ID used to capture pcapng files #4729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions scapy/packet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class Packet(
"direction", "sniffed_on",
# handle snaplen Vs real length
"wirelen",
"intid",
"comment",
"process_information"
]
Expand Down Expand Up @@ -177,6 +178,7 @@ def __init__(self,
self.raw_packet_cache = None # type: Optional[bytes]
self.raw_packet_cache_fields = None # type: Optional[Dict[str, Any]] # noqa: E501
self.wirelen = None # type: Optional[int]
self.intid = None # type: Optional[int]
self.direction = None # type: Optional[int]
self.sniffed_on = None # type: Optional[_GlobInterfaceType]
self.comment = None # type: Optional[bytes]
Expand Down Expand Up @@ -232,6 +234,7 @@ def __reduce__(self):
self.direction,
self.sniffed_on,
self.wirelen,
self.intid,
self.comment
))

Expand Down Expand Up @@ -431,6 +434,7 @@ def copy(self) -> Self:
self.raw_packet_cache_fields
)
clone.wirelen = self.wirelen
clone.intid = self.intid
clone.post_transforms = self.post_transforms[:]
clone.payload = self.payload.copy()
clone.payload.add_underlayer(clone)
Expand Down Expand Up @@ -500,6 +504,7 @@ def setfieldval(self, attr, val):
self.raw_packet_cache = None
self.raw_packet_cache_fields = None
self.wirelen = None
self.intid = None
elif attr == "payload":
self.remove_payload()
self.add_payload(val)
Expand All @@ -524,6 +529,7 @@ def delfieldval(self, attr):
self.raw_packet_cache = None
self.raw_packet_cache_fields = None
self.wirelen = None
self.intid = None
elif attr in self.default_fields:
pass
elif attr == "payload":
Expand Down Expand Up @@ -703,6 +709,7 @@ def self_build(self):
self.raw_packet_cache = None
self.raw_packet_cache_fields = None
self.wirelen = None
self.intid = None
break
if self.raw_packet_cache is not None:
return self.raw_packet_cache
Expand Down Expand Up @@ -1145,6 +1152,7 @@ def clone_with(self, payload=None, **kargs):
self.raw_packet_cache_fields
)
pkt.wirelen = self.wirelen
pkt.intid = self.intid
pkt.comment = self.comment
pkt.sniffed_on = self.sniffed_on
pkt.direction = self.direction
Expand Down
11 changes: 8 additions & 3 deletions scapy/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@ class RawPcapNgReader(RawPcapReader):
PacketMetadata = collections.namedtuple("PacketMetadataNg", # type: ignore
["linktype", "tsresol",
"tshigh", "tslow", "wirelen",
"comment", "ifname", "direction",
"comment", "ifname", "intid", "direction",
"process_information"])

def __init__(self, filename, fdesc=None, magic=None): # type: ignore
Expand All @@ -1656,6 +1656,7 @@ def __init__(self, filename, fdesc=None, magic=None): # type: ignore
self.f = fdesc
# A list of (linktype, snaplen, tsresol); will be populated by IDBs.
self.interfaces = [] # type: List[Tuple[int, int, Dict[str, Any]]]
self.interface_names = []
self.default_options = {
"tsresol": 1000000
}
Expand Down Expand Up @@ -1781,7 +1782,7 @@ def _read_block_shb(self):
def _read_packet(self, size=MTU): # type: ignore
# type: (int) -> Tuple[bytes, RawPcapNgReader.PacketMetadata]
"""Read blocks until it reaches either EOF or a packet, and
returns None or (packet, (linktype, sec, usec, wirelen)),
returns None or (packet, (linktype, sec, usec, wirelen, intid)),
where packet is a string.

"""
Expand Down Expand Up @@ -1860,6 +1861,7 @@ def _read_block_epb(self, block, size):
self.endian + "5I",
block[:20],
)
ifname = self.interface_names[intid] if intid < len(self.interface_names) else None
except struct.error:
warning("PcapNg: EPB is too small %d/20 !" % len(block))
raise EOFError
Expand Down Expand Up @@ -1914,6 +1916,7 @@ def _read_block_epb(self, block, size):
wirelen=wirelen,
comment=comment,
ifname=ifname,
intid=intid,
direction=direction,
process_information=process_information))

Expand Down Expand Up @@ -1952,6 +1955,7 @@ def _read_block_pkt(self, block, size):
self.endian + "HH4I",
block[:20],
)
ifname = self.interface_names[intid] if intid < len(self.interface_names) else None
except struct.error:
warning("PcapNg: PKT is too small %d/20 !" % len(block))
raise EOFError
Expand Down Expand Up @@ -2067,7 +2071,7 @@ def read_packet(self, size=MTU, **kwargs):
rp = super(PcapNgReader, self)._read_packet(size=size)
if rp is None:
raise EOFError
s, (linktype, tsresol, tshigh, tslow, wirelen, comment, ifname, direction, process_information) = rp # noqa: E501
s, (linktype, tsresol, tshigh, tslow, wirelen, comment, ifname, intid, direction, process_information) = rp # noqa: E501
try:
cls = conf.l2types.num2layer[linktype] # type: Type[Packet]
p = cls(s, **kwargs) # type: Packet
Expand All @@ -2088,6 +2092,7 @@ def read_packet(self, size=MTU, **kwargs):
p.process_information = process_information.copy()
if ifname is not None:
p.sniffed_on = ifname.decode('utf-8', 'backslashreplace')
p.intid = intid
return p

def recv(self, size: int = MTU, **kwargs: Any) -> 'Packet': # type: ignore
Expand Down