The following commit has been merged in the master branch: commit 32d77f747f93b014098d66131358e9514e80362b Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Thu Jan 25 20:57:25 2007 +0100

- become 64bit-compatible - add batman.h to makefile dependency

diff --git a/Makefile b/Makefile index de2aa1e..6d85cd1 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ all: batmand

mips: batmand-mips-static batmand-mips-dynamic

-batmand: batman.o $(OS_OBJ) Makefile +batmand: batman.o $(OS_OBJ) Makefile batman.h $(CC) -o $@ batman.o $(OS_OBJ) $(LDFLAGS)

batmand-mips-static: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile diff --git a/batman.h b/batman.h index 15702bc..0c1dc60 100644 --- a/batman.h +++ b/batman.h @@ -23,6 +23,7 @@ #include <netinet/in.h> #include <pthread.h> #include <sys/un.h> +#include <stdint.h> #include "list.h"

@@ -82,12 +83,12 @@ extern struct debug_clients debug_clients;

struct packet { - unsigned long orig; - unsigned char flags; /* 0xF0: UNIDIRECTIONAL link, 0x80: DIRECTLINK flag, ... */ - unsigned char ttl; - unsigned short seqno; - unsigned char gwflags; /* flags related to gateway functions: gateway class */ - unsigned char version; /* batman version field */ + uint32_t orig; + uint8_t flags; /* 0xF0: UNIDIRECTIONAL link, 0x80: DIRECTLINK flag, ... */ + uint8_t ttl; + uint16_t seqno; + uint8_t gwflags; /* flags related to gateway functions: gateway class */ + uint8_t version; /* batman version field */ } __attribute__((packed));

struct orig_node /* structure for orig_list maintaining nodes of mesh */