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

team: merge 'fg/team-clean-tx-hash-on-set-rh1541922'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1541922
This commit is contained in:
Francesco Giudici 2018-02-12 11:21:32 +01:00
commit aae263fbf2
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clients/common/nm-client-utils.c
View file

@ -134,7 +134,7 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error)
{
const char **p;
size_t input_ln, p_len;
gboolean prev_match = FALSE;
gboolean prev_match = FALSE, ambiguous = FALSE;
const char *ret = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@ -148,19 +148,21 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error)
if (g_ascii_strncasecmp (input, *p, input_ln) == 0) {
if (input_ln == p_len) {
ret = *p;
ambiguous = FALSE;
break;
}
if (!prev_match)
if (!prev_match) {
ret = *p;
else {
g_set_error (error, 1, 1, _("'%s' is ambiguous (%s x %s)"),
input, ret, *p);
return NULL;
}
prev_match = TRUE;
prev_match = TRUE;
} else
ambiguous = TRUE;
}
}
if (ambiguous) {
g_set_error (error, 1, 1, _("'%s' is ambiguous (%s x %s)"),
input, ret, *p);
return NULL;
}
finish:
if (ret == NULL) {
char *valid_vals = g_strjoinv (", ", (char **) allowed);

36
clients/common/nm-meta-setting-desc.c
View file

@ -3940,12 +3940,19 @@ _validate_fcn_team_config (const char *value, char **out_to_free, GError **error
}
static gboolean
_is_valid_team_runner_tx_hash_element (const char *tx_hash_element)
_is_valid_team_runner_tx_hash_element (const char *tx_hash_element,
GError **error)
{
const char *valid_tx_hashes[] = { "eth", "vlan", "ipv4", "ipv6", "ip",
"l3", "tcp", "udp", "sctp", "l4", NULL };
if (nmc_string_is_valid (tx_hash_element, valid_tx_hashes, NULL))
nm_assert (!error || !*error);
if (NM_IN_STRSET (tx_hash_element,
"eth", "vlan", "ipv4", "ipv6", "ip",
"l3", "tcp", "udp", "sctp", "l4")) {
return TRUE;
}
g_set_error (error, 1, 0, "'%s' is not valid. %s", tx_hash_element,
"Valid tx-hashes: [eth, vlan, ipv4, ipv6, ip, l3, tcp, udp, sctp, l4]");
return FALSE;
}
@ -3953,21 +3960,22 @@ static gboolean
_set_fcn_team_runner_tx_hash (ARGS_SET_FCN)
{
gs_free const char **strv = NULL;
gsize i;
const char *const*iter;
nm_assert (!error || !*error);
strv = nm_utils_strsplit_set (value, " \t,");
if (!verify_string_list (strv,
property_info->property_name,
_is_valid_team_runner_tx_hash_element,
error))
return FALSE;
if (strv) {
for (i = 0; strv[i]; i++)
nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), strv[i]);
for (iter = strv; strv && *iter; iter++) {
if (!_is_valid_team_runner_tx_hash_element (*iter, error))
return FALSE;
}
while (nm_setting_team_get_num_runner_tx_hash (NM_SETTING_TEAM (setting)))
nm_setting_team_remove_runner_tx_hash (NM_SETTING_TEAM (setting), 0);
for (iter = strv; strv && *iter; iter++)
nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), *iter);
return TRUE;
}