eblot/pybootd
1
1
Fork 0
mirror of https://github.com/eblot/pybootd.git synced 2024-08-17 18:00:33 +03:00
Code Issues Projects Releases Wiki Activity

Do not use uname()

Browse Source
This commit is contained in:
Emmanuel Blot 2019-09-05 11:06:38 +02:00
parent 23b8327ff1
commit 841274ca52
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pybootd/util.py
View File

@ -26,15 +26,14 @@ from re import match
from socket import inet_aton, inet_ntoa
from subprocess import run
from struct import pack as spack, unpack as sunpack
from sys import stderr
from sys import platform, stderr
try:
import netifaces
import netifaces as nif
except ImportError:
import os
if os.uname()[0].lower() == 'darwin':
if platform == 'darwin':
raise ImportError('netifaces package is not installed')
netifaces = None
nif = None
# String values evaluated as true boolean values
@ -188,11 +187,11 @@ def inttoip(ipval):
def _netifaces_get_iface_config(address):
pool = iptoint(address)
for iface in netifaces.interfaces():
ifinfo = netifaces.ifaddresses(iface)
if netifaces.AF_INET not in ifinfo:
for iface in nif.interfaces():
ifinfo = nif.ifaddresses(iface)
if nif.AF_INET not in ifinfo:
continue
for inetinfo in netifaces.ifaddresses(iface)[netifaces.AF_INET]:
for inetinfo in nif.ifaddresses(iface)[nif.AF_INET]:
addr_s = inetinfo.get('addr')
netmask_s = inetinfo.get('netmask')
if addr_s is None or netmask_s is None:
@ -242,9 +241,8 @@ def _iproute_get_iface_config(address):
def get_iface_config(address):
if not address:
return None
if not netifaces:
return _iproute_get_iface_config(address)
return _netifaces_get_iface_config(address)
nifcfg = _netifaces_get_iface_config if nif else _iproute_get_iface_config
return nifcfg(address)
class EasyConfigParser(SafeConfigParser):