colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-core: drup unused @allow_zero_prefix argument from valid_prefix()

Browse Source
This commit is contained in:
Thomas Haller
2016-04-11 12:40:34 +02:00
parent 57860c329e
commit 6b8729a599
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libnm-core/nm-setting-ip-config.c
View File

@@ -143,20 +143,18 @@ valid_ip (int family, const char *ip, GError **error)
} }
static gboolean static gboolean
valid_prefix (int family, guint prefix, GError **error, gboolean allow_zero_prefix) valid_prefix (int family, guint prefix, GError **error)
{ {
if ( (family == AF_INET && prefix > 32) if ( (family == AF_INET && prefix <= 32)
|| (family == AF_INET6 && prefix > 128) || (family == AF_INET6 && prefix <= 128))
|| (!allow_zero_prefix && prefix == 0)) { return TRUE;
g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
family == AF_INET ? _("Invalid IPv4 address prefix '%u'") : _("Invalid IPv6 address prefix '%u'"), family == AF_INET ? _("Invalid IPv4 address prefix '%u'") : _("Invalid IPv6 address prefix '%u'"),
prefix); prefix);
return FALSE; return FALSE;
} }
return TRUE;
}
static gboolean static gboolean
valid_metric (gint64 metric, GError **error) valid_metric (gint64 metric, GError **error)
{ {
@@ -214,7 +212,7 @@ nm_ip_address_new (int family,
if (!valid_ip (family, addr, error)) if (!valid_ip (family, addr, error))
return NULL; return NULL;
if (!valid_prefix (family, prefix, error, TRUE)) if (!valid_prefix (family, prefix, error))
return NULL; return NULL;
address = g_slice_new0 (NMIPAddress); address = g_slice_new0 (NMIPAddress);
@@ -251,7 +249,7 @@ nm_ip_address_new_binary (int family,
g_return_val_if_fail (family == AF_INET || family == AF_INET6, NULL); g_return_val_if_fail (family == AF_INET || family == AF_INET6, NULL);
g_return_val_if_fail (addr != NULL, NULL); g_return_val_if_fail (addr != NULL, NULL);
if (!valid_prefix (family, prefix, error, TRUE)) if (!valid_prefix (family, prefix, error))
return NULL; return NULL;
address = g_slice_new0 (NMIPAddress); address = g_slice_new0 (NMIPAddress);
@@ -487,7 +485,7 @@ nm_ip_address_set_prefix (NMIPAddress *address,
guint prefix) guint prefix)
{ {
g_return_if_fail (address != NULL); g_return_if_fail (address != NULL);
g_return_if_fail (valid_prefix (address->family, prefix, NULL, TRUE)); g_return_if_fail (valid_prefix (address->family, prefix, NULL));
address->prefix = prefix; address->prefix = prefix;
} }
@@ -616,7 +614,7 @@ nm_ip_route_new (int family,
if (!valid_ip (family, dest, error)) if (!valid_ip (family, dest, error))
return NULL; return NULL;
if (!valid_prefix (family, prefix, error, TRUE)) if (!valid_prefix (family, prefix, error))
return NULL; return NULL;
if (next_hop && !valid_ip (family, next_hop, error)) if (next_hop && !valid_ip (family, next_hop, error))
return NULL; return NULL;
@@ -663,7 +661,7 @@ nm_ip_route_new_binary (int family,
g_return_val_if_fail (family == AF_INET || family == AF_INET6, NULL); g_return_val_if_fail (family == AF_INET || family == AF_INET6, NULL);
g_return_val_if_fail (dest, NULL); g_return_val_if_fail (dest, NULL);
if (!valid_prefix (family, prefix, error, TRUE)) if (!valid_prefix (family, prefix, error))
return NULL; return NULL;
if (!valid_metric (metric, error)) if (!valid_metric (metric, error))
return NULL; return NULL;
@@ -904,7 +902,7 @@ nm_ip_route_set_prefix (NMIPRoute *route,
guint prefix) guint prefix)
{ {
g_return_if_fail (route != NULL); g_return_if_fail (route != NULL);
g_return_if_fail (valid_prefix (route->family, prefix, NULL, TRUE)); g_return_if_fail (valid_prefix (route->family, prefix, NULL));
route->prefix = prefix; route->prefix = prefix;
} }