Repository : ssh://git@open-mesh.org/batctl

On branch : master

commit b382c0a2125052c99d17ee9c697cfe33f748d0f1 Author: Sven Eckelmann sven@narfation.org Date: Sat Jun 15 09:07:02 2019 +0200

batctl: Introduce MCASTv2 flags for RTR

The commit 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence") introduced two new flags for the RTR implementation of MCASTv2:

* BATADV_MCAST_WANT_NO_RTR4 * BATADV_MCAST_WANT_NO_RTR6

batctl requires them to implement support for it in the subcommand tcpdump and mcast_flags.

Signed-off-by: Sven Eckelmann sven@narfation.org

b382c0a2125052c99d17ee9c697cfe33f748d0f1 batadv_packet.h | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/batadv_packet.h b/batadv_packet.h index 4ebc213..2a15f01 100644 --- a/batadv_packet.h +++ b/batadv_packet.h @@ -107,12 +107,20 @@ enum batadv_icmp_packettype { * @BATADV_MCAST_WANT_ALL_UNSNOOPABLES: we want all packets destined for * 224.0.0.0/24 or ff02::1 * @BATADV_MCAST_WANT_ALL_IPV4: we want all IPv4 multicast packets + * (both link-local and routable ones) * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets + * (both link-local and routable ones) + * @BATADV_MCAST_WANT_NO_RTR4: we have no IPv4 multicast router and therefore + * only need routable IPv4 multicast packets we signed up for explicitly + * @BATADV_MCAST_WANT_NO_RTR6: we have no IPv6 multicast router and therefore + * only need routable IPv6 multicast packets we signed up for explicitly */ enum batadv_mcast_flags { BATADV_MCAST_WANT_ALL_UNSNOOPABLES = 1UL << 0, BATADV_MCAST_WANT_ALL_IPV4 = 1UL << 1, BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2, + BATADV_MCAST_WANT_NO_RTR4 = 1UL << 3, + BATADV_MCAST_WANT_NO_RTR6 = 1UL << 4, };

/* tt data subtypes */