bridge: mdb: Add routing protocol support

Allow user space to specify the routing protocol of the MDB port group
entry by adding the 'MDBE_ATTR_RTPROT' attribute to the
'MDBA_SET_ENTRY_ATTRS' nest.

Examples:

 # bridge mdb add dev br0 port dummy10 grp 239.1.1.1 permanent proto zebra

 # bridge mdb add dev br0 port dummy10 grp 239.1.1.2 permanent

 # bridge -d mdb show
 dev br0 port dummy10 grp 239.1.1.2 permanent filter_mode exclude proto static
 dev br0 port dummy10 grp 239.1.1.1 permanent filter_mode exclude proto zebra

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/bridge/mdb.c b/bridge/mdb.c
index 58adf424bdcddeefc46be5a96dbc8cf2264c6153..195a032c211b3934b7223a1bfb9c2237733d7958 100644 (file)
--- a/bridge/mdb.c
+++ b/bridge/mdb.c
@@ -32,7 +32,7 @@ static void usage(void)
 {
        fprintf(stderr,
                "Usage: bridge mdb { add | del } dev DEV port PORT grp GROUP [src SOURCE] [permanent | temp] [vid VID]\n"
-               "              [ filter_mode { include | exclude } ] [ source_list SOURCE_LIST ]\n"
+               "              [ filter_mode { include | exclude } ] [ source_list SOURCE_LIST ] [ proto PROTO ]\n"
                "       bridge mdb {show} [ dev DEV ] [ vid VID ]\n");
        exit(-1);
 }
@@ -556,6 +556,20 @@ static int mdb_parse_src_list(struct nlmsghdr *n, int maxlen, char *src_list)
        return 0;
 }
 
+static int mdb_parse_proto(struct nlmsghdr *n, int maxlen, const char *proto)
+{
+       __u32 proto_id;
+       int err;
+
+       err = rtnl_rtprot_a2n(&proto_id, proto);
+       if (err)
+               return err;
+
+       addattr8(n, maxlen, MDBE_ATTR_RTPROT, proto_id);
+
+       return 0;
+}
+
 static int mdb_modify(int cmd, int flags, int argc, char **argv)
 {
        struct {
@@ -569,9 +583,9 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
                .bpm.family = PF_BRIDGE,
        };
        char *d = NULL, *p = NULL, *grp = NULL, *src = NULL, *mode = NULL;
+       char *src_list = NULL, *proto = NULL;
        struct br_mdb_entry entry = {};
        bool set_attrs = false;
-       char *src_list = NULL;
        short vid = 0;
 
        while (argc > 0) {
@@ -604,6 +618,10 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
                        NEXT_ARG();
                        src_list = *argv;
                        set_attrs = true;
+               } else if (strcmp(*argv, "proto") == 0) {
+                       NEXT_ARG();
+                       proto = *argv;
+                       set_attrs = true;
                } else {
                        if (matches(*argv, "help") == 0)
                                usage();
@@ -651,6 +669,12 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
                                                   src_list))
                        return -1;
 
+               if (proto && mdb_parse_proto(&req.n, sizeof(req), proto)) {
+                       fprintf(stderr, "Invalid protocol value \"%s\"\n",
+                               proto);
+                       return -1;
+               }
+
                addattr_nest_end(&req.n, nest);
        }
 

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 801bf70c0e43fadf61c18c6524b89893c3c6bc63..3e6e928c895f1bb55cd0aa2183a3f098f9b2a61d 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -141,7 +141,9 @@ bridge \- show / manipulate bridge addresses and devices
 .IR VID " ] [ "
 .BR filter_mode " { " include " | " exclude " } ] [ "
 .B source_list
-.IR SOURCE_LIST " ]
+.IR SOURCE_LIST " ] [ "
+.B proto
+.IR PROTO " ]
 
 .ti -8
 .BR "bridge mdb show" " [ "
@@ -946,6 +948,14 @@ separated by a ','.  Whether the entry forwards packets from these senders or
 not is determined by the entry's filter mode, which becomes a mandatory
 argument. Can only be set for (*, G) entries.
 
+.TP
+.BI proto " PROTO"
+the routing protocol identifier of this mdb entry. Can be a number or a string
+from the file /etc/iproute2/rt_protos. If the routing protocol is not given,
+then
+.B static
+is assumed.
+
 .in -8
 .SS bridge mdb delete - delete a multicast group database entry
 This command removes an existing mdb entry.