nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-04-22 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

networks: Remove hack for fetching IP address

Browse Source
This commit is contained in:
nikhil rayaprolu 2016-07-23 10:37:36 +05:30 committed by James Valleroy
parent 5d926915a6
commit 43e070972a
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plinth/network.py
View File

@ -204,19 +204,16 @@ def get_first_ip_address_from_connection(connection):
the bug if fixed.
https://bugzilla.gnome.org/show_bug.cgi?id=756380.
"""
command = ['nmcli', '--terse', '--mode', 'tabular', '--fields',
'ipv4.addresses', 'connection', 'show', connection.get_uuid()]
output = subprocess.check_output(command).decode()
first = output.strip().split(', ')[0]
if not first:
return None, None
ip_address, prefix = first.split('/')
netmask = nm.utils_ip4_prefix_to_netmask(int(prefix))
return ip_address, ipv4_int_to_string(netmask)
devicename=connection.get_interface_name()
ip="0.0.0.0"
device=nm.Client.new(None).get_device_by_iface(devicename)
ip4_config=device.get_ip4_config()
if ip4_config:
addresses=ip4_config.get_addresses()
if addresses:
ip_address=addresses.__getitem__(0).get_address()
netmask=addresses.__getitem__(0).get_prefix()
return ip_address,ipv4_int_to_string(netmask)
def get_connection_list():
"""Get a list of active and available connections."""