matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-08-09 09:15:30 -07:00
parent 7ef36c8cea fb6cb30774
commit 5926276a2a
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; return MNL_CB_OK;
} }
/* dump netlink extended ack error message */ /* dump netlink extended ack error message */
static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn) 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; const char *errmsg = NULL;
uint32_t off = 0; uint32_t off = 0;
if (!errfn)
return 0;
/* no TLVs, nothing to do here */ /* no TLVs, nothing to do here */
if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS)) if (!(nlh->nlmsg_flags & NLM_F_ACK_TLVS))
return 0; 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; 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 #else
#warning "libmnl required for error support" #warning "libmnl required for error support"