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

networks: Fix issue with setting default netmask

Browse Source 
- Minor refactoring of DNS server setting code.
This commit is contained in:
Sunil Mohan Adapa 2015-12-09 12:30:32 +05:30
parent ba5c7a772d
commit 8438bd3f31
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plinth/network.py
View File

@ -312,21 +312,18 @@ def _update_ipv4_settings(connection, ipv4_method, ipv4_address, ipv4_netmask,
settings.set_property(nm.SETTING_IP_CONFIG_METHOD, ipv4_method) settings.set_property(nm.SETTING_IP_CONFIG_METHOD, ipv4_method)
if ipv4_method == nm.SETTING_IP4_CONFIG_METHOD_MANUAL and ipv4_address: if ipv4_method == nm.SETTING_IP4_CONFIG_METHOD_MANUAL and ipv4_address:
ipv4_address_int = ipv4_string_to_int(ipv4_address) ipv4_address_int = ipv4_string_to_int(ipv4_address)
if not ipv4_netmask: if not ipv4_netmask:
ipv4_netmask_int = nm.utils_ip4_get_default_prefix( ipv4_netmask_int = nm.utils_ip4_get_default_prefix(
ipv4_address_int) ipv4_address_int)
else:
ipv4_netmask_int = nm.utils_ip4_netmask_to_prefix(
ipv4_string_to_int(ipv4_netmask))
ipv4_netmask_int = nm.utils_ip4_netmask_to_prefix(
ipv4_string_to_int(ipv4_netmask))
address = nm.IPAddress.new(socket.AF_INET, ipv4_address, address = nm.IPAddress.new(socket.AF_INET, ipv4_address,
ipv4_netmask_int) ipv4_netmask_int)
settings.add_address(address) settings.add_address(address)
if ipv4_dns:
settings.add_dns(ipv4_dns)
if ipv4_second_dns:
settings.add_dns(ipv4_second_dns)
if not ipv4_gateway: if not ipv4_gateway:
settings.set_property(nm.SETTING_IP_CONFIG_GATEWAY, '0.0.0.0') settings.set_property(nm.SETTING_IP_CONFIG_GATEWAY, '0.0.0.0')
else: else:
@ -335,10 +332,11 @@ def _update_ipv4_settings(connection, ipv4_method, ipv4_address, ipv4_netmask,
if ipv4_dns or ipv4_second_dns: if ipv4_dns or ipv4_second_dns:
settings.set_property(nm.SETTING_IP_CONFIG_IGNORE_AUTO_DNS, True) settings.set_property(nm.SETTING_IP_CONFIG_IGNORE_AUTO_DNS, True)
if ipv4_dns: if ipv4_dns:
settings.add_dns(ipv4_dns) settings.add_dns(ipv4_dns)
if ipv4_second_dns:
settings.add_dns(ipv4_second_dns) if ipv4_second_dns:
settings.add_dns(ipv4_second_dns)
def _update_ethernet_settings(connection, connection_uuid, name, interface, def _update_ethernet_settings(connection, connection_uuid, name, interface,