[batman] code refactoring - merge packet.h & vis-types.h

git-svn-id: http://downloads.open-mesh.org/svn/batman/trunk/batman@1373 45894c77-fb22-0410-b583-ff6e7d5dbf6c

Author: marek

Makefile

@@ -65,7 +65,7 @@ LOG_BRANCH =	trunk/batman
 SRC_FILES = "\(\.c\)\|\(\.h\)\|\(Makefile\)\|\(INSTALL\)\|\(LIESMICH\)\|\(README\)\|\(THANKS\)\|\(TRASH\)\|\(Doxyfile\)\|\(./posix\)\|\(./linux\)\|\(./bsd\)\|\(./man\)\|\(./doc\)"
 
 SRC_C= batman.c originator.c schedule.c list-batman.c allocate.c bitarray.c hash.c profile.c ring_buffer.c hna.c $(OS_C)
-SRC_H= batman.h originator.h schedule.h list-batman.h os.h allocate.h bitarray.h hash.h profile.h packet.h types.h vis-types.h ring_buffer.h hna.h
+SRC_H= batman.h originator.h schedule.h list-batman.h os.h allocate.h bitarray.h hash.h profile.h packet.h types.h ring_buffer.h hna.h
 SRC_O= $(SRC_C:.c=.o)
 
 PACKAGE_NAME =	batmand

batman.h

@@ -38,7 +38,6 @@
 #include "hash.h"
 #include "allocate.h"
 #include "profile.h"
-#include "vis-types.h"
 #include "ring_buffer.h"
 
 #define SOURCE_VERSION "0.4-alpha" /* put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */

packet.h

@@ -20,6 +20,11 @@
  */
 
 #define COMPAT_VERSION 5
+#define VIS_COMPAT_VERSION 23
+
+#define DATA_TYPE_NEIGH 1
+#define DATA_TYPE_SEC_IF 2
+#define DATA_TYPE_HNA 3
 
 #define PORT 4305
 #define GW_PORT 4306
@@ -39,3 +44,16 @@ struct bat_packet
 	uint8_t tq;
 	uint8_t hna_len;
 } __attribute__((packed));
+
+struct vis_packet {
+	uint32_t sender_ip;
+	uint8_t version;
+	uint8_t gw_class;
+	uint8_t tq_max;
+} __attribute__((packed));
+
+struct vis_data {
+	uint8_t type;
+	uint8_t data;
+	uint32_t ip;
+} __attribute__((packed));