@@ -323,15 +323,15 @@ Usage::
Example::
- Multicast flags (own flags: [U46])
+ Multicast flags (own flags: [U46R4R6.])
* Bridged [U] U
* No IGMP/MLD Querier [4/6]: ./.
* Shadowing IGMP/MLD Querier [4/6]: 4/6
-------------------------------------------
Originator Flags
- 02:04:64:a4:39:c1 [U..]
- 02:04:64:a4:39:c2 [U..]
- 02:04:64:a4:39:c3 [...]
+ 02:04:64:a4:39:c1 [U... . .]
+ 02:04:64:a4:39:c2 [...R4R6.]
+ 02:04:64:a4:39:c3 [.... . P]
where
@@ -348,6 +348,17 @@ U:
6:
wants all IPv6 multicast traffic, meaning other nodes need to always forward
any IPv6 multicast traffic to it
+R4:
+ wants all routable IPv4 multicast traffic, meaning other nodes need to always
+ forward multicast traffic destined to 224.0.0.0/4 excluding 224.0.0.0/24 to
+ it
+R6:
+ wants all routable IPv6 multicast traffic, meaning other nodes need to always
+ forward multicast traffic destined to ffXY::/16 with Y > 2 (scope greater
+ than link-local) to it
+P:
+ the node either cannot handle batman-adv multicast packets with a multicast
+ tracker TVLV or one of its hard interfaces has an MTU smaller than 1280 bytes
If a node does not have multicast optimizations available (e.g. old batman-adv
version or optimizations not compiled in), therefore not announcing any
@@ -930,39 +941,42 @@ Example::
$ batctl meshif bat0 mcast_flags_json | json_pp
[
- {
- "mcast_flags": {
- "all_unsnoopables": true,
- "raw": 1,
- "want_all_ipv4": false,
- "want_all_ipv6": false,
- "want_no_rtr_ipv4": false,
- "want_no_rtr_ipv6": false
- },
- "orig_address": "9e:58:32:59:54:c3"
- },
- {
- "mcast_flags": {
- "all_unsnoopables": true,
- "raw": 1,
- "want_all_ipv4": false,
- "want_all_ipv6": false,
- "want_no_rtr_ipv4": false,
- "want_no_rtr_ipv6": false
- },
- "orig_address": "32:12:17:0a:21:63"
- },
- {
- "mcast_flags": {
- "all_unsnoopables": true,
- "raw": 1,
- "want_all_ipv4": false,
- "want_all_ipv6": false,
- "want_no_rtr_ipv4": false,
- "want_no_rtr_ipv6": false
- },
- "orig_address": "1a:34:8c:c4:fe:13"
- },
+ {
+ "mcast_flags" : {
+ "all_unsnoopables" : true,
+ "have_mc_ptype_capa" : true,
+ "raw" : 57,
+ "want_all_ipv4" : false,
+ "want_all_ipv6" : false,
+ "want_no_rtr_ipv4" : true,
+ "want_no_rtr_ipv6" : true
+ },
+ "orig_address" : "02:04:64:a4:39:c1"
+ },
+ {
+ "mcast_flags" : {
+ "all_unsnoopables" : false,
+ "have_mc_ptype_capa" : true,
+ "raw" : 40,
+ "want_all_ipv4" : false,
+ "want_all_ipv6" : false,
+ "want_no_rtr_ipv4" : true,
+ "want_no_rtr_ipv6" : false
+ },
+ "orig_address" : "02:04:64:a4:39:c2"
+ },
+ {
+ "mcast_flags" : {
+ "all_unsnoopables" : false,
+ "have_mc_ptype_capa" : false,
+ "raw" : 24,
+ "want_all_ipv4" : false,
+ "want_all_ipv6" : false,
+ "want_no_rtr_ipv4" : true,
+ "want_no_rtr_ipv6" : true
+ },
+ "orig_address" : "02:04:64:a4:39:c3"
+ },
[...]
]
@@ -116,6 +116,9 @@ enum batadv_icmp_packettype {
* 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
+ * @BATADV_MCAST_HAVE_MC_PTYPE_CAPA: we can parse, receive and forward
+ * batman-adv multicast packets with a multicast tracker TVLV. And all our
+ * hard interfaces have an MTU of at least 1280 bytes.
*/
enum batadv_mcast_flags {
BATADV_MCAST_WANT_ALL_UNSNOOPABLES = 1UL << 0,
@@ -123,6 +126,7 @@ enum batadv_mcast_flags {
BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2,
BATADV_MCAST_WANT_NO_RTR4 = 1UL << 3,
BATADV_MCAST_WANT_NO_RTR6 = 1UL << 4,
+ BATADV_MCAST_HAVE_MC_PTYPE_CAPA = 1UL << 5,
};
/* tt data subtypes */
@@ -174,14 +178,16 @@ enum batadv_bla_claimframe {
* @BATADV_TVLV_TT: translation table tvlv
* @BATADV_TVLV_ROAM: roaming advertisement tvlv
* @BATADV_TVLV_MCAST: multicast capability tvlv
+ * @BATADV_TVLV_MCAST_TRACKER: multicast tracker tvlv
*/
enum batadv_tvlv_type {
- BATADV_TVLV_GW = 0x01,
- BATADV_TVLV_DAT = 0x02,
- BATADV_TVLV_NC = 0x03,
- BATADV_TVLV_TT = 0x04,
- BATADV_TVLV_ROAM = 0x05,
- BATADV_TVLV_MCAST = 0x06,
+ BATADV_TVLV_GW = 0x01,
+ BATADV_TVLV_DAT = 0x02,
+ BATADV_TVLV_NC = 0x03,
+ BATADV_TVLV_TT = 0x04,
+ BATADV_TVLV_ROAM = 0x05,
+ BATADV_TVLV_MCAST = 0x06,
+ BATADV_TVLV_MCAST_TRACKER = 0x07,
};
#pragma pack(2)
@@ -487,6 +493,25 @@ struct batadv_bcast_packet {
*/
};
+/**
+ * struct batadv_mcast_packet - multicast packet for network payload
+ * @packet_type: batman-adv packet type, part of the general header
+ * @version: batman-adv protocol version, part of the general header
+ * @ttl: time to live for this packet, part of the general header
+ * @reserved: reserved byte for alignment
+ * @tvlv_len: length of the appended tvlv buffer (in bytes)
+ */
+struct batadv_mcast_packet {
+ __u8 packet_type;
+ __u8 version;
+ __u8 ttl;
+ __u8 reserved;
+ __be16 tvlv_len;
+ /* "4 bytes boundary + 2 bytes" long to make the payload after the
+ * following ethernet header again 4 bytes boundary aligned
+ */
+};
+
/**
* struct batadv_coded_packet - network coded packet
* @packet_type: batman-adv packet type, part of the general header
@@ -628,6 +653,14 @@ struct batadv_tvlv_mcast_data {
__u8 reserved[3];
};
+/**
+ * struct batadv_tvlv_mcast_tracker - payload of a multicast tracker tvlv
+ * @num_dests: number of subsequent destination originator MAC addresses
+ */
+struct batadv_tvlv_mcast_tracker {
+ __be16 num_dests;
+};
+
#pragma pack()
#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */
@@ -157,6 +157,8 @@ static void nljson_print_mcastflags(struct nlattr *attrs[], int idx)
val & BATADV_MCAST_WANT_NO_RTR4 ? "true" : "false");
printf("\"want_no_rtr_ipv6\": %s,",
val & BATADV_MCAST_WANT_NO_RTR6 ? "true" : "false");
+ printf("\"have_mc_ptype_capa\": %s,",
+ val & BATADV_MCAST_HAVE_MC_PTYPE_CAPA ? "true" : "false");
printf("\"raw\": %"PRIu32, val);
putchar('}');
}
@@ -80,12 +80,13 @@ static int mcast_flags_callback(struct nl_msg *msg, void *arg)
if (attrs[BATADV_ATTR_MCAST_FLAGS]) {
flags = nla_get_u32(attrs[BATADV_ATTR_MCAST_FLAGS]);
- printf("[%c%c%c%s%s]\n",
+ printf("[%c%c%c%s%s%c]\n",
flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.',
flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.',
flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.',
!(flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ",
- !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ");
+ !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ",
+ !(flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.');
} else {
printf("-\n");
}
@@ -125,7 +126,7 @@ static int netlink_print_mcast_flags(struct state *state, char *orig_iface,
}
ret = asprintf(&header,
- "Multicast flags (own flags: [%c%c%c%s%s])\n"
+ "Multicast flags (own flags: [%c%c%c%s%s%c])\n"
"* Bridged [U]\t\t\t\t%c\n"
"* No IGMP/MLD Querier [4/6]:\t\t%c/%c\n"
"* Shadowing IGMP/MLD Querier [4/6]:\t%c/%c\n"
@@ -136,6 +137,7 @@ static int netlink_print_mcast_flags(struct state *state, char *orig_iface,
(mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.',
!(mcast_flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ",
!(mcast_flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ",
+ !(mcast_flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.',
bridged ? 'U' : '.',
querier4, querier6, shadowing4, shadowing6,
"Originator", "Flags");
@@ -231,12 +231,13 @@ static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len)
flags = tvlv->flags;
- printf("\tTVLV MCASTv2: [%c%c%c%s%s]\n",
+ printf("\tTVLV MCASTv2: [%c%c%c%s%s%c]\n",
flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.',
flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.',
flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.',
!(flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ",
- !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ");
+ !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". ",
+ !(flags & BATADV_MCAST_HAVE_MC_PTYPE_CAPA) ? 'P' : '.');
}
typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len);