The following commit has been merged in the master branch: commit 34836f930aea88b149c8b4783d98820be025bd62 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Dec 18 14:53:20 2006 +0100

- version confusion ... (see www.open-mesh.net -> batman -> faq)

diff --git a/batman.c b/batman.c index 4d82baf..83e8468 100644 --- a/batman.c +++ b/batman.c @@ -1209,7 +1209,7 @@ int batman() batman_if->out.ttl = ( batman_if->if_num == 0 ? TTL : 2 ); batman_if->out.seqno = 0; batman_if->out.gwflags = gateway_class; - batman_if->out.version = BATMAN_VERSION; + batman_if->out.version = COMPAT_VERSION; batman_if->if_rp_filter_old = get_rp_filter( batman_if->dev ); set_rp_filter( 0 , batman_if->dev ); } @@ -1325,7 +1325,7 @@ int batman() }

- if ( ((struct packet *)&in)->version != BATMAN_VERSION ) { + if ( ((struct packet *)&in)->version != COMPAT_VERSION ) {

if ( debug_level == 4 ) output( "Drop packet: incompatible batman version (%i) \n", ((struct packet *)&in)->version ); diff --git a/batman.h b/batman.h index 11ebe66..7250ad2 100644 --- a/batman.h +++ b/batman.h @@ -24,8 +24,8 @@ #include <pthread.h> #include "list.h"

-#define VERSION "0.11" -#define BATMAN_VERSION 1 +#define SOURCE_VERSION "0.1.1" +#define COMPAT_VERSION 2 #define PORT 1966 #define UNIDIRECTIONAL 0x80 #define DIRECTLINK 0x40 diff --git a/posix.c b/posix.c index 0d91859..00f7118 100644 --- a/posix.c +++ b/posix.c @@ -1040,14 +1040,14 @@ int main(int argc, char *argv[])

case 'v':

- printf( "B.A.T.M.A.N.-III v%s \n", VERSION); + printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); return (0);

case 'V':

print_animation();

- printf( "\x1B[0;0H\t B.A.T.M.A.N.-III v%s", VERSION); + printf( "\x1B[0;0H\t B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); printf( "\x1B[9;0H \t May the bat guide your path ...\n\n\n" );

return (0); @@ -1110,7 +1110,7 @@ int main(int argc, char *argv[])

} else {

- printf( "B.A.T.M.A.N.-III v%s \n", VERSION ); + printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION );

}