bridge: mdb: Add source list support

Allow user space to specify the source list of (*, G) entries by adding
the 'MDBE_ATTR_SRC_LIST' attribute to the 'MDBA_SET_ENTRY_ATTRS' nest.

Example:

 # bridge mdb add dev br0 port dummy10 grp 239.1.1.1 temp source_list 198.51.100.1,198.51.100.2 filter_mode exclude

 # bridge -d -s mdb show
 dev br0 port dummy10 grp 239.1.1.1 src 198.51.100.2 temp filter_mode include proto static  blocked    0.00
 dev br0 port dummy10 grp 239.1.1.1 src 198.51.100.1 temp filter_mode include proto static  blocked    0.00
 dev br0 port dummy10 grp 239.1.1.1 temp filter_mode exclude source_list 198.51.100.2/0.00,198.51.100.1/0.00 proto static   256.42

 # bridge -j -p -d -s mdb show
 [ {
         "mdb": [ {
                 "index": 10,
                 "dev": "br0",
                 "port": "dummy10",
                 "grp": "239.1.1.1",
                 "src": "198.51.100.2",
                 "state": "temp",
                 "filter_mode": "include",
                 "protocol": "static",
                 "flags": [ "blocked" ],
                 "timer": "   0.00"
             },{
                 "index": 10,
                 "dev": "br0",
                 "port": "dummy10",
                 "grp": "239.1.1.1",
                 "src": "198.51.100.1",
                 "state": "temp",
                 "filter_mode": "include",
                 "protocol": "static",
                 "flags": [ "blocked" ],
                 "timer": "   0.00"
             },{
             },{
                 "index": 10,
                 "dev": "br0",
                 "port": "dummy10",
                 "grp": "239.1.1.1",
                 "state": "temp",
                 "filter_mode": "exclude",
                 "source_list": [ {
                         "address": "198.51.100.2",
                         "timer": "0.00"
                     },{
                         "address": "198.51.100.1",
                         "timer": "0.00"
                     } ],
                 "protocol": "static",
                 "flags": [ ],
                 "timer": " 251.19"
             } ],
         "router": {}
     } ]

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 ceb8b25b37a5c021b238754a0ec54e25e3982c3b..58adf424bdcddeefc46be5a96dbc8cf2264c6153 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 } ]\n"
+               "              [ filter_mode { include | exclude } ] [ source_list SOURCE_LIST ]\n"
                "       bridge mdb {show} [ dev DEV ] [ vid VID ]\n");
        exit(-1);
 }
@@ -509,6 +509,53 @@ static int mdb_parse_mode(struct nlmsghdr *n, int maxlen, const char *mode)
        return -1;
 }
 
+static int mdb_parse_src_entry(struct nlmsghdr *n, int maxlen, char *src_entry)
+{
+       struct in6_addr src_ip6;
+       struct rtattr *nest;
+       __be32 src_ip4;
+
+       nest = addattr_nest(n, maxlen, MDBE_SRC_LIST_ENTRY | NLA_F_NESTED);
+
+       if (inet_pton(AF_INET, src_entry, &src_ip4))
+               addattr32(n, maxlen, MDBE_SRCATTR_ADDRESS, src_ip4);
+       else if (inet_pton(AF_INET6, src_entry, &src_ip6))
+               addattr_l(n, maxlen, MDBE_SRCATTR_ADDRESS, &src_ip6,
+                         sizeof(src_ip6));
+       else
+               return -1;
+
+       addattr_nest_end(n, nest);
+
+       return 0;
+}
+
+static int mdb_parse_src_list(struct nlmsghdr *n, int maxlen, char *src_list)
+{
+       struct rtattr *nest;
+       char *sep;
+
+       nest = addattr_nest(n, maxlen, MDBE_ATTR_SRC_LIST | NLA_F_NESTED);
+
+       do {
+               sep = strchr(src_list, ',');
+               if (sep)
+                       *sep = '\0';
+
+               if (mdb_parse_src_entry(n, maxlen, src_list)) {
+                       fprintf(stderr, "Invalid source entry \"%s\" in source list\n",
+                               src_list);
+                       return -1;
+               }
+
+               src_list = sep + 1;
+       } while (sep);
+
+       addattr_nest_end(n, nest);
+
+       return 0;
+}
+
 static int mdb_modify(int cmd, int flags, int argc, char **argv)
 {
        struct {
@@ -524,6 +571,7 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
        char *d = NULL, *p = NULL, *grp = NULL, *src = NULL, *mode = NULL;
        struct br_mdb_entry entry = {};
        bool set_attrs = false;
+       char *src_list = NULL;
        short vid = 0;
 
        while (argc > 0) {
@@ -552,6 +600,10 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
                        NEXT_ARG();
                        mode = *argv;
                        set_attrs = true;
+               } else if (strcmp(*argv, "source_list") == 0) {
+                       NEXT_ARG();
+                       src_list = *argv;
+                       set_attrs = true;
                } else {
                        if (matches(*argv, "help") == 0)
                                usage();
@@ -595,6 +647,10 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
                        return -1;
                }
 
+               if (src_list && mdb_parse_src_list(&req.n, sizeof(req),
+                                                  src_list))
+                       return -1;
+
                addattr_nest_end(&req.n, nest);
        }
 

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index e829b9cb592ac7d77040fb8962e1f29f47c08557..801bf70c0e43fadf61c18c6524b89893c3c6bc63 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -139,7 +139,9 @@ bridge \- show / manipulate bridge addresses and devices
 .BR permanent " | " temp " ] [ "
 .B vid
 .IR VID " ] [ "
-.BR filter_mode " { " include " | " exclude " } ] "
+.BR filter_mode " { " include " | " exclude " } ] [ "
+.B source_list
+.IR SOURCE_LIST " ]
 
 .ti -8
 .BR "bridge mdb show" " [ "
@@ -937,6 +939,13 @@ the VLAN ID which is known to have members of this multicast group.
 controls whether the sources in the entry's source list are in INCLUDE or
 EXCLUDE mode. Can only be set for (*, G) entries.
 
+.TP
+.BI source_list " SOURCE_LIST"
+optional list of source IP addresses of senders for this multicast group,
+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.
+
 .in -8
 .SS bridge mdb delete - delete a multicast group database entry
 This command removes an existing mdb entry.