From: Dan Kenigsberg <danken@redhat.com>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <shemminger@vyatta.com>,
Dan Kenigsberg <danken@redhat.com>
Subject: [iproute2][PATCH] tc: mirred target: do not report non-existing devices
Date: Thu, 30 Aug 2012 17:51:17 +0300 [thread overview]
Message-ID: <1346338277-8395-1-git-send-email-danken@redhat.com> (raw)
Currently, if a mirred target device is removed, `tc filter show`
does not reveal the fact. Instead, it replaces the original name of the
device with the default output of ll_map:ll_idx_n2a().
This is unfortunate, since one cannot differ between this case and a valid
mirroring target device named 'if17'.
It seems that the original code meant to report an error message in this
case, but it does not, since ll_index_to_name() never returns 0. I would
not like to bail out in case of an error, since the user would still be
interested to know what are the other details of the action.
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
---
lib/ll_map.c | 13 +++++++++++++
tc/m_mirred.c | 10 ++++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/lib/ll_map.c b/lib/ll_map.c
index 1ca781e..8ceef41 100644
--- a/lib/ll_map.c
+++ b/lib/ll_map.c
@@ -108,6 +108,19 @@ const char *ll_idx_n2a(unsigned idx, char *buf)
return buf;
}
+char *ll_index_exists(unsigned idx)
+{
+ const struct ll_cache *im;
+
+ if (idx == 0)
+ return 0;
+
+ for (im = idxhead(idx); im; im = im->idx_next)
+ if (im->index == idx)
+ return 1;
+
+ return 0;
+}
const char *ll_index_to_name(unsigned idx)
{
diff --git a/tc/m_mirred.c b/tc/m_mirred.c
index 0d771bc..eba1240 100644
--- a/tc/m_mirred.c
+++ b/tc/m_mirred.c
@@ -268,13 +268,11 @@ print_mirred(struct action_util *au,FILE * f, struct rtattr *arg)
ll_init_map(&rth);
*/
+ dev = ll_index_to_name(p->ifindex);
- if ((dev = ll_index_to_name(p->ifindex)) == 0) {
- fprintf(stderr, "Cannot find device %d\n", p->ifindex);
- return -1;
- }
-
- fprintf(f, "mirred (%s to device %s) %s", mirred_n2a(p->eaction), dev,action_n2a(p->action, b1, sizeof (b1)));
+ fprintf(f, "mirred (%s to %sdevice %s) %s", mirred_n2a(p->eaction),
+ ll_index_exists(p->ifindex) ? "" : "missing-",
+ dev, action_n2a(p->action, b1, sizeof (b1)));
fprintf(f, "\n ");
fprintf(f, "\tindex %d ref %d bind %d",p->index,p->refcnt,p->bindcnt);
--
1.7.7.6
next reply other threads:[~2012-08-30 14:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-30 14:51 Dan Kenigsberg [this message]
2012-08-30 15:01 ` [iproute2][PATCH] tc: mirred target: do not report non-existing devices Eric Dumazet
2012-09-02 10:41 ` Dan Kenigsberg
2012-09-02 10:48 ` [iproute2][PATCH v2] " y
[not found] ` <1346582882-14568-1-git-send-email-y>
2012-09-04 15:40 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346338277-8395-1-git-send-email-danken@redhat.com \
--to=danken@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).