fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-06 07:00:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifupdown: use _nm_utils_ascii_str_to_int64() for converting netmask to string

Browse source 
(cherry picked from commit 3930ef194e)
(cherry picked from commit 1a80179c60)
(cherry picked from commit 1a54909bb4)
This commit is contained in:
Thomas Haller 2020-04-01 12:30:12 +02:00
parent d446c90985
commit 5b552d2946
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/settings/plugins/ifupdown/nms-ifupdown-parser.c
View file

@ -582,9 +582,8 @@ update_ip6_setting_from_if_block (NMConnection *connection,
const char *nameserver_v;
const char *nameservers_v;
const char *search_v;
int prefix_int = 128;
guint prefix_int;
/* Address */
address_v = ifparser_getkey (block, "address");
if (!address_v) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
@ -592,12 +591,12 @@ update_ip6_setting_from_if_block (NMConnection *connection,
return FALSE;
}
/* Prefix */
prefix_v = ifparser_getkey (block, "netmask");
if (prefix_v)
prefix_int = g_ascii_strtoll (prefix_v, NULL, 10);
prefix_int = _nm_utils_ascii_str_to_int64 (prefix_v, 10, 0, 128, G_MAXINT);
else
prefix_int = 128;
/* Add the new address to the setting */
addr = nm_ip_address_new (AF_INET6, address_v, prefix_int, error);
if (!addr)
return FALSE;
@ -610,7 +609,6 @@ update_ip6_setting_from_if_block (NMConnection *connection,
}
nm_ip_address_unref (addr);
/* gateway */
gateway_v = ifparser_getkey (block, "gateway");
if (gateway_v) {
if (!nm_utils_ipaddr_valid (AF_INET6, gateway_v)) {
@ -631,7 +629,6 @@ update_ip6_setting_from_if_block (NMConnection *connection,
if (!nm_setting_ip_config_get_num_dns (s_ip6))
_LOGI ("No dns-nameserver configured in /etc/network/interfaces");
/* DNS searches */
search_v = ifparser_getkey (block, "dns-search");
if (search_v) {
gs_free const char **list = NULL;