Skip to content

libpcap: get MAC addresses on Darwin, *BSD and illumos correctly #5224

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
evverx wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −13
Open

libpcap: get MAC addresses on Darwin, *BSD and illumos correctly #5224

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
13 changes: 10 additions & 3 deletions scapy/arch/libpcap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,15 @@ def load_winpcapy():
elif family == socket.AF_LINK:
# Special case: MAC
# (AF_LINK is mostly BSD specific)
val = ap.contents.sa_data
mac = str2mac(bytes(bytearray(val[:6])))
# https://github.com/apple-oss-distributions/xnu/blob/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea/bsd/net/if_dl.h#L93-L112
# https://github.com/freebsd/freebsd-src/blob/ab7249c288a4d7d09c88f4de705b58a2afbf35f9/sys/net/if_dl.h#L55-L68
# https://github.com/illumos/illumos-gate/blob/6a2df4aa5381599179ab6afb3165db81960dee35/usr/src/uts/common/net/if_dl.h#L65-L76
# https://github.com/NetBSD/src/blob/bc2d21a8880597d1affe4ec581e0b65637258dc4/sys/net/if_dl.h#L78-L91
# https://github.com/openbsd/src/blob/ce063bbc9d6190c8ba255f11feb6910dc3541f29/sys/net/if_dl.h#L56-L70
sockaddr_dl = ccast(ap, POINTER(c_ubyte))

@gpotter2 gpotter2 Oct 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for the PR. Wasn't it possible to keep the structure? This is a bit harder to read. I'm not sure I understand what happened wrong in the previous structure, since 1 and 2 bytes-long fields should be pretty much padded the same on all plateforms. Thanks !

nlen = sockaddr_dl[5]
alen = sockaddr_dl[6]
mac = str2mac(bytes(sockaddr_dl[8 + nlen:8 + nlen + alen]))
a = a.contents.next
continue
else:
Expand Down Expand Up @@ -491,7 +498,7 @@ def load(self):
for ifname, dat in conf.cache_pcapiflist.items():
description, ips, flags, mac, itype = dat
i += 1
if LINUX or BSD or SOLARIS and not mac:
if (LINUX or BSD or SOLARIS) and not mac:
from scapy.arch.unix import get_if_raw_hwaddr
try:
itype, _mac = get_if_raw_hwaddr(ifname)
Expand Down
10 changes: 0 additions & 10 deletions scapy/libs/winpcapy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,6 @@ class sockaddr_in6(Structure):
("sin6_addr", 16 * c_ubyte),
("sin6_scope", c_uint32)]

class sockaddr_dl(Structure):
_fields_ = [("sdl_len", c_ubyte),
("sdl_family", c_ubyte),
("sdl_index", c_ushort),
("sdl_type", c_ubyte),
("sdl_nlen", c_ubyte),
("sdl_alen", c_ubyte),
("sdl_slen", c_ubyte),
("sdl_data", 46 * c_ubyte)]

else:
# https://github.com/torvalds/linux/blob/master/include/linux/socket.h
# https://docs.microsoft.com/en-us/windows/win32/winsock/sockaddr-2
Expand Down
Loading