aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Aleksandrov <razor@blackwall.org>2022-06-08 15:29:18 +0300
committerDavid Ahern <dsahern@kernel.org>2022-06-10 09:01:44 -0600
commitef5425739fb817207a99e87f8ddf9f029a3a88c6 (patch)
tree8dd85c8777fe6f897aac6bf2624453d7b9fb5d82
parent8198f75073ede4e486ed9496e195fc065f8af486 (diff)
downloadiproute2-ef5425739fb817207a99e87f8ddf9f029a3a88c6.tar.gz
bridge: fdb: add flush [no]added_by_user entry matching
Add flush support to match entries with or without (if "no" is prepended) added_by_user flag. Note that NTF_USE is used internally because there is no NTF_ flag that describes such entries. Examples: $ bridge fdb flush dev br0 added_by_user This will delete all added_by_user entries in br0's fdb table. $ bridge fdb flush dev br0 noadded_by_user This will delete all entries except the ones with added_by_user flag in br0's fdb table. Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org> Signed-off-by: David Ahern <dsahern@kernel.org>
-rw-r--r--bridge/fdb.c13
-rw-r--r--man/man8/bridge.88
2 files changed, 19 insertions, 2 deletions
diff --git a/bridge/fdb.c b/bridge/fdb.c
index 9c1899c16..c57ad235b 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -46,7 +46,8 @@ static void usage(void)
" bridge fdb get [ to ] LLADDR [ br BRDEV ] { brport | dev } DEV\n"
" [ vlan VID ] [ vni VNI ] [ self ] [ master ] [ dynamic ]\n"
" bridge fdb flush dev DEV [ brport DEV ] [ vlan VID ]\n"
- " [ self ] [ master ] [ [no]permanent | [no]static | [no]dynamic ]\n");
+ " [ self ] [ master ] [ [no]permanent | [no]static | [no]dynamic ]\n"
+ " [ [no]added_by_user ]\n");
exit(-1);
}
@@ -681,6 +682,7 @@ static int fdb_flush(int argc, char **argv)
.ndm.ndm_family = PF_BRIDGE,
};
unsigned short ndm_state_mask = 0;
+ unsigned short ndm_flags_mask = 0;
short vid = -1, port_ifidx = -1;
unsigned short ndm_flags = 0;
unsigned short ndm_state = 0;
@@ -712,6 +714,12 @@ static int fdb_flush(int argc, char **argv)
} else if (strcmp(*argv, "nodynamic") == 0) {
ndm_state |= NUD_NOARP;
ndm_state_mask |= NUD_NOARP;
+ } else if (strcmp(*argv, "added_by_user") == 0) {
+ ndm_flags |= NTF_USE;
+ ndm_flags_mask |= NTF_USE;
+ } else if (strcmp(*argv, "noadded_by_user") == 0) {
+ ndm_flags &= ~NTF_USE;
+ ndm_flags_mask |= NTF_USE;
} else if (strcmp(*argv, "brport") == 0) {
if (port)
duparg2("brport", *argv);
@@ -764,6 +772,9 @@ static int fdb_flush(int argc, char **argv)
addattr32(&req.n, sizeof(req), NDA_IFINDEX, port_ifidx);
if (vid > -1)
addattr16(&req.n, sizeof(req), NDA_VLAN, vid);
+ if (ndm_flags_mask)
+ addattr8(&req.n, sizeof(req), NDA_NDM_FLAGS_MASK,
+ ndm_flags_mask);
if (ndm_state_mask)
addattr16(&req.n, sizeof(req), NDA_NDM_STATE_MASK,
ndm_state_mask);
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index f4b3887a9..b39c74823 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -121,7 +121,8 @@ bridge \- show / manipulate bridge addresses and devices
.B vlan
.IR VID " ] [ "
.BR self " ] [ " master " ] [ "
-.BR [no]permanent " | " [no]static " | " [no]dynamic " ]"
+.BR [no]permanent " | " [no]static " | " [no]dynamic " ] [ "
+.BR [no]added_by_user " ]"
.ti -8
.BR "bridge mdb" " { " add " | " del " } "
@@ -843,6 +844,11 @@ is prepended then only non-static entries will be deleted.
.B [no]dynamic
if specified then only dynamic entries will be deleted or respectively if "no"
is prepended then only non-dynamic (static or permanent) entries will be deleted.
+
+.TP
+.B [no]added_by_user
+if specified then only entries with added_by_user flag will be deleted or respectively
+if "no" is prepended then only entries without added_by_user flag will be deleted.
.sp
.SH bridge mdb - multicast group database management