proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-11-04 23:14:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip/ipvlan: enhance ability to add mode flags to existing modes

Browse Source 
IPvlan supported bridge-only functionality prior to commits
a190d04db937 ('ipvlan: introduce 'private' attribute for all
existing modes.') and fe89aa6b250c ('ipvlan: implement VEPA mode').
These two commits allow to configure the VEPA and private modes now.
This patch adds those options in ip command.

e.g.
  bash:~# ip link add link eth0 name ipvl0 type ipvlan mode l2 private
  -or-
  bash:~# ip link add link eth0 type ipvl0 type ipvlan mode l2 vepa

Also the output will reflect the mode and the mode-flag accordingly.
e.g.
  bash:~# ip -details link show ipvl0
  4: ipvl0@eth0: <BROADCAST,MULTICAST> mtu 1500 qdisc ...
     link/ether 00:1a:11:44:a5:3e brd ff:ff:ff:ff:ff:ff promiscuity 0
     ipvlan  mode l2 private addrgenmode eui64 numtxqueues 1 ...

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
This commit is contained in:
Mahesh Bandewar 2017-10-30 13:57:51 -07:00 committed by Stephen Hemminger
parent fe388b9e0c
commit 1ef5c95201
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ip/iplink_ipvlan.c
View File

@ -20,12 +20,21 @@
static void ipvlan_explain(FILE *f) static void ipvlan_explain(FILE *f)
{ {
fprintf(f, "Usage: ... ipvlan [ mode { l2 | l3 | l3s } ]\n"); fprintf(f,
"Usage: ... ipvlan [ mode MODE ] [ FLAGS ]\n"
"\n"
"MODE: l3 | l3s | l2\n"
"FLAGS: bridge | private | vepa\n"
"(first values are the defaults if nothing is specified).\n"
);
} }
static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv, static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
struct nlmsghdr *n) struct nlmsghdr *n)
{ {
__u16 flags = 0;
bool mflag_given = false;
while (argc > 0) { while (argc > 0) {
if (matches(*argv, "mode") == 0) { if (matches(*argv, "mode") == 0) {
__u16 mode = 0; __u16 mode = 0;
@ -43,6 +52,14 @@ static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
return -1; return -1;
} }
addattr16(n, 1024, IFLA_IPVLAN_MODE, mode); addattr16(n, 1024, IFLA_IPVLAN_MODE, mode);
} else if (matches(*argv, "private") == 0 && !mflag_given) {
flags |= IPVLAN_F_PRIVATE;
mflag_given = true;
} else if (matches(*argv, "vepa") == 0 && !mflag_given) {
flags |= IPVLAN_F_VEPA;
mflag_given = true;
} else if (matches(*argv, "bridge") == 0 && !mflag_given) {
mflag_given = true;
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
ipvlan_explain(stderr); ipvlan_explain(stderr);
return -1; return -1;
@ -55,6 +72,7 @@ static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
argc--; argc--;
argv++; argv++;
} }
addattr16(n, 1024, IFLA_IPVLAN_FLAGS, flags);
return 0; return 0;
} }
@ -75,6 +93,21 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_string(PRINT_ANY, "mode", " mode %s ", mode_str); print_string(PRINT_ANY, "mode", " mode %s ", mode_str);
} }
} }
if (tb[IFLA_IPVLAN_FLAGS]) {
if (RTA_PAYLOAD(tb[IFLA_IPVLAN_FLAGS]) == sizeof(__u16)) {
__u16 flags = rta_getattr_u16(tb[IFLA_IPVLAN_FLAGS]);
if (flags & IPVLAN_F_PRIVATE)
print_bool(PRINT_ANY, "private", "private ",
true);
else if (flags & IPVLAN_F_VEPA)
print_bool(PRINT_ANY, "vepa", "vepa ",
true);
else
print_bool(PRINT_ANY, "bridge", "bridge ",
true);
}
}
} }
static void ipvlan_print_help(struct link_util *lu, int argc, char **argv, static void ipvlan_print_help(struct link_util *lu, int argc, char **argv,