diff --git a/bridge/fdb.c b/bridge/fdb.c index 9bc6b942..1400b654 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -33,7 +33,7 @@ static void usage(void) { fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n" " [ self ] [ master ] [ use ] [ router ]\n" - " [ local | temp | static ] [ dst IPADDR ] [ vlan VID ]\n" + " [ local | static | dynamic ] [ dst IPADDR ] [ vlan VID ]\n" " [ port PORT] [ vni VNI ] [ via DEV ]\n"); fprintf(stderr, " bridge fdb [ show [ br BRDEV ] [ brport DEV ] ]\n"); exit(-1); @@ -304,6 +304,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv) } else if (matches(*argv, "temp") == 0 || matches(*argv, "static") == 0) { req.ndm.ndm_state |= NUD_REACHABLE; + } else if (matches(*argv, "dynamic") == 0) { + req.ndm.ndm_state |= NUD_REACHABLE; + req.ndm.ndm_state &= ~NUD_NOARP; } else if (matches(*argv, "vlan") == 0) { if (vid >= 0) duparg2("vlan", *argv); diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 79f15eff..d2d42026 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -116,19 +116,17 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, __u8 vlan_filter; NEXT_ARG(); - if (get_u8(&vlan_filter, *argv, 0)) { + if (get_u8(&vlan_filter, *argv, 0)) invarg("invalid vlan_filtering", *argv); - return -1; - } + addattr8(n, 1024, IFLA_BR_VLAN_FILTERING, vlan_filter); } else if (matches(*argv, "vlan_protocol") == 0) { __u16 vlan_proto; NEXT_ARG(); - if (ll_proto_a2n(&vlan_proto, *argv)) { + if (ll_proto_a2n(&vlan_proto, *argv)) invarg("invalid vlan_protocol", *argv); - return -1; - } + addattr16(n, 1024, IFLA_BR_VLAN_PROTOCOL, vlan_proto); } else if (matches(*argv, "group_fwd_mask") == 0) { __u16 fwd_mask; @@ -243,85 +241,77 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, __u64 mcast_membership_intvl; NEXT_ARG(); - if (get_u64(&mcast_membership_intvl, *argv, 0)) { + if (get_u64(&mcast_membership_intvl, *argv, 0)) invarg("invalid mcast_membership_interval", *argv); - return -1; - } + addattr64(n, 1024, IFLA_BR_MCAST_MEMBERSHIP_INTVL, mcast_membership_intvl); } else if (matches(*argv, "mcast_querier_interval") == 0) { __u64 mcast_querier_intvl; NEXT_ARG(); - if (get_u64(&mcast_querier_intvl, *argv, 0)) { + if (get_u64(&mcast_querier_intvl, *argv, 0)) invarg("invalid mcast_querier_interval", *argv); - return -1; - } + addattr64(n, 1024, IFLA_BR_MCAST_QUERIER_INTVL, mcast_querier_intvl); } else if (matches(*argv, "mcast_query_interval") == 0) { __u64 mcast_query_intvl; NEXT_ARG(); - if (get_u64(&mcast_query_intvl, *argv, 0)) { + if (get_u64(&mcast_query_intvl, *argv, 0)) invarg("invalid mcast_query_interval", *argv); - return -1; - } + addattr64(n, 1024, IFLA_BR_MCAST_QUERY_INTVL, mcast_query_intvl); } else if (!matches(*argv, "mcast_query_response_interval")) { __u64 mcast_query_resp_intvl; NEXT_ARG(); - if (get_u64(&mcast_query_resp_intvl, *argv, 0)) { + if (get_u64(&mcast_query_resp_intvl, *argv, 0)) invarg("invalid mcast_query_response_interval", *argv); - return -1; - } + addattr64(n, 1024, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, mcast_query_resp_intvl); } else if (!matches(*argv, "mcast_startup_query_interval")) { __u64 mcast_startup_query_intvl; NEXT_ARG(); - if (get_u64(&mcast_startup_query_intvl, *argv, 0)) { + if (get_u64(&mcast_startup_query_intvl, *argv, 0)) invarg("invalid mcast_startup_query_interval", *argv); - return -1; - } + addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, mcast_startup_query_intvl); } else if (matches(*argv, "nf_call_iptables") == 0) { __u8 nf_call_ipt; NEXT_ARG(); - if (get_u8(&nf_call_ipt, *argv, 0)) { + if (get_u8(&nf_call_ipt, *argv, 0)) invarg("invalid nf_call_iptables", *argv); - return -1; - } + addattr8(n, 1024, IFLA_BR_NF_CALL_IPTABLES, nf_call_ipt); } else if (matches(*argv, "nf_call_ip6tables") == 0) { __u8 nf_call_ip6t; NEXT_ARG(); - if (get_u8(&nf_call_ip6t, *argv, 0)) { + if (get_u8(&nf_call_ip6t, *argv, 0)) invarg("invalid nf_call_ip6tables", *argv); - return -1; - } + addattr8(n, 1024, IFLA_BR_NF_CALL_IP6TABLES, nf_call_ip6t); } else if (matches(*argv, "nf_call_arptables") == 0) { __u8 nf_call_arpt; NEXT_ARG(); - if (get_u8(&nf_call_arpt, *argv, 0)) { + if (get_u8(&nf_call_arpt, *argv, 0)) invarg("invalid nf_call_arptables", *argv); - return -1; - } + addattr8(n, 1024, IFLA_BR_NF_CALL_ARPTABLES, nf_call_arpt); } else if (matches(*argv, "help") == 0) { diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index 0ec6f174..efd416e7 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -54,7 +54,7 @@ bridge \- show / manipulate bridge addresses and devices .I LLADDR .B dev .IR DEV " { " -.BR local " | " temp " } [ " +.BR local " | " static " | " dynamic " } [ " .BR self " ] [ " master " ] [ " router " ] [ " use " ] [ " .B dst .IR IPADDR " ] [ " @@ -338,6 +338,18 @@ the Ethernet MAC address. .BI dev " DEV" the interface to which this address is associated. +.B local +- is a local permanent fdb entry +.sp + +.B static +- is a static (no arp) fdb entry +.sp + +.B dynamic +- is a dynamic reachable age-able fdb entry +.sp + .B self - the address is associated with the port drivers fdb. Usually hardware. .sp