The following commit has been merged in the master branch: commit 23ac9bd6b8de78c717f90315d7e6625d41b35e08 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Dec 6 17:33:06 2006 +0100

- fix crash while checking for bidrectional neighbour - flags adjusted

diff --git a/batman.c b/batman.c index fe8f9b1..c349842 100644 --- a/batman.c +++ b/batman.c @@ -1324,11 +1324,11 @@ int batman()

} else {

+ orig_neigh_node = update_last_hop( &in, neigh ); + is_duplicate = isDuplicate( in.orig, in.seqno ); is_bidirectional = isBidirectionalNeigh( orig_neigh_node, if_incoming );

- orig_neigh_node = update_last_hop( &in, neigh ); - /* update ranking */ if ( ( is_bidirectional ) && ( !is_duplicate ) ) update_originator( &in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); diff --git a/batman.h b/batman.h index 5e793de..8b6a9e2 100644 --- a/batman.h +++ b/batman.h @@ -27,8 +27,8 @@ #define VERSION "0.1 rc 6b" #define BATMAN_VERSION 1 #define PORT 1966 -#define UNIDIRECTIONAL 0xF0 -#define DIRECTLINK 0x80 +#define UNIDIRECTIONAL 0x80 +#define DIRECTLINK 0x40 #define ADDR_STR_LEN 16

/*