[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1502293407-4152-1-git-send-email-dsahern@gmail.com>
Date: Wed, 9 Aug 2017 08:43:27 -0700
From: David Ahern <dsahern@...il.com>
To: netdev@...r.kernel.org, stephen@...workplumber.org
Cc: David Ahern <dsahern@...il.com>
Subject: [PATCH v3 iproute2] lib: Dump ext-ack string by default
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@...il.com>
---
v3
- add ending '.' if string does not have one
v2
- check that errmsg is non-null
lib/libnetlink.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 145de2cb0ccf..81a344abff27 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -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"
--
2.1.4
Powered by blists - more mailing lists