ip link: Shortify printing the usage of link type

Allow to print particular link type usage by:

    ip link help [TYPE]

Currently to print usage for some link type it is needed
to use the following way:

    ip link { add | del | set } type TYPE help

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>

diff --git a/ip/ip_common.h b/ip/ip_common.h
index e56d1ac505a56bc0c663e3520a6fc4302333e0a0..83514633af3c6e590d336326d6f3eb8451543036 100644 (file)
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -76,6 +76,8 @@ struct link_util
                                             struct rtattr *[]);
        void                    (*print_xstats)(struct link_util *, FILE *,
                                             struct rtattr *);
+       void                    (*print_help)(struct link_util *, int, char **,
+                                            FILE *);
        bool                    slave;
 };
 

diff --git a/ip/iplink.c b/ip/iplink.c
index 5dd606062d9c2673288804a668b5dec5685dba90..43b26f4cea08c535fbe57c2e61033f6786904e11 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -85,6 +85,7 @@ void iplink_usage(void)
        fprintf(stderr, "       ip link show [ DEVICE | group GROUP ] [up]\n");
 
        if (iplink_have_newlink()) {
+               fprintf(stderr, "       ip link help [ TYPE ]\n");
                fprintf(stderr, "\n");
                fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
                fprintf(stderr, "          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
@@ -1137,6 +1138,23 @@ static int do_set(int argc, char **argv)
 }
 #endif /* IPLINK_IOCTL_COMPAT */
 
+static void do_help(int argc, char **argv)
+{
+       struct link_util *lu = NULL;
+
+       if (argc <= 0) {
+               usage();
+               return ;
+       }
+
+       lu = get_link_kind(*argv);
+
+       if (lu && lu->print_help)
+               lu->print_help(lu, argc-1, argv+1, stdout);
+       else
+               usage();
+}
+
 int do_iplink(int argc, char **argv)
 {
        if (argc > 0) {
@@ -1166,8 +1184,10 @@ int do_iplink(int argc, char **argv)
                    matches(*argv, "lst") == 0 ||
                    matches(*argv, "list") == 0)
                        return ipaddr_list_link(argc-1, argv+1);
-               if (matches(*argv, "help") == 0)
-                       usage();
+               if (matches(*argv, "help") == 0) {
+                       do_help(argc-1, argv+1);
+                       return 0;
+               }
        } else
                return ipaddr_list_link(0, NULL);
 

diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index 0a1ed0338c057ca449955b8806265d6eb82a76f7..3009ec912e23b6f806122c0cf02394bcd1750796 100644 (file)
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -112,9 +112,9 @@ static int get_index(const char **tbl, char *name)
        return -1;
 }
 
-static void explain(void)
+static void print_explain(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
                "Usage: ... bond [ mode BONDMODE ] [ active_slave SLAVE_DEV ]\n"
                "                [ clear_active_slave ] [ miimon MIIMON ]\n"
                "                [ updelay UPDELAY ] [ downdelay DOWNDELAY ]\n"
@@ -147,6 +147,11 @@ static void explain(void)
        );
 }
 
+static void explain(void)
+{
+       print_explain(stderr);
+}
+
 static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
                          struct nlmsghdr *n)
 {
@@ -530,9 +535,16 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        }
 }
 
+static void bond_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util bond_link_util = {
        .id             = "bond",
        .maxattr        = IFLA_BOND_MAX,
        .parse_opt      = bond_parse_opt,
        .print_opt      = bond_print_opt,
+       .print_help     = bond_print_help,
 };

diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index 3bef82a49fb48f08a69d536cf1a46198276722d9..5b924265e45ea10ee4f8a082129838717bfebd2a 100644 (file)
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -19,9 +19,9 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void usage(void)
+static void print_usage(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
                "Usage: ip link set DEVICE type can\n"
                "\t[ bitrate BITRATE [ sample-point SAMPLE-POINT] ] | \n"
                "\t[ tq TQ prop-seg PROP_SEG phase-seg1 PHASE-SEG1\n "
@@ -52,6 +52,11 @@ static void usage(void)
                );
 }
 
+static void usage(void)
+{
+       print_usage(stderr);
+}
+
 static int get_float(float *val, const char *arg)
 {
        float res;
@@ -344,10 +349,17 @@ static void can_print_xstats(struct link_util *lu,
        }
 }
 
