fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

(cherry picked from commit fd5b3f802e)
This commit is contained in:
Francesco Giudici 2018-02-06 16:44:11 +01:00
parent 01d1f64ad4
commit 11f0ca1f23
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3950,12 +3950,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;
} }
@ -3963,24 +3970,24 @@ static gboolean
_set_fcn_team_runner_tx_hash (ARGS_SET_FCN) _set_fcn_team_runner_tx_hash (ARGS_SET_FCN)
{ {
char **strv = NULL; char **strv = NULL;
guint i = 0; char *const*iter;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
strv = _nm_utils_strv_cleanup (g_strsplit_set (value, " \t,", 0), strv = _nm_utils_strv_cleanup (g_strsplit_set (value, " \t,", 0),
TRUE, TRUE, TRUE); TRUE, TRUE, TRUE);
if (!verify_string_list (strv, property_info->property_name, for (iter = strv; strv && *iter; iter++) {
_is_valid_team_runner_tx_hash_element, if (!_is_valid_team_runner_tx_hash_element (*iter, error)) {
error)) { g_strfreev (strv);
g_strfreev (strv); return FALSE;
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);
while (strv && strv[i]) for (iter = strv; strv && *iter; iter++)
nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), strv[i++]); nm_setting_team_add_runner_tx_hash (NM_SETTING_TEAM (setting), *iter);
g_strfreev (strv); g_strfreev (strv);
return TRUE; return TRUE;