lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 16 Nov 2014 22:27:57 -0800 From: Mahesh Bandewar <maheshb@...gle.com> To: netdev <netdev@...r.kernel.org>, Stephen Hemminger <stephen@...workplumber.org> Cc: Eric Dumazet <edumazet@...gle.com>, Maciej Zenczykowski <maze@...gle.com>, Laurent Chavey <chavey@...gle.com>, Tim Hockin <thockin@...gle.com>, David Miller <davem@...emloft.net>, Brandon Philips <brandon.philips@...eos.com>, Pavel Emelianov <xemul@...allels.com>, Mahesh Bandewar <maheshb@...gle.com> Subject: [PATCH Iproute2 next v1] ip link: Add ipvlan support to the iproute2/ip util Adding basic support to create virtual devices using 'ip' utility. Following is the syntax - ip link add link <master> <virtual> type ipvlan mode [ l2 | l3 ] e.g. ip link add link eth0 ipvl0 type ipvlan mode l3 Signed-off-by: Mahesh Bandewar <maheshb@...gle.com> Cc: Stephen Hemminger <stephen@...workplumber.org> Cc: Eric Dumazet <edumazet@...gle.com> Cc: Maciej Żenczykowski <maze@...gle.com> Cc: Laurent Chavey <chavey@...gle.com> Cc: Tim Hockin <thockin@...gle.com> Cc: Brandon Philips <brandon.philips@...eos.com> Cc: Pavel Emelianov <xemul@...allels.com> --- include/linux/if_link.h | 14 ++++++++ ip/Makefile | 2 +- ip/iplink.c | 2 +- ip/iplink_ipvlan.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 ip/iplink_ipvlan.c diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 47320636361c..ef1e9f73fb15 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -325,6 +325,20 @@ enum macvlan_macaddr_mode { MACVLAN_MACADDR_SET, }; +/* IPVLAN section */ +enum { + IFLA_IPVLAN_UNSPEC, + IFLA_IPVLAN_MODE, + __IFLA_IPVLAN_MAX, +}; + +#define IFLA_IPVLAN_MAX (__IFLA_IPVLAN_MAX - 1) + +enum ipvlan_mode { + IPVLAN_MODE_L2 = 0, /* Process packets all the way upto L2 */ + IPVLAN_MODE_L3 = 1, /* Process Packets all the way upto L3 */ +}; + #define MACVLAN_FLAG_NOPROMISC 1 /* VXLAN section */ diff --git a/ip/Makefile b/ip/Makefile index fdc82f7286a0..01901bc8571c 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -6,7 +6,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \ iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \ link_iptnl.o link_gre6.o iplink_bond.o iplink_bond_slave.o iplink_hsr.o \ - iplink_bridge.o iplink_bridge_slave.o ipfou.o + iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o RTMONOBJ=rtmon.o diff --git a/ip/iplink.c b/ip/iplink.c index 43b26f4cea08..2fc7fa2b47c8 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -90,7 +90,7 @@ void iplink_usage(void) fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n"); fprintf(stderr, " bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n"); fprintf(stderr, " gre | gretap | ip6gre | ip6gretap | vti | nlmon |\n"); - fprintf(stderr, " bond_slave }\n"); + fprintf(stderr, " bond_slave | ipvlan }\n"); } exit(-1); } diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c new file mode 100644 index 000000000000..6712fdb92fd4 --- /dev/null +++ b/ip/iplink_ipvlan.c @@ -0,0 +1,85 @@ +/* iplink_ipvlan.c IPVLAN 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: Mahesh Bandewar <maheshb@...gle.com> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/socket.h> +#include <linux/if_link.h> + +#include "rt_names.h" +#include "utils.h" +#include "ip_common.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... ipvlan [ mode { l2 | l3 } ]\n"); +} + +static int mode_arg(void) +{ + fprintf(stderr, "Error: argument of \"mode\" must be either \"l2\", " + "or \"l3\"\n"); + return -1; +} + +static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv, + struct nlmsghdr *n) +{ + while (argc > 0) { + if (matches(*argv, "mode") == 0) { + __u16 mode = 0; + NEXT_ARG(); + + if (strcmp(*argv, "l2") == 0) + mode = IPVLAN_MODE_L2; + else if (strcmp(*argv, "l3") == 0) + mode = IPVLAN_MODE_L3; + else + mode_arg(); + + addattr16(n, 1024, IFLA_IPVLAN_MODE, mode); + } else if (matches(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "ipvlan: unknown option \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--, argv++; + } + + return 0; +} + +static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) +{ + + if (!tb) + return; + + if (tb[IFLA_IPVLAN_MODE]) { + if (RTA_PAYLOAD(tb[IFLA_IPVLAN_MODE]) == sizeof(__u16)) { + __u16 mode = rta_getattr_u16(tb[IFLA_IPVLAN_MODE]); + + fprintf(f, " mode %s ", + mode == IPVLAN_MODE_L2 ? "l2" + : mode == IPVLAN_MODE_L3 ? "l3" : "unknown"); + } + } +} + +struct link_util ipvlan_link_util = { + .id = "ipvlan", + .maxattr = IFLA_IPVLAN_MAX, + .parse_opt = ipvlan_parse_opt, + .print_opt = ipvlan_print_opt, +}; -- 2.1.0.rc2.206.gedb03e5 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists