bridge: add support for L2 multicast groups
Subsystems (3)
PATCH v2 1/1 bridge: add support for L2 multicast groups
From: Vladimir Oltean <[email protected]>
Extend the 'bridge mdb' command for the following syntax:
bridge mdb add dev br0 port swp0 grp 01:02:03:04:05:06 permanent
Signed-off-by Vladimir Oltean <[email protected]>
---
Changes in v2:
- Removed the const void casts.
- Removed MDB_FLAGS_L2 from the UAPI to be in sync with the latest kernel patch:
https://patchwork.ozlabs.org/project/netdev/patch/[email protected]/
bridge/mdb.c | 54 ++++++++++++++++++++++++++-------- include/uapi/linux/if_bridge.h | 1 + 2 files changed, 42 insertions(+), 13 deletions(-)
bridge/mdb.c +41 -13
@@ -149,6 +149,7 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, struct nlmsghdr *n, struct rtattr **tb) { const void *grp, *src; +const char *addr;SPRINT_BUF (abuf);const char *dev;int af;
@@ -156,9 +157,16 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,if (filter_vlan && e->vid != filter_vlan)return ; - af = e->addr.proto ==htons (ETH_P_IP ) ?AF_INET :AF_INET6 ; - grp = af ==AF_INET ? (const void *)&e->addr.u.ip4 : - (const void *)&e->addr.u.ip6; +if (!e->addr.proto) { + af =AF_PACKET ; + grp = &e->addr.u.mac_addr; + }else if (e->addr.proto ==htons (ETH_P_IP )) { + af =AF_INET ; + grp = &e->addr.u.ip4; + }else { + af =AF_INET6 ; + grp = &e->addr.u.ip6; + } dev =ll_index_to_name (ifindex);open_json_object (NULL );
@@ -168,9 +176,14 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,print_string (PRINT_ANY ,"port" ," port %s" ,ll_index_to_name (e->ifindex)); +if (af ==AF_INET || af ==AF_INET6 ) + addr =inet_ntop (af, grp, abuf,sizeof (abuf)); +else + addr =ll_addr_n2a (grp,ETH_ALEN ,0 , abuf,sizeof (abuf)); +print_color_string (PRINT_ANY ,ifa_family_color (af), -"grp" ," grp %s" , -inet_ntop (af, grp, abuf,sizeof (abuf))); +"grp" ," grp %s" , addr); +if (tb && tb[MDBA_MDB_EATTR_SOURCE ]) { src = (const void *)RTA_DATA (tb[MDBA_MDB_EATTR_SOURCE ]); print_color_string(PRINT_ANY, ifa_family_color(af),
@@ -440,6 +453,25 @@ static int mdb_show(int argc, char **argv)return 0 ; } +static int mdb_parse_grp (const char *grp,struct br_mdb_entry *e) +{ +if (inet_pton (AF_INET , grp, &e->addr.u.ip4)) { + e->addr.proto =htons (ETH_P_IP ); +return 0 ; + } +if (inet_pton (AF_INET6 , grp, &e->addr.u.ip6)) { + e->addr.proto =htons (ETH_P_IPV6 ); +return 0 ; + } +if (ll_addr_a2n ((char *)e->addr.u.mac_addr,sizeof (e->addr.u.mac_addr), + grp) ==ETH_ALEN ) { + e->addr.proto =0 ; +return 0 ; + } + +return -1 ; +} +static int mdb_modify (int cmd,int flags,int argc,char **argv) {struct {
@@ -497,14 +529,10 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)if (!entry.ifindex)return nodev (p); -if (!inet_pton (AF_INET , grp, &entry.addr.u.ip4)) { -if (!inet_pton (AF_INET6 , grp, &entry.addr.u.ip6)) { -fprintf (stderr,"Invalid address \"%s\"\n" , grp); -return -1 ; - }else - entry.addr.proto =htons (ETH_P_IPV6 ); - }else - entry.addr.proto =htons (ETH_P_IP ); +if (mdb_parse_grp (grp, &entry)) { +fprintf (stderr,"Invalid address \"%s\"\n" , grp); +return -1 ; + } entry.vid = vid;addattr_l (&req.n,sizeof (req),MDBA_SET_ENTRY , &entry,sizeof (entry));
include/uapi/linux/if_bridge.h +1 -0
@@ -526,6 +526,7 @@ struct br_mdb_entry {union {__be32 ip4;struct in6_addr ip6; +unsigned char mac_addr[ETH_ALEN ]; } u;__be16 proto; } addr;
Signature · 1 line
2.25.1
bridge/mdb.c static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, · line 183
Quoted 9 lines · Vladimir Oltean
bridge/mdb.c +5
-0@@ -168,9 +176,14 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,print_string (PRINT_ANY ,"port" ," port %s" ,ll_index_to_name (e->ifindex)); +if (af ==AF_INET || af ==AF_INET6 ) + addr =inet_ntop (af, grp, abuf,sizeof (abuf)); +else + addr =ll_addr_n2a (grp,ETH_ALEN ,0 , abuf,sizeof (abuf)); +
The above can be replaced with a single call to rt_addr_n2a_r.
bridge/mdb.c static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, · line 189
Quoted 8 lines
bridge/mdb.c +2
-2print_color_string (PRINT_ANY ,ifa_family_color (af), -"grp" ," grp %s" , -inet_ntop (af, grp, abuf,sizeof (abuf))); +"grp" ," grp %s" , addr); +if (tb && tb[MDBA_MDB_EATTR_SOURCE ]) { src = (const void *)RTA_DATA (tb[MDBA_MDB_EATTR_SOURCE ]); print_color_string(PRINT_ANY, ifa_family_color(af),
I think the rest is ok.