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

libnm: change NMVariantAttributeSpec.str_type to work for attributes of any type

Browse Source 
First of all, all of NMVariantAttributeSpec is internal API. We only
expose the typedef itself as public API, but not its fields nor
their meaning. So we can change things.

Change "str_type" to "type_detail", so that it can work for any kind of
attribute, not only for strings. Usually, we want to avoid special
cases and treat all attributes the same, based on their GVariant type.
But sometimes, it is necessary to do something special with an
attribute. This is what the "type_detail" encodes, but it's not only
relevant for strings.
This commit is contained in:
Thomas Haller
2022-02-03 17:09:53 +01:00
parent 00e4f21629
commit 6f277d8fa6
3 changed files with 90 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
src/libnm-core-impl/nm-setting-ip-config.c
View File

@@ -1203,8 +1203,8 @@ static const NMVariantAttributeSpec *const ip_route_attribute_spec[] = {
.v6 = TRUE, ), .v6 = TRUE, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_FROM, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_FROM,
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
.v6 = TRUE, .v6 = TRUE,
.str_type = 'p', ), .type_detail = 'p', ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_INITCWND, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_INITCWND,
G_VARIANT_TYPE_UINT32, G_VARIANT_TYPE_UINT32,
.v4 = TRUE, .v4 = TRUE,
@@ -1246,9 +1246,9 @@ static const NMVariantAttributeSpec *const ip_route_attribute_spec[] = {
.v4 = TRUE, ), .v4 = TRUE, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_SRC, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_SRC,
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
.v4 = TRUE, .v4 = TRUE,
.v6 = TRUE, .v6 = TRUE,
.str_type = 'a', ), .type_detail = 'a', ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TABLE, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TABLE,
G_VARIANT_TYPE_UINT32, G_VARIANT_TYPE_UINT32,
.v4 = TRUE, .v4 = TRUE,
@@ -1256,9 +1256,9 @@ static const NMVariantAttributeSpec *const ip_route_attribute_spec[] = {
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, .v4 = TRUE, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, .v4 = TRUE, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TYPE, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_TYPE,
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
.v4 = TRUE, .v4 = TRUE,
.v6 = TRUE, .v6 = TRUE,
.str_type = 'T', ), .type_detail = 'T', ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_WINDOW, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_IP_ROUTE_ATTRIBUTE_WINDOW,
G_VARIANT_TYPE_UINT32, G_VARIANT_TYPE_UINT32,
.v4 = TRUE, .v4 = TRUE,
@@ -1302,6 +1302,7 @@ nm_ip_route_attribute_validate(const char *name,
GError **error) GError **error)
{ {
const NMVariantAttributeSpec *spec; const NMVariantAttributeSpec *spec;
const char *string;
g_return_val_if_fail(name, FALSE); g_return_val_if_fail(name, FALSE);
g_return_val_if_fail(value, FALSE); g_return_val_if_fail(value, FALSE);
@@ -1340,65 +1341,68 @@ nm_ip_route_attribute_validate(const char *name,
return FALSE; return FALSE;
} }
if (g_variant_type_equal(spec->type, G_VARIANT_TYPE_STRING)) { switch (spec->type_detail) {
const char *string = g_variant_get_string(value, NULL); case 'a': /* IP address */
string = g_variant_get_string(value, NULL);
if (!nm_utils_ipaddr_is_valid(family, string)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_FAILED,
family == AF_INET ? _("'%s' is not a valid IPv4 address")
: _("'%s' is not a valid IPv6 address"),
string);
return FALSE;
}
break;
case 'p': /* IP address + optional prefix */
{
gs_free char *addr_free = NULL;
const char *addr;
const char *str;
switch (spec->str_type) { string = g_variant_get_string(value, NULL);
case 'a': /* IP address */ addr = string;
if (!nm_utils_ipaddr_is_valid(family, string)) {
str = strchr(addr, '/');
if (str) {
addr = nm_strndup_a(200, addr, str - addr, &addr_free);
str++;
if (_nm_utils_ascii_str_to_int64(str, 10, 0, family == AF_INET ? 32 : 128, -1) < 0) {
g_set_error(error, g_set_error(error,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_FAILED, NM_CONNECTION_ERROR_FAILED,
family == AF_INET ? _("'%s' is not a valid IPv4 address") _("invalid prefix %s"),
: _("'%s' is not a valid IPv6 address"), str);
string);
return FALSE; return FALSE;
} }
break;
case 'p': /* IP address + optional prefix */
{
gs_free char *addr_free = NULL;
const char *addr = string;
const char *str;
str = strchr(addr, '/');
if (str) {
addr = nm_strndup_a(200, addr, str - addr, &addr_free);
str++;
if (_nm_utils_ascii_str_to_int64(str, 10, 0, family == AF_INET ? 32 : 128, -1)
< 0) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_FAILED,
_("invalid prefix %s"),
str);
return FALSE;
}
}
if (!nm_utils_ipaddr_is_valid(family, addr)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_FAILED,
family == AF_INET ? _("'%s' is not a valid IPv4 address")
: _("'%s' is not a valid IPv6 address"),
string);
return FALSE;
}
break;
} }
case 'T': /* route type. */ if (!nm_utils_ipaddr_is_valid(family, addr)) {
if (!NM_IN_SET(nm_net_aux_rtnl_rtntype_a2n(string), RTN_UNICAST, RTN_LOCAL)) { g_set_error(error,
g_set_error(error, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED,
NM_CONNECTION_ERROR_INVALID_PROPERTY, family == AF_INET ? _("'%s' is not a valid IPv4 address")
_("%s is not a valid route type"), : _("'%s' is not a valid IPv6 address"),
string); string);
return FALSE; return FALSE;
}
break;
default:
break;
} }
break;
}
case 'T': /* route type. */
string = g_variant_get_string(value, NULL);
if (!NM_IN_SET(nm_net_aux_rtnl_rtntype_a2n(string), RTN_UNICAST, RTN_LOCAL)) {
g_set_error(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("%s is not a valid route type"),
string);
return FALSE;
}
break;
case '\0':
break;
default:
nm_assert_not_reached();
break;
} }
return TRUE; return TRUE;

