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

Fix racecondition when listing interface

Browse Source 
Fix #1060
This commit is contained in:
Julien Duponchelle 2017-06-07 15:55:50 +02:00
parent eb6068c3d3
commit 40cc5d76b3
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/utils/interfaces.py
View File

@ -198,12 +198,13 @@ def interfaces():
results = [] results = []
if not sys.platform.startswith("win"): if not sys.platform.startswith("win"):
for interface in sorted(psutil.net_if_addrs().keys()): net_if_addrs = psutil.net_if_addrs()
for interface in sorted(net_if_addrs.keys()):
ip_address = "" ip_address = ""
mac_address = "" mac_address = ""
netmask = "" netmask = ""
interface_type = "ethernet" interface_type = "ethernet"
for addr in psutil.net_if_addrs()[interface]: for addr in net_if_addrs[interface]:
# get the first available IPv4 address only # get the first available IPv4 address only
if addr.family == socket.AF_INET: if addr.family == socket.AF_INET:
ip_address = addr.address ip_address = addr.address