+static void can_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util can_link_util = {
        .id             = "can",
        .maxattr        = IFLA_CAN_MAX,
        .parse_opt      = can_parse_opt,
        .print_opt      = can_print_opt,
        .print_xstats   = can_print_xstats,
+       .print_help     = can_print_help,
 };

diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
index 136da3589ae21cb6457ffaf9ac6e226919d5ed28..65fbec8e5e79febc3f1a225be783a3712afe6354 100644 (file)
--- a/ip/iplink_hsr.c
+++ b/ip/iplink_hsr.c
@@ -21,9 +21,9 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void usage(void)
+static void print_usage(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
 "Usage:\tip link add name NAME type hsr slave1 SLAVE1-IF slave2 SLAVE2-IF\n"
 "\t[ supervision ADDR-BYTE ]\n"
 "\n"
@@ -36,6 +36,11 @@ static void usage(void)
 "      frames (default = 0)\n");
 }
 
+static void usage(void)
+{
+       print_usage(stderr);
+}
+
 static int hsr_parse_opt(struct link_util *lu, int argc, char **argv,
                         struct nlmsghdr *n)
 {
@@ -121,9 +126,16 @@ static void hsr_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                                    b1, sizeof(b1)));
 }
 
+static void hsr_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util hsr_link_util = {
        .id             = "hsr",
        .maxattr        = IFLA_VLAN_MAX,
        .parse_opt      = hsr_parse_opt,
        .print_opt      = hsr_print_opt,
+       .print_help     = hsr_print_help,
 };

diff --git a/ip/iplink_ipoib.c b/ip/iplink_ipoib.c
index 5c1c68c46fa6fe52e02e752095a4bb2482886b6e..6087cbe1d0e22160f0df00d37e00970d66e75915 100644 (file)
--- a/ip/iplink_ipoib.c
+++ b/ip/iplink_ipoib.c
@@ -19,9 +19,9 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void explain(void)
+static void print_explain(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
                "Usage: ... ipoib [pkey PKEY] [mode {datagram | connected}]"
                "[umcast {0|1}]\n"
                "\n"
@@ -29,6 +29,10 @@ static void explain(void)
        );
 }
 
+static void explain(void)
+{
+       print_explain(stderr);
+}
 
 static int mode_arg(void)
 {
@@ -106,9 +110,16 @@ static void ipoib_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        fprintf(f, "umcast  %.4x ", rta_getattr_u16(tb[IFLA_IPOIB_UMCAST]));
 }
 
+static void ipoib_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util ipoib_link_util = {
        .id             = "ipoib",
        .maxattr        = IFLA_IPOIB_MAX,
        .parse_opt      = ipoib_parse_opt,
        .print_opt      = ipoib_print_opt,
+       .print_help     = ipoib_print_help,
 };

diff --git a/ip/iplink_macvlan.c b/ip/iplink_macvlan.c
index ec5110657e31d0cd05b7c80d8390430b1c4e7899..826b6591d922b4568ff9c639a31fe5ee85c16cf7 100644 (file)
--- a/ip/iplink_macvlan.c
+++ b/ip/iplink_macvlan.c
@@ -20,13 +20,18 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void explain(void)
+static void print_explain(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
                "Usage: ... macvlan mode { private | vepa | bridge | passthru }\n"
        );
 }
 
+static void explain(void)
+{
+       print_explain(stderr);
+}
+
 static int mode_arg(void)
 {
         fprintf(stderr, "Error: argument of \"mode\" must be \"private\", "
@@ -88,9 +93,16 @@ static void macvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]
                :                                "unknown");
 }
 
+static void macvlan_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util macvlan_link_util = {
        .id             = "macvlan",
        .maxattr        = IFLA_MACVLAN_MAX,
        .parse_opt      = macvlan_parse_opt,
        .print_opt      = macvlan_print_opt,
+       .print_help     = macvlan_print_help,
 };

diff --git a/ip/iplink_macvtap.c b/ip/iplink_macvtap.c
index bea9f0cfcbe27eb34c796d07418031162b0eb7d9..9c2cd74d285fcc05e353a2a0c73a3f783f716189 100644 (file)
--- a/ip/iplink_macvtap.c
+++ b/ip/iplink_macvtap.c
@@ -17,13 +17,18 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void explain(void)
+static void print_explain(FILE *f)
 {
        fprintf(stderr,
                "Usage: ... macvtap mode { private | vepa | bridge | passthru }\n"
        );
 }
 
