proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-07 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Dump ext-ack string by default

Browse Source 
In time, errfn can be implemented for link, route, etc commands to
give a much more detailed response (e.g., point to the attribute
that failed). Doing so is much more complicated to process the
message and convert attribute ids to names.

In any case the error string returned by the kernel should be dumped
to the user, so make that happen now.

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2017-08-09 08:43:27 -07:00 committed by Stephen Hemminger
parent fcfcc40b7d
commit fb6cb30774
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libnetlink.c
View File

@ -61,7 +61,6 @@ static int err_attr_cb(const struct nlattr *attr, void *data)
return MNL_CB_OK;
}
/* dump netlink extended ack error message */
static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
{
@ -72,9 +71,6 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
const char *errmsg = NULL;
uint32_t off = 0;
if (!errfn)
return 0;
/* no TLVs, nothing to do here */
if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS))
return 0;
@ -99,7 +95,19 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
err_nlh = &err->msg;
}
return errfn(errmsg, off, err_nlh);
if (errfn)
return errfn(errmsg, off, err_nlh);
if (errmsg && *errmsg != '\0') {
fprintf(stderr, "Error: %s", errmsg);
if (errmsg[strlen(errmsg) - 1] != '.')
fprintf(stderr, ".");
fprintf(stderr, "\n");
return 1;
}
return 0;
}
#else
#warning "libmnl required for error support"