1 files changed, 112 insertions, 30 deletions

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index eda99650e9f..b76b4be10b9 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -24,46 +24,84 @@
 
 #define ETH_P_BATMAN  0x4305    /* unofficial/not registered Ethertype */
 
-#define BAT_PACKET       0x01
-#define BAT_ICMP         0x02
-#define BAT_UNICAST      0x03
-#define BAT_BCAST        0x04
-#define BAT_VIS          0x05
-#define BAT_UNICAST_FRAG 0x06
+enum bat_packettype {
+        BAT_PACKET       = 0x01,
+        BAT_ICMP         = 0x02,
+        BAT_UNICAST      = 0x03,
+        BAT_BCAST        = 0x04,
+        BAT_VIS          = 0x05,
+        BAT_UNICAST_FRAG = 0x06,
+        BAT_TT_QUERY     = 0x07,
+        BAT_ROAM_ADV     = 0x08
+};
 
 /* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 12
-#define DIRECTLINK 0x40
-#define VIS_SERVER 0x20
-#define PRIMARIES_FIRST_HOP 0x10
+#define COMPAT_VERSION 14
+
+enum batman_flags {
+        PRIMARIES_FIRST_HOP = 1 << 4,
+        VIS_SERVER          = 1 << 5,
+        DIRECTLINK          = 1 << 6
+};
 
 /* ICMP message types */
-#define ECHO_REPLY 0
-#define DESTINATION_UNREACHABLE 3
-#define ECHO_REQUEST 8
-#define TTL_EXCEEDED 11
-#define PARAMETER_PROBLEM 12
+enum icmp_packettype {
+        ECHO_REPLY              = 0,
+        DESTINATION_UNREACHABLE = 3,
+        ECHO_REQUEST            = 8,
+        TTL_EXCEEDED            = 11,
+        PARAMETER_PROBLEM       = 12
+};
 
 /* vis defines */
-#define VIS_TYPE_SERVER_SYNC            0
-#define VIS_TYPE_CLIENT_UPDATE          1
+enum vis_packettype {
+        VIS_TYPE_SERVER_SYNC   = 0,
+        VIS_TYPE_CLIENT_UPDATE = 1
+};
 
 /* fragmentation defines */
-#define UNI_FRAG_HEAD 0x01
-#define UNI_FRAG_LARGETAIL 0x02
+enum unicast_frag_flags {
+        UNI_FRAG_HEAD      = 1 << 0,
+        UNI_FRAG_LARGETAIL = 1 << 1
+};
+
+/* TT_QUERY subtypes */
+#define TT_QUERY_TYPE_MASK 0x3
+
+enum tt_query_packettype {
+        TT_REQUEST    = 0,
+        TT_RESPONSE   = 1
+};
+
+/* TT_QUERY flags */
+enum tt_query_flags {
+        TT_FULL_TABLE = 1 << 2
+};
+
+/* TT_CLIENT flags.
+ * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to
+ * 1 << 15 are used for local computation only */
+enum tt_client_flags {
+        TT_CLIENT_DEL     = 1 << 0,
+        TT_CLIENT_ROAM    = 1 << 1,
+        TT_CLIENT_NOPURGE = 1 << 8,
+        TT_CLIENT_NEW     = 1 << 9,
+        TT_CLIENT_PENDING = 1 << 10
+};
 
 struct batman_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
-        uint8_t  tq;
         uint32_t seqno;
         uint8_t  orig[6];
         uint8_t  prev_sender[6];
-        uint8_t  ttl;
-        uint8_t  num_tt;
         uint8_t  gw_flags;  /* flags related to gateway class */
-        uint8_t  align;
+        uint8_t  tq;
+        uint8_t  tt_num_changes;
+        uint8_t  ttvn; /* translation table version number */
+        uint16_t tt_crc;
 } __packed;
 
 #define BAT_PACKET_LEN sizeof(struct batman_packet)
@@ -71,12 +109,13 @@ struct batman_packet {
 struct icmp_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
-        uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  ttl;
+        uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[6];
         uint8_t  orig[6];
         uint16_t seqno;
         uint8_t  uid;
+        uint8_t  reserved;
 } __packed;
 
 #define BAT_RR_LEN 16
@@ -86,8 +125,8 @@ struct icmp_packet {
 struct icmp_packet_rr {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
-        uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  ttl;
+        uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[6];
         uint8_t  orig[6];
         uint16_t seqno;
@@ -99,16 +138,19 @@ struct icmp_packet_rr {
 struct unicast_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
-        uint8_t  dest[6];
         uint8_t  ttl;
+        uint8_t  ttvn; /* destination translation table version number */
+        uint8_t  dest[6];
 } __packed;
 
 struct unicast_frag_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
-        uint8_t  dest[6];
         uint8_t  ttl;
+        uint8_t  ttvn; /* destination translation table version number */
+        uint8_t  dest[6];
         uint8_t  flags;
+        uint8_t  align;
         uint8_t  orig[6];
         uint16_t seqno;
 } __packed;
@@ -116,21 +158,61 @@ struct unicast_frag_packet {
 struct bcast_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
-        uint8_t  orig[6];
         uint8_t  ttl;
+        uint8_t  reserved;
         uint32_t seqno;
+        uint8_t  orig[6];
 } __packed;
 
 struct vis_packet {
         uint8_t  packet_type;
         uint8_t  version;        /* batman version field */
+        uint8_t  ttl;            /* TTL */
         uint8_t  vis_type;       /* which type of vis-participant sent this? */
-        uint8_t  entries;        /* number of entries behind this struct */
         uint32_t seqno;          /* sequence number */
-        uint8_t  ttl;            /* TTL */
+        uint8_t  entries;        /* number of entries behind this struct */
+        uint8_t  reserved;
         uint8_t  vis_orig[6];    /* originator that announces its neighbors */
         uint8_t  target_orig[6]; /* who should receive this packet */
         uint8_t  sender_orig[6]; /* who sent or rebroadcasted this packet */
 } __packed;
 
+struct tt_query_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
+        /* the flag field is a combination of:
+         * - TT_REQUEST or TT_RESPONSE
+         * - TT_FULL_TABLE */
+        uint8_t  flags;
+        uint8_t  dst[ETH_ALEN];
+        uint8_t  src[ETH_ALEN];
+        /* the ttvn field is:
+         * if TT_REQUEST: ttvn that triggered the
+         *                request
+         * if TT_RESPONSE: new ttvn for the src
+         *                 orig_node */
+        uint8_t  ttvn;
+        /* tt_data field is:
+         * if TT_REQUEST: crc associated with the
+         *                ttvn
+         * if TT_RESPONSE: table_size */
+        uint16_t tt_data;
+} __packed;
+
+struct roam_adv_packet {
+        uint8_t  packet_type;
+        uint8_t  version;
+        uint8_t  ttl;
+        uint8_t  reserved;
+        uint8_t  dst[ETH_ALEN];
+        uint8_t  src[ETH_ALEN];
+        uint8_t  client[ETH_ALEN];
+} __packed;
+
+struct tt_change {
+        uint8_t flags;
+        uint8_t addr[ETH_ALEN];
+} __packed;
+
 #endif /* _NET_BATMAN_ADV_PACKET_H_ */