Skip to content

Filter APIPA address range when finding IP addresses. #78

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 20, 2025
Merged

Filter APIPA address range when finding IP addresses. #78

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

logger = logging.getLogger("util")

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


def createSkelSoapMessage(soapAction):
doc = minidom.Document()
Expand Down Expand Up @@ -259,14 +261,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:
if not ip_address.is_loopback and ip_address not in _APIPA_RANGE:
Copy link
Contributor

@bdraco bdraco Jan 18, 2025

Choose a reason for hiding this comment

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

You could probably use is_link_local instead https://docs.python.org/3/library/ipaddress.html#ipaddress.IPv4Address.is_link_local

Copy link
Contributor Author

@jterrace jterrace Jan 21, 2025

Choose a reason for hiding this comment

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

Ah, yeah that would probably work. Looks like the PR was already merged, but I can test it out and send another PR to simplify if it works.

Copy link
Contributor Author

@jterrace jterrace Jan 22, 2025

Choose a reason for hiding this comment

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

yep, it works: sent #81

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:
if not ip_address.is_loopback and ip_address not in _APIPA_RANGE:
Copy link
Contributor

@bdraco bdraco Jan 18, 2025

Choose a reason for hiding this comment

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

Not sure this makes sense since this will always be an IPv6 address

addrs.append(ip_address)
else:
logger.warning(f"requested protocol version ({protocol_version}) is not"
Expand Down