aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2018-05-10 14:28:38 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2018-05-13 16:16:32 +0000
commit4a8957540d69b02a452e33736657978fd933883e (patch)
tree013a8d224f0aa016c60020014b7048bbf4e42cd4
parente6d2f1400928836a42b78158b3ca39cd040e3862 (diff)
batadv: Accept Multicast TVLV v2
The multicast implementation in batman-adv exists in two different versions which are incompatible. But their TVLV format for announcing the feature itself is the same and can be supported by the current dissector. Change-Id: I0e3012375912355e47adbb9d0e4f91fc7510156b Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/27443 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-batadv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index 1e730d0116..c59d5efbdc 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -3982,7 +3982,7 @@ static void dissect_batadv_tvlv_v15_mcast(tvbuff_t *tvb, packet_info *pinfo,
NULL
};
- if (version != 0x01) {
+ if (version != 0x01 && version != 0x02) {
proto_tree_add_expert_format(
tree, pinfo, &ei_batadv_tvlv_unknown_version, tvb,
offset, 0, "Unknown version (0x%02x)", version);