* [PATCH] ip: allow using a device "help" (or a prefix thereof)
@ 2015-09-18 8:23 Christoph Schulz
2015-09-18 12:06 ` Erik Hugne
2015-09-23 23:07 ` Stephen Hemminger
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Schulz @ 2015-09-18 8:23 UTC (permalink / raw)
To: netdev; +Cc: Wilhelm Wijkander, Vadim Kochan, Leonhard Preis
Device names that match "help" or a prefix thereof should be allowed anywhere
a device name can be used. Note that a suitable keyword ("dev" or "name", the
latter for "ip tunnel") has to be used in these cases to resolve ambiguities.
Signed-off-by: Christoph Schulz <develop@kristov.de>
Reported-by: Leonhard Preis <leonhard@pre.is>
Reported-by: Wilhelm Wijkander <lists@0x5e.se>
---
ip/ip6tunnel.c | 2 +-
ip/ipaddress.c | 2 +-
ip/iplink.c | 6 ++----
ip/ipmaddr.c | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index 62a8240..9884efd 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -287,7 +287,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)
if (strcmp(*argv, "name") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (p->name[0])
duparg2("name", *argv);
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 2aa5fbf..4c97b4a 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1561,7 +1561,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (filter_dev)
duparg2("dev", *argv);
diff --git a/ip/iplink.c b/ip/iplink.c
index 97f46cd..6f840cf 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -649,8 +649,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
} else {
if (strcmp(*argv, "dev") == 0)
NEXT_ARG();
-
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (*dev)
duparg2("dev", *argv);
@@ -1148,8 +1147,7 @@ static int do_set(int argc, char **argv)
} else {
if (strcmp(*argv, "dev") == 0)
NEXT_ARG();
-
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (dev)
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index a77a18f..cbd6d11 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -257,7 +257,7 @@ static int multiaddr_list(int argc, char **argv)
if (strcmp(*argv, "dev") == 0) {
NEXT_ARG();
}
- if (matches(*argv, "help") == 0)
+ else if (matches(*argv, "help") == 0)
usage();
if (filter.dev)
duparg2("dev", *argv);
--
2.4.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ip: allow using a device "help" (or a prefix thereof)
2015-09-18 8:23 [PATCH] ip: allow using a device "help" (or a prefix thereof) Christoph Schulz
@ 2015-09-18 12:06 ` Erik Hugne
2015-09-23 23:07 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Erik Hugne @ 2015-09-18 12:06 UTC (permalink / raw)
To: Christoph Schulz; +Cc: netdev, Wilhelm Wijkander, Vadim Kochan, Leonhard Preis
On Fri, Sep 18, 2015 at 10:23:45AM +0200, Christoph Schulz wrote:
> Device names that match "help" or a prefix thereof should be allowed anywhere
> a device name can be used. Note that a suitable keyword ("dev" or "name", the
> latter for "ip tunnel") has to be used in these cases to resolve ambiguities.
Lol :D
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ip: allow using a device "help" (or a prefix thereof)
2015-09-18 8:23 [PATCH] ip: allow using a device "help" (or a prefix thereof) Christoph Schulz
2015-09-18 12:06 ` Erik Hugne
@ 2015-09-23 23:07 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2015-09-23 23:07 UTC (permalink / raw)
To: Christoph Schulz; +Cc: netdev, Wilhelm Wijkander, Vadim Kochan, Leonhard Preis
On Fri, 18 Sep 2015 10:23:45 +0200
Christoph Schulz <develop@kristov.de> wrote:
> Device names that match "help" or a prefix thereof should be allowed anywhere
> a device name can be used. Note that a suitable keyword ("dev" or "name", the
> latter for "ip tunnel") has to be used in these cases to resolve ambiguities.
>
> Signed-off-by: Christoph Schulz <develop@kristov.de>
> Reported-by: Leonhard Preis <leonhard@pre.is>
> Reported-by: Wilhelm Wijkander <lists@0x5e.se>
This patch no longer applies cleanly after this patch that was just merged.
commit 940a96e6ca9a14cd52c97a719a1700b417adb2fb
Author: Phil Sutter <phil@nwl.cc>
Date: Mon Sep 21 21:33:01 2015 +0200
ip-link: do not support 'ip link add dev help'
Commit 0532555 ('Support "ip link add help" for rtnl_link API') added a
check for specified help parameter. Though due to the place where it has
been added to, it is not possible anymore to force a given parameter to
be interpreted as interface name by prefixing it with 'dev '. Fix this
by forcing whatever follows 'dev' to be presumed as interface name.
Signed-off-by: Phil Sutter <phil@nwl.cc>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-23 23:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-18 8:23 [PATCH] ip: allow using a device "help" (or a prefix thereof) Christoph Schulz
2015-09-18 12:06 ` Erik Hugne
2015-09-23 23:07 ` Stephen Hemminger
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).