arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Netifaces is not used on Windows. Fixes #257.

Browse Source
This commit is contained in:
Jeremy 2015-07-08 14:51:21 -06:00
parent 37f4ff2f63
commit 870029123c
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gns3server/utils/interfaces.py
View File

@ -20,7 +20,6 @@ import sys
import aiohttp import aiohttp
import socket import socket
import struct import struct
import netifaces
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -115,10 +114,12 @@ def is_interface_up(interface):
:returns: boolean :returns: boolean
""" """
if interface not in netifaces.interfaces():
return False
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
import netifaces
if interface not in netifaces.interfaces():
return False
import fcntl import fcntl
SIOCGIFFLAGS = 0x8913 SIOCGIFFLAGS = 0x8913
try: try:
@ -144,6 +145,7 @@ def interfaces():
results = [] results = []
if not sys.platform.startswith("win"): if not sys.platform.startswith("win"):
import netifaces
for interface in netifaces.interfaces(): for interface in netifaces.interfaces():
ip_address = "" ip_address = ""
ip_addresses = netifaces.ifaddresses(interface) ip_addresses = netifaces.ifaddresses(interface)

14
setup.py
View File

@ -45,12 +45,14 @@ dependencies = [
"raven>=5.2.0" "raven>=5.2.0"
] ]
try: if not sys.platform.startswith("win"):
import netifaces # netifaces if not used on Windows
except ImportError: try:
# add gns3-netifaces only if netifaces isn't already installed import netifaces
# for instance via a Debian package. except ImportError:
dependencies.append("gns3-netifaces>=0.10.4.1") # add gns3-netifaces only if netifaces isn't already installed
# for instance via a Debian package.
dependencies.append("gns3-netifaces>=0.10.4.1")
setup( setup(
name="gns3-server", name="gns3-server",