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

clients: print expected route syntax on parsing failure

Browse Source 
Now that routes can include optional attributes, print the expected
syntax in case of parsing failure.

 $ nmcli connection modify dummy ipv4.routes a
 Error: failed to modify ipv4.routes: invalid route: Invalid IPv4
 address 'a'. The valid syntax is: 'ip[/prefix] [next-hop] [metric]
 [attribute=val]... [,ip[/prefix] ...]'.
This commit is contained in:
Beniamino Galvani
2017-05-08 10:04:04 +02:00
parent 0461da2690
commit 00df57a066
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
clients/common/nm-meta-setting-desc.c
View File

@@ -155,6 +155,7 @@ nmc_parse_and_build_route (int family,
gs_free char *dest = NULL; gs_free char *dest = NULL;
gs_unref_hashtable GHashTable *attrs = NULL; gs_unref_hashtable GHashTable *attrs = NULL;
GHashTable *tmp_attrs; GHashTable *tmp_attrs;
const char *syntax = _("The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'");
g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE); g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE);
g_return_val_if_fail (str, FALSE); g_return_val_if_fail (str, FALSE);
@@ -164,8 +165,8 @@ nmc_parse_and_build_route (int family,
routev = nmc_strsplit_set (g_strstrip (value), " \t", 0); routev = nmc_strsplit_set (g_strstrip (value), " \t", 0);
len = g_strv_length (routev); len = g_strv_length (routev);
if (len < 1) { if (len < 1) {
g_set_error (error, 1, 0, _("'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric] [attr=val] [attr=val])"), g_set_error (error, 1, 0, "%s", syntax);
str); g_prefix_error (error, "'%s' is not valid. ", str);
goto finish; goto finish;
} }
@@ -224,15 +225,15 @@ nmc_parse_and_build_route (int family,
} }
g_hash_table_unref (tmp_attrs); g_hash_table_unref (tmp_attrs);
} else { } else {
g_set_error (error, 1, 0, _("unrecognized option '%s'"), routev[i]); g_set_error (error, 1, 0, "%s", syntax);
goto finish; goto finish;
} }
} }
route = nm_ip_route_new (family, dest, prefix, next_hop, metric, &local); route = nm_ip_route_new (family, dest, prefix, next_hop, metric, &local);
if (!route) { if (!route) {
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, g_set_error (error, 1, 0, "%s", syntax);
_("invalid route: %s"), local->message); g_prefix_error (error, _("invalid route: %s. "), local->message);
g_clear_error (&local); g_clear_error (&local);
goto finish; goto finish;
} }