+static void explain(void)
+{
+       print_explain(stderr);
+}
+
 static int mode_arg(const char *arg)
 {
         fprintf(stderr, "Error: argument of \"mode\" must be \"private\", "
@@ -85,9 +90,16 @@ static void macvtap_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]
                :                                "unknown");
 }
 
+static void macvtap_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util macvtap_link_util = {
        .id             = "macvtap",
        .maxattr        = IFLA_MACVLAN_MAX,
        .parse_opt      = macvtap_parse_opt,
        .print_opt      = macvtap_print_opt,
+       .print_help     = macvtap_print_help,
 };

diff --git a/ip/iplink_vlan.c b/ip/iplink_vlan.c
index 94b52ae55c73bbcaca1322af62aedb399aab3d5c..5bd766f867151cbf1ff29e31d22325748ddc0aec 100644 (file)
--- a/ip/iplink_vlan.c
+++ b/ip/iplink_vlan.c
@@ -18,9 +18,9 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void explain(void)
+static void print_explain(FILE *f)
 {
-       fprintf(stderr,
+       fprintf(f,
                "Usage: ... vlan [ protocol VLANPROTO ] id VLANID"
                "                [ FLAG-LIST ]\n"
                "                [ ingress-qos-map QOS-MAP ] [ egress-qos-map QOS-MAP ]\n"
@@ -35,6 +35,11 @@ static void explain(void)
        );
 }
 
+static void explain(void)
+{
+       print_explain(stderr);
+}
+
 static int on_off(const char *msg, const char *arg)
 {
        fprintf(stderr, "Error: argument of \"%s\" must be \"on\" or \"off\", not \"%s\"\n", msg, arg);
@@ -226,9 +231,16 @@ static void vlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                vlan_print_map(f, "egress-qos-map", tb[IFLA_VLAN_EGRESS_QOS]);
 }
 
+static void vlan_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util vlan_link_util = {
        .id             = "vlan",
        .maxattr        = IFLA_VLAN_MAX,
        .parse_opt      = vlan_parse_opt,
        .print_opt      = vlan_print_opt,
+       .print_help     = vlan_print_help,
 };

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index d92cfe8156e478426755ded5868ed2b50ff79cd0..f410423abbbaee08fbbf83bac75ba7bf1cf7a8dd 100644 (file)
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -21,19 +21,24 @@
 #include "utils.h"
 #include "ip_common.h"
 
+static void print_explain(FILE *f)
+{
+       fprintf(f, "Usage: ... vxlan id VNI [ { group | remote } ADDR ] [ local ADDR ]\n");
+       fprintf(f, "                 [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
+       fprintf(f, "                 [ dstport PORT ] [ srcport MIN MAX ]\n");
+       fprintf(f, "                 [ [no]learning ] [ [no]proxy ] [ [no]rsc ]\n");
+       fprintf(f, "                 [ [no]l2miss ] [ [no]l3miss ]\n");
+       fprintf(f, "                 [ ageing SECONDS ] [ maxaddress NUMBER ]\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: VNI := 0-16777215\n");
+       fprintf(f, "       ADDR := { IP_ADDRESS | any }\n");
+       fprintf(f, "       TOS  := { NUMBER | inherit }\n");
+       fprintf(f, "       TTL  := { 1..255 | inherit }\n");
+}
+
 static void explain(void)
 {
-       fprintf(stderr, "Usage: ... vxlan id VNI [ { group | remote } ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "                 [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
-       fprintf(stderr, "                 [ dstport PORT ] [ srcport MIN MAX ]\n");
-       fprintf(stderr, "                 [ [no]learning ] [ [no]proxy ] [ [no]rsc ]\n");
-       fprintf(stderr, "                 [ [no]l2miss ] [ [no]l3miss ]\n");
-       fprintf(stderr, "                 [ ageing SECONDS ] [ maxaddress NUMBER ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: VNI := 0-16777215\n");
-       fprintf(stderr, "       ADDR := { IP_ADDRESS | any }\n");
-       fprintf(stderr, "       TOS  := { NUMBER | inherit }\n");
-       fprintf(stderr, "       TTL  := { 1..255 | inherit }\n");
+       print_explain(stderr);
 }
 
 static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
@@ -365,9 +370,16 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                    fprintf(f, "maxaddr %u ", maxaddr);
 }
 
+static void vxlan_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
 struct link_util vxlan_link_util = {
        .id             = "vxlan",
        .maxattr        = IFLA_VXLAN_MAX,
        .parse_opt      = vxlan_parse_opt,
        .print_opt      = vxlan_print_opt,
+       .print_help     = vxlan_print_help,
 };

diff --git a/ip/link_gre.c b/ip/link_gre.c
index fda84d832f542b319ace8fe466f93c3891bf32cd..83653d006cedfb20d849c920448d8842716f3d5c 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -23,19 +23,24 @@
 #include "ip_common.h"
 #include "tunnel.h"
 
+static void print_usage(FILE *f)
+{
+       fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
+       fprintf(f, "          type { gre | gretap } [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(f, "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
+       fprintf(f, "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: NAME := STRING\n");
+       fprintf(f, "       ADDR := { IP_ADDRESS | any }\n");
+       fprintf(f, "       TOS  := { NUMBER | inherit }\n");
+       fprintf(f, "       TTL  := { 1..255 | inherit }\n");
+       fprintf(f, "       KEY  := { DOTTED_QUAD | NUMBER }\n");
+}
+
 static void usage(void) __attribute__((noreturn));
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n");
-       fprintf(stderr, "          type { gre | gretap } [ remote ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
-       fprintf(stderr, "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: NAME := STRING\n");
-       fprintf(stderr, "       ADDR := { IP_ADDRESS | any }\n");
-       fprintf(stderr, "       TOS  := { NUMBER | inherit }\n");
-       fprintf(stderr, "       TTL  := { 1..255 | inherit }\n");
-       fprintf(stderr, "       KEY  := { DOTTED_QUAD | NUMBER }\n");
+       print_usage(stderr);
        exit(-1);
 }
 
@@ -354,11 +359,18 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                fputs("ocsum ", f);
 }
 
+static void gre_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util gre_link_util = {
        .id = "gre",
        .maxattr = IFLA_GRE_MAX,
        .parse_opt = gre_parse_opt,
        .print_opt = gre_print_opt,
+       .print_help = gre_print_help,
 };
 
 struct link_util gretap_link_util = {
@@ -366,4 +378,5 @@ struct link_util gretap_link_util = {
        .maxattr = IFLA_GRE_MAX,
        .parse_opt = gre_parse_opt,
        .print_opt = gre_print_opt,
+       .print_help = gre_print_help,
 };

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index c7183e2fd4e758e4bd138ece46d52ff55f808b8a..f18919cc8c4baccbcdd14b05bd8542dd09518894 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -30,25 +30,30 @@
 
 #define DEFAULT_TNL_HOP_LIMIT  (64)
 
-static void usage(void) __attribute__((noreturn));
-static void usage(void)
+static void print_usage(FILE *f)
 {
-       fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n");
-       fprintf(stderr, "          type { ip6gre | ip6gretap } [ remote ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
-       fprintf(stderr, "          [ hoplimit TTL ] [ encaplimit ELIM ]\n");
-       fprintf(stderr, "          [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n");
-       fprintf(stderr, "          [ dscp inherit ] [ dev PHYS_DEV ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: NAME      := STRING\n");
-       fprintf(stderr, "       ADDR      := IPV6_ADDRESS\n");
-       fprintf(stderr, "       TTL       := { 0..255 } (default=%d)\n",
+       fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
+       fprintf(f, "          type { ip6gre | ip6gretap } [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(f, "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
+       fprintf(f, "          [ hoplimit TTL ] [ encaplimit ELIM ]\n");
+       fprintf(f, "          [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n");
+       fprintf(f, "          [ dscp inherit ] [ dev PHYS_DEV ]\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: NAME      := STRING\n");
+       fprintf(f, "       ADDR      := IPV6_ADDRESS\n");
+       fprintf(f, "       TTL       := { 0..255 } (default=%d)\n",
                DEFAULT_TNL_HOP_LIMIT);
-       fprintf(stderr, "       KEY       := { DOTTED_QUAD | NUMBER }\n");
-       fprintf(stderr, "       ELIM      := { none | 0..255 }(default=%d)\n",
+       fprintf(f, "       KEY       := { DOTTED_QUAD | NUMBER }\n");
+       fprintf(f, "       ELIM      := { none | 0..255 }(default=%d)\n",
                IPV6_DEFAULT_TNL_ENCAP_LIMIT);
-       fprintf(stderr, "       TCLASS    := { 0x0..0xff | inherit }\n");
-       fprintf(stderr, "       FLOWLABEL := { 0x0..0xfffff | inherit }\n");
+       fprintf(f, "       TCLASS    := { 0x0..0xff | inherit }\n");
+       fprintf(f, "       FLOWLABEL := { 0x0..0xfffff | inherit }\n");
+}
+
+static void usage(void) __attribute__((noreturn));
+static void usage(void)
+{
+       print_usage(stderr);
        exit(-1);
 }
 
@@ -386,11 +391,18 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                fputs("ocsum ", f);
 }
 
+static void gre_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util ip6gre_link_util = {
        .id = "ip6gre",
        .maxattr = IFLA_GRE_MAX,
        .parse_opt = gre_parse_opt,
        .print_opt = gre_print_opt,
+       .print_help = gre_print_help,
 };
 
 struct link_util ip6gretap_link_util = {
@@ -398,4 +410,5 @@ struct link_util ip6gretap_link_util = {
        .maxattr = IFLA_GRE_MAX,
        .parse_opt = gre_parse_opt,
        .print_opt = gre_print_opt,
+       .print_help = gre_print_help,
 };

diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 1c7f56cb1e154330ddf4de4571b80f7ab5701273..5ed3d5a23fb52d09d0d3c4cb64e1dfac110c91b3 100644 (file)
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -29,24 +29,29 @@
 
 #define DEFAULT_TNL_HOP_LIMIT  (64)
 
-static void usage(void) __attribute__((noreturn));
-static void usage(void)
+static void print_usage(FILE *f)
 {
-       fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n");
-       fprintf(stderr, "          [ mode { ip6ip6 | ipip6 | any } ]\n");
-       fprintf(stderr, "          type ip6tnl [ remote ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "          [ dev PHYS_DEV ] [ encaplimit ELIM ]\n");
-       fprintf(stderr ,"          [ hoplimit HLIM ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n");
-       fprintf(stderr, "          [ dscp inherit ] [ fwmark inherit ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: NAME      := STRING\n");
-       fprintf(stderr, "       ADDR      := IPV6_ADDRESS\n");
-       fprintf(stderr, "       ELIM      := { none | 0..255 }(default=%d)\n",
+       fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
+       fprintf(f, "          [ mode { ip6ip6 | ipip6 | any } ]\n");
+       fprintf(f, "          type ip6tnl [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(f, "          [ dev PHYS_DEV ] [ encaplimit ELIM ]\n");
+       fprintf(f ,"          [ hoplimit HLIM ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n");
+       fprintf(f, "          [ dscp inherit ] [ fwmark inherit ]\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: NAME      := STRING\n");
+       fprintf(f, "       ADDR      := IPV6_ADDRESS\n");
+       fprintf(f, "       ELIM      := { none | 0..255 }(default=%d)\n",
                IPV6_DEFAULT_TNL_ENCAP_LIMIT);
-       fprintf(stderr, "       HLIM      := 0..255 (default=%d)\n",
+       fprintf(f, "       HLIM      := 0..255 (default=%d)\n",
                DEFAULT_TNL_HOP_LIMIT);
-       fprintf(stderr, "       TCLASS    := { 0x0..0xff | inherit }\n");
-       fprintf(stderr, "       FLOWLABEL := { 0x0..0xfffff | inherit }\n");
+       fprintf(f, "       TCLASS    := { 0x0..0xff | inherit }\n");
+       fprintf(f, "       FLOWLABEL := { 0x0..0xfffff | inherit }\n");
+}
+
+static void usage(void) __attribute__((noreturn));
+static void usage(void)
+{
+       print_usage(stderr);
        exit(-1);
 }
 
@@ -335,9 +340,16 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
                fprintf(f, "fwmark inherit ");
 }
 
+static void ip6tunnel_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util ip6tnl_link_util = {
        .id = "ip6tnl",
        .maxattr = IFLA_IPTUN_MAX,
        .parse_opt = ip6tunnel_parse_opt,
        .print_opt = ip6tunnel_print_opt,
+       .print_help = ip6tunnel_print_help,
 };

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index d5324f8ec5445257a520b45f29e77374127d6525..ea13ce97706bc157902c58090931f54cce2dfd10 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -23,22 +23,27 @@
 #include "ip_common.h"
 #include "tunnel.h"
 
-static void usage(int sit) __attribute__((noreturn));
-static void usage(int sit)
+static void print_usage(FILE *f, int sit)
 {
-       fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n");
-       fprintf(stderr, "          type { ipip | sit } [ remote ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
-       fprintf(stderr, "          [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n");
+       fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
+       fprintf(f, "          type { ipip | sit } [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(f, "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
+       fprintf(f, "          [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n");
        if (sit) {
-               fprintf(stderr, "          [ mode { ip6ip | ipip | any } ]\n");
-               fprintf(stderr, "          [ isatap ]\n");
+               fprintf(f, "          [ mode { ip6ip | ipip | any } ]\n");
+               fprintf(f, "          [ isatap ]\n");
        }
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: NAME := STRING\n");
-       fprintf(stderr, "       ADDR := { IP_ADDRESS | any }\n");
-       fprintf(stderr, "       TOS  := { NUMBER | inherit }\n");
-       fprintf(stderr, "       TTL  := { 1..255 | inherit }\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: NAME := STRING\n");
+       fprintf(f, "       ADDR := { IP_ADDRESS | any }\n");
+       fprintf(f, "       TOS  := { NUMBER | inherit }\n");
+       fprintf(f, "       TTL  := { 1..255 | inherit }\n");
+}
+
+static void usage(int sit) __attribute__((noreturn));
+static void usage(int sit)
+{
+       print_usage(stderr, sit);
        exit(-1);
 }
 
@@ -347,11 +352,18 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
        }
 }
 
+static void iptunnel_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f, strcmp(lu->id, "sit") == 0);
+}
+
 struct link_util ipip_link_util = {
        .id = "ipip",
        .maxattr = IFLA_IPTUN_MAX,
        .parse_opt = iptunnel_parse_opt,
        .print_opt = iptunnel_print_opt,
+       .print_help = iptunnel_print_help,
 };
 
 struct link_util sit_link_util = {
@@ -359,4 +371,5 @@ struct link_util sit_link_util = {
        .maxattr = IFLA_IPTUN_MAX,
        .parse_opt = iptunnel_parse_opt,
        .print_opt = iptunnel_print_opt,
+       .print_help = iptunnel_print_help,
 };

diff --git a/ip/link_veth.c b/ip/link_veth.c
index 1196a1b563449c4cdc70a7f5d09b404150f095d2..314216cb63ce08847ba979cb1e49b4f53279b918 100644 (file)
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -17,12 +17,17 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void usage(void)
+static void print_usage(FILE *f)
 {
        printf("Usage: ip link <options> type veth [peer <options>]\n"
               "To get <options> type 'ip link add help'\n");
 }
 
+static void usage(void)
+{
+       print_usage(stderr);
+}
+
 static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
                          struct nlmsghdr *hdr)
 {
@@ -79,7 +84,14 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
        return argc - 1 - err;
 }
 
+static void veth_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util veth_link_util = {
        .id = "veth",
        .parse_opt = veth_parse_opt,
+       .print_help = veth_print_help,
 };

diff --git a/ip/link_vti.c b/ip/link_vti.c
index 6274c836cb944b9c47aad6804b0395d8b08e190c..59ac4c483075e922f3b3c6a9c2d4eb79c5951006 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -24,17 +24,22 @@
 #include "tunnel.h"
 
 
+static void print_usage(FILE *f)
+{
+       fprintf(f, "Usage: ip link { add | set | change | replace | del } NAME\n");
+       fprintf(f, "          type { vti } [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(f, "          [ [i|o]key KEY ]\n");
+       fprintf(f, "          [ dev PHYS_DEV ]\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: NAME := STRING\n");
+       fprintf(f, "       ADDR := { IP_ADDRESS }\n");
+       fprintf(f, "       KEY  := { DOTTED_QUAD | NUMBER }\n");
+}
+
 static void usage(void) __attribute__((noreturn));
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip link { add | set | change | replace | del } NAME\n");
-       fprintf(stderr, "          type { vti } [ remote ADDR ] [ local ADDR ]\n");
-       fprintf(stderr, "          [ [i|o]key KEY ]\n");
-       fprintf(stderr, "          [ dev PHYS_DEV ]\n");
-       fprintf(stderr, "\n");
-       fprintf(stderr, "Where: NAME := STRING\n");
-       fprintf(stderr, "       ADDR := { IP_ADDRESS }\n");
-       fprintf(stderr, "       KEY  := { DOTTED_QUAD | NUMBER }\n");
+       print_usage(stderr);
        exit(-1);
 }
 
@@ -240,9 +245,16 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        }
 }
 
+static void vti_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_usage(f);
+}
+
 struct link_util vti_link_util = {
        .id = "vti",
        .maxattr = IFLA_VTI_MAX,
        .parse_opt = vti_parse_opt,
        .print_opt = vti_print_opt,
+       .print_help = vti_print_help,
 };