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

libnetlink: Handle extack messages for non-error case 

Kernel can now return non-fatal error messages in extack facility.
Update iproute2 to dump to use if present.
- rename nl_dump_ext_err to nl_dump_ext_ack
- rename errmsg to msg
- add call to nl_dump_ext_ack in rtnl_dump_done and __rtnl_talk for
  non-error path

Signed-off-by: David Ahern <dsahern@gmail.com>
Tested-by: Ido Schimmel <idosch@mellanox.com>
This commit is contained in:
David Ahern 2017-11-09 09:46:50 +09:00 committed by Stephen Hemminger
parent b158c1790f
commit 844c37b423
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/libnetlink.c
View File

@ -66,13 +66,13 @@ static int err_attr_cb(const struct nlattr *attr, void *data)
} }
/* 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_ack(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
{ {
struct nlattr *tb[NLMSGERR_ATTR_MAX + 1] = {}; struct nlattr *tb[NLMSGERR_ATTR_MAX + 1] = {};
const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh); const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh);
const struct nlmsghdr *err_nlh = NULL; const struct nlmsghdr *err_nlh = NULL;
unsigned int hlen = sizeof(*err); unsigned int hlen = sizeof(*err);
const char *errmsg = NULL; const char *msg = NULL;
uint32_t off = 0; uint32_t off = 0;
/* no TLVs, nothing to do here */ /* no TLVs, nothing to do here */
@ -87,7 +87,7 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
return 0; return 0;
if (tb[NLMSGERR_ATTR_MSG]) if (tb[NLMSGERR_ATTR_MSG])
errmsg = mnl_attr_get_str(tb[NLMSGERR_ATTR_MSG]); msg = mnl_attr_get_str(tb[NLMSGERR_ATTR_MSG]);
if (tb[NLMSGERR_ATTR_OFFS]) { if (tb[NLMSGERR_ATTR_OFFS]) {
off = mnl_attr_get_u32(tb[NLMSGERR_ATTR_OFFS]); off = mnl_attr_get_u32(tb[NLMSGERR_ATTR_OFFS]);
@ -101,15 +101,18 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
} }
if (errfn) if (errfn)
return errfn(errmsg, off, err_nlh); return errfn(msg, off, err_nlh);
if (errmsg && *errmsg != '\0') { if (msg && *msg != '\0') {
fprintf(stderr, "Error: %s", errmsg); bool is_err = !!err->error;
if (errmsg[strlen(errmsg) - 1] != '.')
fprintf(stderr, "%s: %s",
is_err ? "Error" : "Warning", msg);
if (msg[strlen(msg) - 1] != '.')
fprintf(stderr, "."); fprintf(stderr, ".");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
return 1; return is_err ? 1 : 0;
} }
return 0; return 0;
@ -118,7 +121,7 @@ static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
#warning "libmnl required for error support" #warning "libmnl required for error support"
/* No extended error ack without libmnl */ /* No extended error ack without libmnl */
static int nl_dump_ext_err(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn) static int nl_dump_ext_ack(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn)
{ {
return 0; return 0;
} }
@ -379,6 +382,9 @@ static int rtnl_dump_done(struct nlmsghdr *h)
return len; return len;
} }
/* check for any messages returned from kernel */
nl_dump_ext_ack(h, NULL);
return 0; return 0;
} }
@ -569,7 +575,7 @@ int rtnl_dump_filter_nc(struct rtnl_handle *rth,
static void rtnl_talk_error(struct nlmsghdr *h, struct nlmsgerr *err, static void rtnl_talk_error(struct nlmsghdr *h, struct nlmsgerr *err,
nl_ext_ack_fn_t errfn) nl_ext_ack_fn_t errfn)
{ {
if (nl_dump_ext_err(h, errfn)) if (nl_dump_ext_ack(h, errfn))
return; return;
fprintf(stderr, "RTNETLINK answers: %s\n", fprintf(stderr, "RTNETLINK answers: %s\n",
@ -650,6 +656,9 @@ static int __rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
if (l < sizeof(struct nlmsgerr)) { if (l < sizeof(struct nlmsgerr)) {
fprintf(stderr, "ERROR truncated\n"); fprintf(stderr, "ERROR truncated\n");
} else if (!err->error) { } else if (!err->error) {
/* check messages from kernel */
nl_dump_ext_ack(h, errfn);
if (answer) if (answer)
*answer = (struct nlmsghdr *)buf; *answer = (struct nlmsghdr *)buf;
else else