40
src/libnm-core-impl/nm-setting-sriov.c
View File

@@ -350,13 +350,13 @@ nm_sriov_vf_get_attribute(const NMSriovVF *vf, const char *name)
const NMVariantAttributeSpec *const _nm_sriov_vf_attribute_spec[] = { const NMVariantAttributeSpec *const _nm_sriov_vf_attribute_spec[] = {
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MAC, NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MAC,
G_VARIANT_TYPE_STRING, G_VARIANT_TYPE_STRING,
.str_type = 'm', ), .type_detail = 'm', ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_SPOOF_CHECK, G_VARIANT_TYPE_BOOLEAN, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_SPOOF_CHECK, G_VARIANT_TYPE_BOOLEAN, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_TRUST, G_VARIANT_TYPE_BOOLEAN, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_TRUST, G_VARIANT_TYPE_BOOLEAN, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MIN_TX_RATE, G_VARIANT_TYPE_UINT32, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MIN_TX_RATE, G_VARIANT_TYPE_UINT32, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MAX_TX_RATE, G_VARIANT_TYPE_UINT32, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE(NM_SRIOV_VF_ATTRIBUTE_MAX_TX_RATE, G_VARIANT_TYPE_UINT32, ),
/* D-Bus only, synthetic attributes */ /* D-Bus only, synthetic attributes */
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("vlans", G_VARIANT_TYPE_STRING, .str_type = 'd', ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("vlans", G_VARIANT_TYPE_STRING, .type_detail = 'd', ),
NULL, NULL,
}; };
@@ -379,6 +379,7 @@ nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *know
{ {
const NMVariantAttributeSpec *const *iter; const NMVariantAttributeSpec *const *iter;
const NMVariantAttributeSpec *spec = NULL; const NMVariantAttributeSpec *spec = NULL;
const char *string;
g_return_val_if_fail(name, FALSE); g_return_val_if_fail(name, FALSE);
g_return_val_if_fail(value, FALSE); g_return_val_if_fail(value, FALSE);
@@ -391,7 +392,7 @@ nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *know
} }
} }
if (!spec || spec->str_type == 'd') { if (!spec || spec->type_detail == 'd') {
NM_SET_OUT(known, FALSE); NM_SET_OUT(known, FALSE);
g_set_error_literal(error, g_set_error_literal(error,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR,
@@ -411,24 +412,23 @@ nm_sriov_vf_attribute_validate(const char *name, GVariant *value, gboolean *know
return FALSE; return FALSE;
} }
if (g_variant_type_equal(spec->type, G_VARIANT_TYPE_STRING)) { switch (spec->type_detail) {
const char *string; case 'm': /* MAC address */
string = g_variant_get_string(value, NULL);
switch (spec->str_type) { if (!nm_utils_hwaddr_valid(string, -1)) {
case 'm': /* MAC address */ g_set_error(error,
string = g_variant_get_string(value, NULL); NM_CONNECTION_ERROR,
if (!nm_utils_hwaddr_valid(string, -1)) { NM_CONNECTION_ERROR_FAILED,
g_set_error(error, _("'%s' is not a valid MAC address"),
NM_CONNECTION_ERROR, string);
NM_CONNECTION_ERROR_FAILED, return FALSE;
_("'%s' is not a valid MAC address"),
string);
return FALSE;
}
break;
default:
break;
} }
break;
case '\0':
break;
default:
nm_assert_not_reached();
break;
} }
return TRUE; return TRUE;

8
src/libnm-glib-aux/nm-shared-utils.h
View File

@@ -3148,7 +3148,13 @@ struct _NMVariantAttributeSpec {
bool v6 : 1; bool v6 : 1;
bool no_value : 1; bool no_value : 1;
bool consumes_rest : 1; bool consumes_rest : 1;
char str_type;
/* This indicates a non-standard parsing behavior. What this is,
* depends on the actual validation and how to handle it.
*
* Note that the entire NMVariantAttributeSpec is internal API,
* so we can change behavior and adjust it as it fits. */
char type_detail;
}; };
typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec; typedef struct _NMVariantAttributeSpec NMVariantAttributeSpec;