Use netifaces to portably look up interface address

.gitignore

@@ -0,0 +1,124 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+

bsdpserver.py

@@ -66,6 +66,7 @@
 import signal
 import errno
 import json
+import netifaces
 from distutils.dir_util import mkpath
 from random import randint
 
@@ -145,17 +146,11 @@ def get_ip(iface=''):
         The get_ip function retrieves the IP for the network interface BSDPY
         is running on.
     """
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sockfd = sock.fileno()
-    SIOCGIFADDR = 0x8915
-
-    ifreq = struct.pack('16sH14s', iface, socket.AF_INET, '\x00' * 14)
     try:
-        res = fcntl.ioctl(sockfd, SIOCGIFADDR, ifreq)
+        return str(netifaces.ifaddresses(iface)[netifaces.AF_INET][0]['addr'])
     except:
-        return None
-    ip = struct.unpack('16sH2x4s8x', res)[2]
-    return socket.inet_ntoa(ip)
+        print("Failed to get ip address of {}".format(iface))
+        raise
 
 dockervars = {}
 redisvars = {}
@@ -434,8 +429,10 @@ def getNbiOptions(incoming):
                 else:
                     thisnbi['id'] = nbimageinfo['Index']
 
-                thisnbi['booter'] = \
-                    find(nbimageinfo['BootFile'], path)[0]
+                abs_booter_path = find(nbimageinfo['BootFile'], path)[0]
+                tftp_path = os.path.relpath(abs_booter_path, tftprootpath)
+                thisnbi['booter'] = '/' + tftp_path
+
                 thisnbi['description'] = \
                     nbimageinfo['Description']
                 thisnbi['disabledsysids'] = \

requirements.txt

@@ -1,3 +1,4 @@
 docopt
+netifaces
 requests
 redis