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

ifcfg-rh: support zero prefix length for IP addresses in reader

Browse source 
(cherry picked from commit a170320c35)
This commit is contained in:
Thomas Haller 2016-04-11 13:01:42 +02:00
parent 7b280fa162
commit b78e4de648
1 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/settings/plugins/ifcfg-rh/reader.c
View file

@ -358,7 +358,7 @@ read_full_ip4_address (shvarFile *ifcfg,
{
char *ip_tag, *prefix_tag, *netmask_tag, *gw_tag;
char *ip = NULL;
long prefix = 0;
int prefix = 0;
gboolean success = FALSE;
char *value;
guint32 tmp;
@ -395,47 +395,40 @@ read_full_ip4_address (shvarFile *ifcfg,
/* Prefix */
value = svGetValue (ifcfg, prefix_tag, FALSE);
if (value) {
errno = 0;
prefix = strtol (value, NULL, 10);
if (errno || prefix < 0) {
prefix = _nm_utils_ascii_str_to_int64 (value, 10, 0, 32, -1);
if (prefix < 0) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid IP4 prefix '%s'", value);
g_free (value);
goto done;
}
g_free (value);
}
/* Fall back to NETMASK if no PREFIX was specified */
if (prefix == 0) {
} else {
/* Fall back to NETMASK if no PREFIX was specified */
if (!read_ip4_address (ifcfg, netmask_tag, &value, error))
goto done;
if (value) {
inet_pton (AF_INET, value, &tmp);
prefix = nm_utils_ip4_netmask_to_prefix (tmp);
g_free (value);
} else {
if (base_addr)
prefix = nm_ip_address_get_prefix (base_addr);
else {
/* Try to autodetermine the prefix for the address' class */
if (inet_pton (AF_INET, ip, &tmp) == 1) {
prefix = nm_utils_ip4_get_default_prefix (tmp);
PARSE_WARNING ("missing %s, assuming %s/%d", prefix_tag, ip, prefix);
} else {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Missing IP4 prefix");
goto done;
}
}
}
}
if (prefix == 0 && base_addr)
prefix = nm_ip_address_get_prefix (base_addr);
/* Try to autodetermine the prefix for the address' class */
if (prefix == 0) {
if (inet_pton (AF_INET, ip, &tmp) == 1) {
prefix = nm_utils_ip4_get_default_prefix (tmp);
PARSE_WARNING ("missing %s, assuming %s/%ld", prefix_tag, ip, prefix);
}
}
/* Validate the prefix */
if (prefix == 0) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Missing IP4 prefix");
goto done;
}
*out_address = nm_ip_address_new (AF_INET, ip, prefix, error);
if (*out_address)
success = TRUE;
@ -717,7 +710,7 @@ parse_full_ip6_address (shvarFile *ifcfg,
{
char **list;
char *ip_val, *prefix_val;
long prefix;
int prefix;
gboolean success = FALSE;
g_return_val_if_fail (addr_str != NULL, FALSE);
@ -737,9 +730,8 @@ parse_full_ip6_address (shvarFile *ifcfg,
prefix_val = list[1];
if (prefix_val) {
errno = 0;
prefix = strtol (prefix_val, NULL, 10);
if (errno || prefix <= 0 || prefix > 128) {
prefix = _nm_utils_ascii_str_to_int64 (prefix_val, 10, 0, 128, -1);
if (prefix < 0) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"Invalid IP6 prefix '%s'", prefix_val);
goto error;