iplink: add support for bonding netlink

Signed-off-by: Jiri Pirko <jiri@resnulli.us>

diff --git a/ip/Makefile b/ip/Makefile
index f10d22fc1cae4d7d094923ba97047e3c6598ac34..89a7a36a35dedde007b51ada4c2368bdb606b581 100644 (file)
--- a/ip/Makefile
+++ b/ip/Makefile
@@ -5,7 +5,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o \
     iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \
-    link_iptnl.o link_gre6.o
+    link_iptnl.o link_gre6.o iplink_bond.o
 
 RTMONOBJ=rtmon.o
 

diff --git a/ip/iplink.c b/ip/iplink.c
index 6cde731ac32897a727f85109a489cd9eddd06dbf..58b6c2032db13fd41f36b6ecc7365c1dc9b2b399 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -85,8 +85,8 @@ void iplink_usage(void)
        if (iplink_have_newlink()) {
                fprintf(stderr, "\n");
                fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
-               fprintf(stderr, "          can | bridge | ipoib | ip6tnl | ipip | sit | vxlan |\n");
-               fprintf(stderr, "          gre | gretap | ip6gre | ip6gretap | vti }\n");
+               fprintf(stderr, "          can | bridge | bond | ipoib | ip6tnl | ipip | sit |\n");
+               fprintf(stderr, "          vxlan | gre | gretap | ip6gre | ip6gretap | vti }\n");
        }
        exit(-1);
 }

diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
new file mode 100644 (file)
index 0000000..3fb7f4f
--- /dev/null
+++ b/ip/iplink_bond.c
@@ -0,0 +1,92 @@
+/*
+ * iplink_bond.c       Bonding device support
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * Authors:     Jiri Pirko <jiri@resnulli.us>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <linux/if_link.h>
+#include <net/if.h>
+
+#include "rt_names.h"
+#include "utils.h"
+#include "ip_common.h"
+
+static void explain(void)
+{
+       fprintf(stderr,
+               "Usage: ... bond [ mode BONDMODE ] [ active_slave SLAVE_DEV ]\n"
+               "                [ clear_active_slave ]\n"
+               "\n"
+               "BONDMODE := 0-6\n"
+       );
+}
+
+static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
+                         struct nlmsghdr *n)
+{
+       __u8 mode;
+       unsigned ifindex;
+
+       while (argc > 0) {
+               if (matches(*argv, "mode") == 0) {
+                       NEXT_ARG();
+                       if (get_u8(&mode, *argv, 0)) {
+                               invarg("mode %s is invalid", *argv);
+                               return -1;
+                       }
+                       addattr8(n, 1024, IFLA_BOND_MODE, mode);
+               } else if (matches(*argv, "active_slave") == 0) {
+                       NEXT_ARG();
+                       ifindex = if_nametoindex(*argv);
+                       if (!ifindex)
+                               return -1;
+                       addattr32(n, 1024, IFLA_BOND_ACTIVE_SLAVE, ifindex);
+               } else if (matches(*argv, "clear_active_slave") == 0) {
+                       addattr32(n, 1024, IFLA_BOND_ACTIVE_SLAVE, 0);
+               } else {
+                       fprintf(stderr, "bond: unknown command \"%s\"?\n", *argv);
+                       explain();
+                       return -1;
+               }
+               argc--, argv++;
+       }
+
+       return 0;
+}
+
+static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+{
+       unsigned ifindex;
+
+       if (!tb)
+               return;
+
+       if (tb[IFLA_BOND_MODE])
+               fprintf(f, "mode %u ", rta_getattr_u8(tb[IFLA_BOND_MODE]));
+
+       if (tb[IFLA_BOND_ACTIVE_SLAVE] &&
+           (ifindex = rta_getattr_u32(tb[IFLA_BOND_ACTIVE_SLAVE]))) {
+               char buf[IFNAMSIZ];
+               const char *n = if_indextoname(ifindex, buf);
+
+               if (n)
+                       fprintf(f, "active_slave %s ", n);
+               else
+                       fprintf(f, "active_slave %u ", ifindex);
+       }
+}
+
+struct link_util bond_link_util = {
+       .id             = "bond",
+       .maxattr        = IFLA_BOND_MAX,
+       .parse_opt      = bond_parse_opt,
+       .print_opt      = bond_print_opt,
+};

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 8b68c78deaaa3a5f98fe6b2136af6a9cb30eece0..1825dc546c88d9eeabb664733f2b619530ae5f73 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -51,6 +51,7 @@ ip-link \- network device configuration
 .ti -8
 .IR TYPE " := [ "
 .BR bridge " | "
+.BR bond " ]"
 .BR can " | "
 .BR dummy " | "
 .BR ifb " | "
@@ -155,6 +156,9 @@ Link types:
 .B bridge
 - Ethernet Bridge device
 .sp
+.B bond
+- Bonding device
+.sp
 .B can
 - Controller Area Network interface
 .sp