Commit 334af761 authored by Marco Varlese's avatar Marco Varlese Committed by Stephen Hemminger

fix get_addr() and get_prefix() error messages

An attempt to add invalid address to interface would print "???" string
instead of the address family name.

For example:
$ ip address add 256.10.166.1/24 dev ens8
Error: ??? prefix is expected rather than "256.10.166.1/24".

$ ip neighbor add proxy 2001:db8::g dev ens8
Error: ??? address is expected rather than "2001:db8::g".

With this patch the output will look like:
$ ip address add 256.10.166.1/24 dev ens8
Error: inet prefix is expected rather than "256.10.166.1/24".

$ ip neighbor add proxy 2001:db8::g dev ens8
Error: inet6 address is expected rather than "2001:db8::g".
Signed-off-by: default avatarPrzemyslaw Szczerbik <przemyslawx.szczerbik@intel.com>
Signed-off-by: default avatarMarco Varlese <marco.varlese@intel.com>
parent f63ed3e6
...@@ -567,7 +567,7 @@ int get_addr(inet_prefix *dst, const char *arg, int family) ...@@ -567,7 +567,7 @@ int get_addr(inet_prefix *dst, const char *arg, int family)
{ {
if (get_addr_1(dst, arg, family)) { if (get_addr_1(dst, arg, family)) {
fprintf(stderr, "Error: %s address is expected rather than \"%s\".\n", fprintf(stderr, "Error: %s address is expected rather than \"%s\".\n",
family_name(family) ,arg); family_name(dst->family) ,arg);
exit(1); exit(1);
} }
return 0; return 0;
...@@ -579,9 +579,10 @@ int get_prefix(inet_prefix *dst, char *arg, int family) ...@@ -579,9 +579,10 @@ int get_prefix(inet_prefix *dst, char *arg, int family)
fprintf(stderr, "Error: \"%s\" may be inet prefix, but it is not allowed in this context.\n", arg); fprintf(stderr, "Error: \"%s\" may be inet prefix, but it is not allowed in this context.\n", arg);
exit(1); exit(1);
} }
if (get_prefix_1(dst, arg, family)) { if (get_prefix_1(dst, arg, family)) {
fprintf(stderr, "Error: %s prefix is expected rather than \"%s\".\n", fprintf(stderr, "Error: %s prefix is expected rather than \"%s\".\n",
family_name(family) ,arg); family_name(dst->family) ,arg);
exit(1); exit(1);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment