The following commit has been merged in the master branch: commit b99ecbbc41bc39ec7de4fc984a283f3907af6e80 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Aug 30 23:45:38 2006 +0200

prevent o-packet loss II

diff --git a/batman.c b/batman.c index cf7653e..63bc137 100755 --- a/batman.c +++ b/batman.c @@ -925,7 +925,7 @@ int batman() orig_neigh_node = update_last_hop( &in, neigh );

/* we are forwarding duplicate o-packets if they come via our best neighbour and ttl is valid */ - if ( ( is_duplicate ) && ( ( orig_node->router == neigh ) || ( orig_node->router == 0 ) ) ) { + if ( ( is_duplicate ) && ( ( orig_neigh_node->router == neigh ) || ( orig_neigh_node->router == 0 ) ) ) {

list_for_each(neigh_pos, &orig_neigh_node->neigh_list) {