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

nmcli: team: do strict checking on runner-tx-hashes

Browse Source 
Substrings matching the heading of valid values were allowed if not
ambiguous (e.g.: "et" for "eth"). Moreover, upper case variants were
accepted too.
Do a plain string comparison check against the valid values.
Improve also the error message: give a list of valid tx-hashes.
This commit is contained in:
Francesco Giudici
2018-02-06 16:44:11 +01:00
parent 38844e6c5e
commit fd5b3f802e
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
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 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", nm_assert (!error || !*error);
"l3", "tcp", "udp", "sctp", "l4", NULL };
if (nmc_string_is_valid (tx_hash_element, valid_tx_hashes, NULL)) if (NM_IN_STRSET (tx_hash_element,
"eth", "vlan", "ipv4", "ipv6", "ip",
"l3", "tcp", "udp", "sctp", "l4")) {
return TRUE; 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; return FALSE;
} }
@@ -3953,24 +3960,22 @@ static gboolean
_set_fcn_team_runner_tx_hash (ARGS_SET_FCN) _set_fcn_team_runner_tx_hash (ARGS_SET_FCN)
{ {
gs_free const char **strv = NULL; gs_free const char **strv = NULL;
gsize i; const char *const*iter;
nm_assert (!error || !*error); nm_assert (!error || !*error);
strv = nm_utils_strsplit_set (value, " \t,"); strv = nm_utils_strsplit_set (value, " \t,");
if (!verify_string_list (strv, for (iter = strv; strv && *iter; iter++) {
property_info->property_name, if (!_is_valid_team_runner_tx_hash_element (*iter, error))
_is_valid_team_runner_tx_hash_element, return FALSE;
error)) }
return FALSE;
while (nm_setting_team_get_num_runner_tx_hash (NM_SETTING_TEAM (setting))) 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); nm_setting_team_remove_runner_tx_hash (NM_SETTING_TEAM (setting), 0);
if (strv) { for (iter = strv; strv && *iter; iter++)
for (i = 0; strv[i]; i++) nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), *iter);
nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), strv[i]);
}
return TRUE; return TRUE;
} }