Skip to content
This repository was archived by the owner on Oct 1, 2021. It is now read-only.
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ build
pyvenv.cfg
bin
lib
lib64
pip-selfcheck.json
.tox
.pytest_cache/
5 changes: 3 additions & 2 deletions netdisco/ssdp.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
from xml.etree import ElementTree

import requests
import zeroconf

from netdisco.util import etree_to_dict, interface_addresses
from netdisco.util import etree_to_dict

DISCOVER_TIMEOUT = 2
# MX is a suggested random wait time for a device to reply, so should be
Expand Down Expand Up @@ -221,7 +222,7 @@ def scan(timeout=DISCOVER_TIMEOUT):
stop_wait = datetime.now() + timedelta(seconds=timeout)

sockets = []
for addr in interface_addresses():
for addr in zeroconf.get_all_addresses():
try:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)

Expand Down
14 changes: 0 additions & 14 deletions netdisco/util.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""Util functions used by Netdisco."""
from collections import defaultdict

import netifaces


# Taken from http://stackoverflow.com/a/10077069
# pylint: disable=invalid-name
Expand All @@ -29,15 +27,3 @@ def etree_to_dict(t):
else:
d[tag_name] = text
return d


def interface_addresses(family=netifaces.AF_INET):
"""Return local addresses of any associated network.

Gathering of addresses which are bound to a local interface that has
broadcast (and probably multicast) capability.
"""
return [addr['addr']
for i in netifaces.interfaces()
for addr in netifaces.ifaddresses(i).get(family) or []
if 'broadcast' in addr]
4 changes: 1 addition & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
zeroconf>=0.19.1
zeroconf>=0.21.0
requests>=2.0
# For now we depend on netifaces via zeroconf
# netifaces
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
author='Paulus Schoutsen',
author_email='Paulus@PaulusSchoutsen.nl',
license='Apache License 2.0',
install_requires=['requests>=2.0', 'zeroconf>=0.19.1'],
install_requires=['requests>=2.0', 'zeroconf>=0.21.0'],
python_requires='>=3',
packages=find_packages(exclude=['tests', 'tests.*']),
zip_safe=False)