Skip to content

Use is_link_local for apipa range filter. #81

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

Merged
andreikop merged 1 commit into from
Jan 23, 2025
Merged

Use is_link_local for apipa range filter. #81

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
6 changes: 2 additions & 4 deletions wsdiscovery/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

logger = logging.getLogger("util")

_APIPA_RANGE = ipaddress.ip_network("169.254.0.0/16")


def createSkelSoapMessage(soapAction):
doc = minidom.Document()
Expand Down Expand Up @@ -261,14 +259,14 @@ def _getNetworkAddrs(protocol_version):
for ip in iface.ips:
if isinstance(ip.ip, str):
ip_address = ipaddress.ip_address(ip.ip)
if not ip_address.is_loopback and ip_address not in _APIPA_RANGE:
if not ip_address.is_loopback and not ip_address.is_link_local:
addrs.append(ip_address)
elif protocol_version == socket.AF_INET6:
for iface in ifaces:
for ip in iface.ips:
if isinstance(ip.ip, tuple):
ip_address = ipaddress.ip_address(f"{ip.ip[0]}%{ip.ip[2]}")
if not ip_address.is_loopback and ip_address not in _APIPA_RANGE:
if not ip_address.is_loopback and not ip_address.is_link_local:
addrs.append(ip_address)
else:
logger.warning(f"requested protocol version ({protocol_version}) is not"
Expand Down
Loading