bridge: add support for dynamic fdb entries

This patch is a follow up to the recently added
'static' fdb option.

It introduces a new option 'dynamic' which adds
dynamic fdb entries with NUD_REACHABLE.

$bridge fdb add 00:01:02:03:04:06 dev eth0 master dynamic

$bridge fdb show
00:01:02:03:04:06 dev eth0

This patch also documents all fdb types. Removes 'temp'
from usage message since it is now replaced by 'static'.
'temp' still works and is synonymous with static.

Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 9bc6b942a3892f592ce5d77ea7af026563b0e158..1400b654d164c760c228e860f5a509d95f3003a6 100644 (file)
--- 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/man/man8/bridge.8 b/man/man8/bridge.8
index 0ec6f1747f17cec9e6bde389f02628f709a2aca6..efd416e71d55b23d1e1088083da2fbc3a1bd53e2 100644 (file)
--- 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