batctl: tcpdump - parse TVLV containers

From: Antonio Quartulli <[email protected]>

OGMs and unicast TVLV packets carry TVLV containers as payload.
With this patch such containers are now parsed and the relevant information is printed to screen.

Moreover, the parts of code that have been touched by this patch have also been re-arranged a bit from the style point of view.

---

changes since v2:
- extended doc in README and manpage

changes since v1:
- remove all the style changes
- make tvlv_len of type ssize_t in dump_batman_iv_ogm()

 README       |   1 +
 main.h       |   7 +++
 man/batctl.8 |   3 ++
 tcpdump.c    | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 tcpdump.h    |   1 +
 5 files changed, 177 insertions(+), 5 deletions(-)

index b5fd259..f87c551 100644
@@ -161,6 +161,7 @@ packet types:
                   2 - batman icmp packets
                   4 - batman unicast packets
                   8 - batman broadcast packets
+                 16 - batman unicast tvlv packets
                  32 - batman fragmented packets
                  64 - batman tt / roaming packets
                 128 - non batman packets

index 839c1c7..b16afb6 100644
@@ -49,4 +49,11 @@
 
 extern char module_ver_path[];
 
+#ifndef VLAN_VID_MASK
+#define VLAN_VID_MASK   0xfff
+#endif
+
+#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \
+			       (int)(vid & VLAN_VID_MASK) : -1)
+
 #endif

index 110020e..8d2de19 100644
@@ -288,6 +288,9 @@ except specified). The following packet types are available:
 8 - batman broadcast packets
 .RE
 .RS 16
+16 - batman unicast tvlv packets
+.RE
+.RS 16
 32 - batman fragmented packets
 .RE
 .RS 16

index cfb1c69..5d936f2 100644
@@ -41,6 +41,7 @@
 #define DUMP_TYPE_BATICMP 2
 #define DUMP_TYPE_BATUCAST 4
 #define DUMP_TYPE_BATBCAST 8
+#define DUMP_TYPE_BATUTVLV 16
 #define DUMP_TYPE_BATFRAG 32
 #define DUMP_TYPE_NONBAT 128
 

1.8.5.5