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

cli: 'connection add': allow numeric bonding modes

Browse Source
This commit is contained in:
Jiří Klimeš
2013-05-14 16:42:03 +02:00
parent 68dd1cf880
commit d0b74b7d8d
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cli/src/common.c
View File

@@ -862,3 +862,24 @@ nmc_vlan_parse_priority_maps (const char *priority_map,
return mapping;
}
const char *
nmc_bond_validate_mode (const char *mode, GError **error)
{
unsigned long mode_int;
static const char *valid_modes[] = { "balance-rr",
"active-backup",
"balance-xor",
"broadcast",
"802.3ad",
"balance-tlb",
"balance-alb",
NULL };
if (nmc_string_to_uint (mode, TRUE, 0, 6, &mode_int)) {
/* Translate bonding mode numbers to mode names:
* https://www.kernel.org/doc/Documentation/networking/bonding.txt
*/
return valid_modes[mode_int];
} else
return nmc_string_is_valid (mode, valid_modes, error);
}

2
cli/src/common.h
View File

@@ -51,4 +51,6 @@ nmc_vlan_parse_priority_maps (const char *priority_map,
NMVlanPriorityMap map_type,
GError **error);
const char *nmc_bond_validate_mode (const char *mode, GError **error);
#endif /* NMC_COMMON_H */

14
cli/src/connections.c
View File

@@ -247,7 +247,8 @@ usage_connection_add (void)
" [ingress <ingress priority mapping>]\n"
" [egress <egress priority mapping>]\n"
" [mtu <MTU>]\n\n"
" bond: [mode balance-rr|active-backup|balance-xor|broadcast|802.3ad|balance-tlb|balance-alb]\n"
" bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
" 802.3ad (4) | balance-tlb (5) | balance-alb (6)]\n"
" [miimon <num>]\n"
" [downdelay <num>]\n"
" [updelay <num>]\n"
@@ -2435,8 +2436,17 @@ cleanup_vlan:
/* Set bond options */
g_object_set (s_bond, NM_SETTING_BOND_INTERFACE_NAME, bond_ifname, NULL);
if (bond_mode)
if (bond_mode) {
GError *err = NULL;
if (!(bond_mode = nmc_bond_validate_mode (bond_mode, &err))) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'mode': %s."), err->message);
g_clear_error (&err);
g_free (bond_ifname);
return FALSE;
}
nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MODE, bond_mode);
}
if (bond_miimon)
nm_setting_bond_add_option (s_bond, NM_SETTING_BOND_OPTION_MIIMON, bond_miimon);
if (bond_downdelay)