matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink: new option to set neigh suppression on a bridge port 

neigh suppression can be used to suppress arp and nd flood
to bridge ports. It maps to the recently added
kernel support for bridge port flag IFLA_BRPORT_NEIGH_SUPPRESS.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu 2017-10-09 21:42:13 -07:00 committed by Stephen Hemminger
parent 2055bf15f1
commit 41973a47dd
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bridge/link.c
View File

@ -198,6 +198,9 @@ int print_linkinfo(const struct sockaddr_nl *who,
if (prtb[IFLA_BRPORT_MCAST_FLOOD]) if (prtb[IFLA_BRPORT_MCAST_FLOOD])
print_onoff(fp, "mcast_flood", print_onoff(fp, "mcast_flood",
rta_getattr_u8(prtb[IFLA_BRPORT_MCAST_FLOOD])); rta_getattr_u8(prtb[IFLA_BRPORT_MCAST_FLOOD]));
if (prtb[IFLA_BRPORT_NEIGH_SUPPRESS])
print_onoff(fp, "neigh_suppress",
rta_getattr_u8(prtb[IFLA_BRPORT_NEIGH_SUPPRESS]));
} }
} else } else
print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO])); print_portstate(fp, rta_getattr_u8(tb[IFLA_PROTINFO]));
@ -266,6 +269,7 @@ static int brlink_modify(int argc, char **argv)
.ifm.ifi_family = PF_BRIDGE, .ifm.ifi_family = PF_BRIDGE,
}; };
char *d = NULL; char *d = NULL;
__s8 neigh_suppress = -1;
__s8 learning = -1; __s8 learning = -1;
__s8 learning_sync = -1; __s8 learning_sync = -1;
__s8 flood = -1; __s8 flood = -1;
@ -355,6 +359,11 @@ static int brlink_modify(int argc, char **argv)
flags |= BRIDGE_FLAGS_SELF; flags |= BRIDGE_FLAGS_SELF;
} else if (strcmp(*argv, "master") == 0) { } else if (strcmp(*argv, "master") == 0) {
flags |= BRIDGE_FLAGS_MASTER; flags |= BRIDGE_FLAGS_MASTER;
} else if (strcmp(*argv, "neigh_suppress") == 0) {
NEXT_ARG();
if (!on_off("neigh_suppress", &neigh_suppress,
*argv))
return -1;
} else { } else {
usage(); usage();
} }
@ -407,6 +416,10 @@ static int brlink_modify(int argc, char **argv)
if (state >= 0) if (state >= 0)
addattr8(&req.n, sizeof(req), IFLA_BRPORT_STATE, state); addattr8(&req.n, sizeof(req), IFLA_BRPORT_STATE, state);
if (neigh_suppress != -1)
addattr8(&req.n, sizeof(req), IFLA_BRPORT_NEIGH_SUPPRESS,
neigh_suppress);
addattr_nest_end(&req.n, nest); addattr_nest_end(&req.n, nest);
/* IFLA_AF_SPEC nested attribute. Contains IFLA_BRIDGE_FLAGS that /* IFLA_AF_SPEC nested attribute. Contains IFLA_BRIDGE_FLAGS that

8
ip/iplink_bridge_slave.c
View File

@ -238,6 +238,10 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
if (tb[IFLA_BRPORT_MCAST_FLOOD]) if (tb[IFLA_BRPORT_MCAST_FLOOD])
_print_onoff(f, "mcast_flood", "mcast_flood", _print_onoff(f, "mcast_flood", "mcast_flood",
rta_getattr_u8(tb[IFLA_BRPORT_MCAST_FLOOD])); rta_getattr_u8(tb[IFLA_BRPORT_MCAST_FLOOD]));
if (tb[IFLA_BRPORT_NEIGH_SUPPRESS])
_print_onoff(f, "neigh_suppress", "neigh_suppress",
rta_getattr_u8(tb[IFLA_BRPORT_NEIGH_SUPPRESS]));
} }
static void bridge_slave_parse_on_off(char *arg_name, char *arg_val, static void bridge_slave_parse_on_off(char *arg_name, char *arg_val,
@ -328,6 +332,10 @@ static int bridge_slave_parse_opt(struct link_util *lu, int argc, char **argv,
NEXT_ARG(); NEXT_ARG();
bridge_slave_parse_on_off("mcast_fast_leave", *argv, n, bridge_slave_parse_on_off("mcast_fast_leave", *argv, n,
IFLA_BRPORT_FAST_LEAVE); IFLA_BRPORT_FAST_LEAVE);
} else if (matches(*argv, "neigh_suppress") == 0) {
NEXT_ARG();
bridge_slave_parse_on_off("neigh_suppress", *argv, n,
IFLA_BRPORT_NEIGH_SUPPRESS);
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;

4
man/man8/bridge.8
View File

@ -322,6 +322,10 @@ switch.
.BR "mcast_flood on " or " mcast_flood off " .BR "mcast_flood on " or " mcast_flood off "
Controls whether a given port will be flooded with multicast traffic for which there is no MDB entry. By default this flag is on. Controls whether a given port will be flooded with multicast traffic for which there is no MDB entry. By default this flag is on.
.TP
.BR "neigh_suppress on " or " neigh_suppress off "
Controls whether neigh discovery (arp and nd) proxy and suppression is enabled on the port. By default this flag is off.
.TP .TP
.BI self .BI self
link setting is configured on specified physical device link setting is configured on specified physical device