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

networks: Refactor & fix extracting netmask

Browse Source 
- Use host byte ordering instead of big-endian.
This commit is contained in:
Sunil Mohan Adapa 2015-12-09 12:29:35 +05:30
parent da99a7cb9d
commit ba5c7a772d
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plinth/modules/networks/networks.py
View File

@ -181,8 +181,8 @@ def edit(request, uuid):
if settings_connection.get_connection_type() != 'pppoe': if settings_connection.get_connection_type() != 'pppoe':
settings_ipv4 = connection.get_setting_ip4_config() settings_ipv4 = connection.get_setting_ip4_config()
form_data['ipv4_method'] = settings_ipv4.get_method() form_data['ipv4_method'] = settings_ipv4.get_method()
address = network.get_first_ip_address_from_connection(connection) address, netmask = network.get_first_ip_address_from_connection(
netmask = network.get_first_netmask_from_connection(connection) connection)
gateway = settings_ipv4.get_gateway() gateway = settings_ipv4.get_gateway()
dns = settings_ipv4.get_dns(0) dns = settings_ipv4.get_dns(0)
second_dns = settings_ipv4.get_dns(1) second_dns = settings_ipv4.get_dns(1)

33
plinth/network.py
View File

@ -52,7 +52,12 @@ class DeviceNotFound(Exception):
def ipv4_string_to_int(address): def ipv4_string_to_int(address):
"""Return an integer equivalent of a string contain IPv4 address.""" """Return an integer equivalent of a string contain IPv4 address."""
return struct.unpack("=I", socket.inet_aton(address))[0] return struct.unpack('=I', socket.inet_aton(address))[0]
def ipv4_int_to_string(address_int):
"""Return an string equivalent of a integer IPv4 address."""
return socket.inet_ntoa(struct.pack('=I', address_int))
def _callback(source_object, result, user_data): def _callback(source_object, result, user_data):
@ -198,28 +203,14 @@ def get_first_ip_address_from_connection(connection):
'ipv4.addresses', 'connection', 'show', connection.get_uuid()] 'ipv4.addresses', 'connection', 'show', connection.get_uuid()]
output = subprocess.check_output(command).decode() output = subprocess.check_output(command).decode()
return output.strip().split(', ')[0].split('/')[0] first = output.strip().split(', ')[0]
if not first:
return None, None
ip_address, prefix = first.split('/')
def get_first_netmask_from_connection(connection): netmask = nm.utils_ip4_prefix_to_netmask(int(prefix))
"""Return the first IP address of a connection setting. return ip_address, ipv4_int_to_string(netmask)
XXX: Work around a bug in NetworkManager/Python GI. Remove after
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()
if '/' not in output:
return None
CIDR = output.strip().split(', ')[0].split('/')[1]
netmask = socket.inet_ntoa(struct.pack(">I", (0xffffffff <<
(32 - int(CIDR))) &
0xffffffff))
return netmask
def get_connection_list(): def get_connection_list():