commits December 2010

commits@lists.open-mesh.org

1 participants
226 discussions

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit eafa45d3a791013f6e748e57a98c2bd5bd1b2f06 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 22 18:11:49 2006 +0100 - daemon improved diff --git a/batman.c b/batman.c index 3de9484..f7cd59a 100755 --- a/batman.c +++ b/batman.c @@ -1248,6 +1248,9 @@ int batman() if ( isBidirectionalNeigh( orig_neigh_node ) ) output("received via bidirectional link \n"); + if ( !( in.flags & UNIDIRECTIONAL ) && !( isBidirectionalNeigh( orig_neigh_node ) ) ) + output("neighbour thinks connection is bidirectional - I disagree \n"); + if ( in.gwflags != 0 ) output("Is an internet gateway (class %i) \n", in.gwflags); diff --git a/posix.c b/posix.c index 33d2631..0c4b2fa 100644 --- a/posix.c +++ b/posix.c @@ -792,7 +792,7 @@ int main(int argc, char *argv[]) struct hna_node *hna_node; struct ifreq int_req; struct timespec sleep_time = { 0, 250 * 1000 * 1000 }; /* 500 mili seconds */ - int on = 1, res, optchar, found_args = 1, pid, netmask; + int on = 1, res, optchar, found_args = 1, netmask; char str1[16], str2[16], *dev, *slash_ptr; unsigned int vis_server = 0; @@ -1038,7 +1038,9 @@ int main(int argc, char *argv[]) } - } else if ( debug_level > 0 ) { + openlog( "batmand", LOG_PID, LOG_DAEMON ); + + } else { printf( "B.A.T.M.A.N-III v%s (internal version %i)\n", VERSION, BATMAN_VERSION ); @@ -1201,8 +1203,7 @@ int main(int argc, char *argv[]) memset(&vis_if, 0, sizeof(vis_if)); - if ( found_ifs == 0 ) - { + if ( found_ifs == 0 ) { do_log( "Error - no interface specified\n", strerror(errno) ); usage(); close_all_sockets(); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 70c1e384d1524b00d866aa8c8ae577b0013ccb88 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 21 00:36:56 2006 +0100 on the way to rc5 diff --git a/batman.h b/batman.h index 3542f9a..66ea1f7 100755 --- a/batman.h +++ b/batman.h @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1 rc4" +#define VERSION "0.1 rc5" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0xF0 diff --git a/posix.c b/posix.c index 6f5c246..33d2631 100644 --- a/posix.c +++ b/posix.c @@ -389,7 +389,7 @@ void *alloc_memory(int len) if (res == NULL) { do_log( "Error - out of memory: %s\n", strerror(errno) ); - exit(1); + exit(EXIT_FAILURE); } return res; @@ -403,7 +403,7 @@ void *realloc_memory(void *ptr, int len) if (res == NULL) { do_log( "Error - out of memory: %s\n", strerror(errno) ); - exit(1); + exit(EXIT_FAILURE); } return res; @@ -791,6 +791,7 @@ int main(int argc, char *argv[]) struct batman_if *batman_if; struct hna_node *hna_node; struct ifreq int_req; + struct timespec sleep_time = { 0, 250 * 1000 * 1000 }; /* 500 mili seconds */ int on = 1, res, optchar, found_args = 1, pid, netmask; char str1[16], str2[16], *dev, *slash_ptr; unsigned int vis_server = 0; @@ -827,14 +828,14 @@ int main(int argc, char *argv[]) if ( (errno == ERANGE && (netmask == LONG_MAX || netmask == LONG_MIN) ) || (errno != 0 && netmask == 0) ) { perror("strtol"); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } if ( netmask < 0 || netmask > 32 ) { *slash_ptr = '/'; printf( "Invalid announced network (netmask is invalid): %s\n", optarg ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } @@ -847,6 +848,7 @@ int main(int argc, char *argv[]) list_add_tail(&hna_node->list, &hna_list); + *slash_ptr = '/'; found_args += 2; break; @@ -856,13 +858,13 @@ int main(int argc, char *argv[]) debug_level = strtol (optarg, NULL , 10); if ( (errno == ERANGE && (debug_level == LONG_MAX || debug_level == LONG_MIN) ) || (errno != 0 && debug_level == 0) ) { - perror("strtol"); - exit(EXIT_FAILURE); + perror("strtol"); + exit(EXIT_FAILURE); } if ( debug_level < 0 || debug_level > 4 ) { - printf( "Invalid debug level: %i\nDebug level has to be between 0 and 4.\n", debug_level ); - exit(EXIT_FAILURE); + printf( "Invalid debug level: %i\nDebug level has to be between 0 and 4.\n", debug_level ); + exit(EXIT_FAILURE); } found_args += 2; @@ -875,12 +877,12 @@ int main(int argc, char *argv[]) if ( (errno == ERANGE && (gateway_class == LONG_MAX || gateway_class == LONG_MIN) ) || (errno != 0 && gateway_class == 0) ) { perror("strtol"); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } if ( gateway_class < 0 || gateway_class > 11 ) { printf( "Invalid gateway class specified: %i.\nThe class is a value between 0 and 11.\n", gateway_class ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } found_args += 2; @@ -897,12 +899,12 @@ int main(int argc, char *argv[]) if ( (errno == ERANGE && (orginator_interval == LONG_MAX || orginator_interval == LONG_MIN) ) || (errno != 0 && orginator_interval == 0) ) { perror("strtol"); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } if (orginator_interval < 1) { printf( "Invalid orginator interval specified: %i.\nThe Interval has to be greater than 0.\n", orginator_interval ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } found_args += 2; @@ -914,7 +916,7 @@ int main(int argc, char *argv[]) if ( inet_pton(AF_INET, optarg, &tmp_ip_holder) < 1 ) { printf( "Invalid preferred gateway IP specified: %s\n", optarg ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } @@ -930,12 +932,12 @@ int main(int argc, char *argv[]) if ( (errno == ERANGE && (routing_class == LONG_MAX || routing_class == LONG_MIN) ) || (errno != 0 && routing_class == 0) ) { perror("strtol"); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } if (routing_class < 0 || routing_class > 3) { printf( "Invalid routing class specified: %i.\nThe class is a value between 0 and 3.\n", routing_class ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } found_args += 2; @@ -947,7 +949,7 @@ int main(int argc, char *argv[]) if ( inet_pton(AF_INET, optarg, &tmp_ip_holder) < 1 ) { printf( "Invalid preferred visualation server IP specified: %s\n", optarg ); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } @@ -958,12 +960,34 @@ int main(int argc, char *argv[]) break; case 'V': + res = 3; + + while( res > 0 ) { + + system( "clear" ); + printf( "\n\n ____________ ____________\n / /|\\` ´/|\\ \\ \n \\ ^..^ / \n \\vv/ \n \\/ \n" ); + nanosleep( &sleep_time, NULL ); + + system( "clear" ); + printf( "\n\n ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); + nanosleep( &sleep_time, NULL ); + + system( "clear" ); + printf( "\n\n\n /\\` ´\\ \n / \\__^..^__/ \\ \n / / _\\vv/ _\\ \\ \n / \\/ \\ \n / \\ \n\n" ); + nanosleep( &sleep_time, NULL ); + + system( "clear" ); + printf( "\n\n ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); + nanosleep( &sleep_time, NULL ); + + res--; + + } + + system( "clear" ); + printf( "B.A.T.M.A.N-III v%s (internal version %i)\n\n", VERSION, BATMAN_VERSION ); - printf( " ____________ ____________\n" ); - printf( " /` ´\\ \n" ); - printf( " / _ \\__^..^__/ _ \\ \n" ); - printf( " _\\vv/ _\n" ); - printf( " \\/ \n\n" ); + printf( " ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); printf( "May the bat guide your path ...\n" ); return (0); @@ -976,24 +1000,21 @@ int main(int argc, char *argv[]) } - if ( ( gateway_class != 0 ) && ( routing_class != 0 ) ) - { + if ( ( gateway_class != 0 ) && ( routing_class != 0 ) ) { fprintf(stderr, "Error - routing class can't be set while gateway class is in use !\n"); usage(); close_all_sockets(); exit(EXIT_FAILURE); } - if ( ( gateway_class != 0 ) && ( pref_gateway != 0 ) ) - { + if ( ( gateway_class != 0 ) && ( pref_gateway != 0 ) ) { fprintf(stderr, "Error - preferred gateway can't be set while gateway class is in use !\n"); usage(); close_all_sockets(); exit(EXIT_FAILURE); } - if ( ( routing_class == 0 ) && ( pref_gateway != 0 ) ) - { + if ( ( routing_class == 0 ) && ( pref_gateway != 0 ) ) { fprintf(stderr, "Error - preferred gateway can't be set without specifying routing class !\n"); usage(); close_all_sockets(); @@ -1002,65 +1023,21 @@ int main(int argc, char *argv[]) if ( ( ( routing_class != 0 ) || ( gateway_class != 0 ) ) && ( !probe_tun() ) ) { close_all_sockets(); - exit( EXIT_FAILURE ); + exit( 1 ); } /* daemonize */ if ( debug_level == 0 ) { - switch( pid = fork() ) { + if ( daemon( 0, 0 ) < 0 ) { - case -1: /* error */ - printf( "Error - can't fork to background: %s\n", strerror(errno) ); - close_all_sockets(); - exit(EXIT_FAILURE); - break; - - case 0: /* child process - new daemon */ - break; - - case 1: /* parent process */ - exit( EXIT_SUCCESS ); - break; - - } - - if ( setsid() < 0 ) { - - do_log( "Error - can't create new session: %s\n", strerror(errno) ); + printf( "Error - can't fork to background: %s\n", strerror(errno) ); close_all_sockets(); - exit( EXIT_FAILURE ); - - } - - /* fork again for openwrt */ - switch( pid = fork() ) { - - case -1: /* error */ - printf( "Error - can't fork to background: %s\n", strerror(errno) ); - close_all_sockets(); - exit(EXIT_FAILURE); - break; - - case 0: /* child process - new daemon */ - openlog( "batmand", LOG_PID, LOG_DAEMON ); - break; - - case 1: /* parent process */ - exit( EXIT_SUCCESS ); - break; + exit(EXIT_FAILURE); } - close( STDIN_FILENO ); - close( STDOUT_FILENO ); - close( STDERR_FILENO ); - - chdir( "/" ); - - umask( 0 ); - } else if ( debug_level > 0 ) { printf( "B.A.T.M.A.N-III v%s (internal version %i)\n", VERSION, BATMAN_VERSION ); @@ -1136,7 +1113,7 @@ int main(int argc, char *argv[]) { do_log( "Error - can't bind send socket: %s\n", strerror(errno) ); close_all_sockets(); - exit(EXIT_FAILURE); + exit(EXIT_FAILURE); } if ( bind_to_iface( batman_if->udp_recv_sock, batman_if->dev ) < 0 ) { -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 88513fc448571669fc73d0fb0d30b1a77760106d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 7 19:23:13 2006 +0100 debug fixes diff --git a/batman.c b/batman.c index 6262e03..9f259be 100755 --- a/batman.c +++ b/batman.c @@ -488,9 +488,9 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla } - if (debug_level == 3) { + if ( debug_level == 3 ) { addr_to_string( orig_node->orig, orig_str, ADDR_STR_LEN ); - printf( "Found new gateway %s (class: %i)\n", orig_str, new_gwflags ); + printf( "Found new gateway %s -> class: %i - %s\n", orig_str, new_gwflags, gw2string[new_gwflags] ); } gw_node = alloc_memory(sizeof(struct gw_node)); @@ -517,12 +517,14 @@ static void debug() { struct neigh_node *neigh_node; struct pack_node *pack_node; struct gw_node *gw_node; + unsigned int batman_count = 0; static char str[ADDR_STR_LEN], str2[ADDR_STR_LEN]; if ( ( debug_level == 0 ) || ( debug_level == 3 ) ) return; - system( "clear" ); + if ( debug_level != 4 ) + system( "clear" ); if ( debug_level == 2 ) { @@ -569,9 +571,9 @@ static void debug() { if ( list_empty(&orig_list) ) { if ( debug_level != 4 ) { - printf( "No gateways in range ...\n" ); + printf( "No batman nodes in range ...\n" ); } else { - output( "No gateways in range ...\n" ); + output( "No batman nodes in range ...\n" ); } } else { @@ -582,6 +584,8 @@ static void debug() { if ( orig_node->router == 0 ) continue; + batman_count++; + addr_to_string( orig_node->orig, str, sizeof (str) ); addr_to_string( orig_node->router, str2, sizeof (str2) ); @@ -619,6 +623,16 @@ static void debug() { } + if ( batman_count == 0 ) { + + if ( debug_level != 4 ) { + printf( "No batman nodes in range ...\n" ); + } else { + output( "No batman nodes in range ...\n" ); + } + + } + } if ( debug_level == 4 ) -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 58a3030a35f49b50b42ebb6c233b83aec21a0d42 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 15 00:54:52 2006 +0100 on the way to rc4 diff --git a/batman.c b/batman.c index 9f259be..86e8a58 100755 --- a/batman.c +++ b/batman.c @@ -520,6 +520,7 @@ static void debug() { unsigned int batman_count = 0; static char str[ADDR_STR_LEN], str2[ADDR_STR_LEN]; + if ( ( debug_level == 0 ) || ( debug_level == 3 ) ) return; @@ -554,8 +555,8 @@ static void debug() { if ( debug_level == 4 ) { - output("------------------ DEBUG ------------------\n"); - output("Forward list\n"); + output( "------------------ DEBUG ------------------\n" ); + output( "Forward list\n" ); list_for_each(forw_pos, &forw_list) { forw_node = list_entry(forw_pos, struct forw_node, list); @@ -563,80 +564,67 @@ static void debug() { output(" %s at %u\n", str, forw_node->when); } + output( "Originator list\n" ); + } - if ( debug_level == 4 ) - output("Originator list\n"); + list_for_each(orig_pos, &orig_list) { + orig_node = list_entry(orig_pos, struct orig_node, list); + + if ( orig_node->router == 0 ) + continue; - if ( list_empty(&orig_list) ) { + batman_count++; + + addr_to_string( orig_node->orig, str, sizeof (str) ); + addr_to_string( orig_node->router, str2, sizeof (str2) ); if ( debug_level != 4 ) { - printf( "No batman nodes in range ...\n" ); + printf( "%s, GW: %s(%i) via:", str, str2, orig_node->packet_count ); } else { - output( "No batman nodes in range ...\n" ); + output( "%s, GW: %s(%i), last_aware:%u, last_reply:%u, last_seen:%u via:\n", str, str2, orig_node->packet_count, orig_node->last_aware, orig_node->last_reply, orig_node->last_seen ); } - } else { - - list_for_each(orig_pos, &orig_list) { - orig_node = list_entry(orig_pos, struct orig_node, list); - - if ( orig_node->router == 0 ) - continue; - - batman_count++; + list_for_each(neigh_pos, &orig_node->neigh_list) { + neigh_node = list_entry(neigh_pos, struct neigh_node, list); - addr_to_string( orig_node->orig, str, sizeof (str) ); - addr_to_string( orig_node->router, str2, sizeof (str2) ); + addr_to_string(neigh_node->addr, str, sizeof (str)); if ( debug_level != 4 ) { - printf( "%s, GW: %s(%i) via:", str, str2, orig_node->packet_count ); + printf( " %s(%i)", str, neigh_node->packet_count ); } else { - output("%s, GW: %s(%i), last_aware:%u, last_reply:%u, last_seen:%u via:\n", str, str2, orig_node->packet_count, orig_node->last_aware, orig_node->last_reply, orig_node->last_seen); + output( "\t\t%s (%d)\n", str, neigh_node->packet_count ); } - list_for_each(neigh_pos, &orig_node->neigh_list) { - neigh_node = list_entry(neigh_pos, struct neigh_node, list); - - addr_to_string(neigh_node->addr, str, sizeof (str)); - - if ( debug_level != 4 ) { - printf( " %s(%i)", str, neigh_node->packet_count ); - } else { - output( "\t\t%s (%d)\n", str, neigh_node->packet_count ); - } - - if ( debug_level == 4 ) { - - list_for_each(pack_pos, &neigh_node->pack_list) { - pack_node = list_entry(pack_pos, struct pack_node, list); - output(" Sequence number: %d, TTL: %d at: %u \n", - pack_node->seqno, pack_node->ttl, pack_node->time); - } + if ( debug_level == 4 ) { + list_for_each(pack_pos, &neigh_node->pack_list) { + pack_node = list_entry(pack_pos, struct pack_node, list); + output(" Sequence number: %d, TTL: %d at: %u \n", + pack_node->seqno, pack_node->ttl, pack_node->time); } } - if ( debug_level != 4 ) - printf( "\n" ); - } - if ( batman_count == 0 ) { + if ( debug_level != 4 ) + printf( "\n" ); - if ( debug_level != 4 ) { - printf( "No batman nodes in range ...\n" ); - } else { - output( "No batman nodes in range ...\n" ); - } + } + if ( batman_count == 0 ) { + + if ( debug_level != 4 ) { + printf( "No batman nodes in range ...\n" ); + } else { + output( "No batman nodes in range ...\n" ); } } if ( debug_level == 4 ) - output("---------------------------------------------- END DEBUG\n"); + output( "---------------------------------------------- END DEBUG\n" ); } diff --git a/batman.h b/batman.h index fe6dbbd..3542f9a 100755 --- a/batman.h +++ b/batman.h @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1" +#define VERSION "0.1 rc4" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0xF0 diff --git a/posix.c b/posix.c index fde3c28..ac597a2 100644 --- a/posix.c +++ b/posix.c @@ -565,7 +565,8 @@ void *gw_listen( void *arg ) { socklen_t sin_size = sizeof(struct sockaddr_in); char gw_addr[16], str2[16], tun_dev[IFNAMSIZ], tun_ip[] = "104.255.255.254\0"; int res, status, max_sock_min, max_sock, buff_len, tun_fd; - unsigned int addr_len, client_timeout, buff[1500]; + unsigned int addr_len, client_timeout; + unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -673,9 +674,9 @@ void *gw_listen( void *arg ) { /* client sent keep alive */ } else { - list_for_each_safe(client_pos, client_pos_tmp, &batman_if->client_list) { + max_sock = max_sock_min; - max_sock = max_sock_min; + list_for_each_safe(client_pos, client_pos_tmp, &batman_if->client_list) { gw_client = list_entry(client_pos, struct gw_client, list); @@ -798,7 +799,7 @@ int main(int argc, char *argv[]) dev = NULL; memset(&tmp_ip_holder, 0, sizeof (struct in_addr)); - while ( ( optchar = getopt ( argc, argv, "a:d:hHo:g:p:r:s:" ) ) != -1 ) { + while ( ( optchar = getopt ( argc, argv, "a:d:hHo:g:p:r:s:V" ) ) != -1 ) { switch ( optchar ) { @@ -956,6 +957,16 @@ int main(int argc, char *argv[]) found_args += 2; break; + case 'V': + printf( "B.A.T.M.A.N-III v%s (internal version %i)\n\n", VERSION, BATMAN_VERSION ); + printf( " ____________ ____________\n" ); + printf( " /` ´\\ \n" ); + printf( " / _ \\__^..^__/ _ \\ \n" ); + printf( " _\\vv/ _\n" ); + printf( " \\/ \n\n" ); + printf( "May the bat guide your paths ...\n" ); + return (0); + case 'h': default: usage(); @@ -1240,6 +1251,11 @@ int main(int argc, char *argv[]) printf( "preferred gateway: %s\n", str1 ); } + if ( vis_server > 0 ) { + addr_to_string(vis_server, str1, sizeof (str1)); + printf( "visualisation server: %s\n", str1 ); + } + } -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit ef66a3d0f077be93065c7bde289d5ca13ad6dc22 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 15 01:25:59 2006 +0100 fix multiple interface announcement diff --git a/batman.c b/batman.c index 86e8a58..896a536 100755 --- a/batman.c +++ b/batman.c @@ -767,7 +767,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if void schedule_forward_packet( struct packet *in, int unidirectional, struct orig_node *orig_node, unsigned int neigh, unsigned char *hna_recv_buff, int hna_buff_len ) { - struct forw_node *forw_node, *forw_node_new; + struct forw_node *forw_node = NULL, *forw_node_new; struct list_head *forw_pos; if (debug_level == 4) @@ -817,8 +817,10 @@ void schedule_forward_packet( struct packet *in, int unidirectional, struct orig break; } - list_add(&forw_node_new->list, &forw_list); + list_add( &forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos) ); + } + } void send_outstanding_packets() @@ -851,7 +853,7 @@ void send_outstanding_packets() } - if (debug_level == 4) { + if ( debug_level == 4 ) { addr_to_string(forw_node->pack.orig, orig_str, ADDR_STR_LEN); output("Forwarding packet (originator %s, seqno %d, TTL %d)\n", orig_str, forw_node->pack.seqno, forw_node->pack.ttl); } @@ -875,7 +877,9 @@ void send_outstanding_packets() free_memory(forw_node); } + } + } void schedule_own_packet() { @@ -923,7 +927,7 @@ void schedule_own_packet() { forw_node_new->when = next_own; - list_add(&forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos)); + list_add( &forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos) ); next_own += orginator_interval; batman_if->out.seqno++; @@ -1133,6 +1137,7 @@ int batman() output(" \n \n"); schedule_own_packet(); + if(vis_if.sock && time_count == 50) { time_count = 0; -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 5d6779d018a9946e18500cdb5fd2d2d958b21e3d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 15 01:54:27 2006 +0100 fix packet count after purge diff --git a/batman.c b/batman.c index 896a536..3de9484 100755 --- a/batman.c +++ b/batman.c @@ -929,11 +929,12 @@ void schedule_own_packet() { list_add( &forw_node_new->list, (forw_node == NULL ? &forw_list : forw_pos) ); - next_own += orginator_interval; batman_if->out.seqno++; } + next_own += orginator_interval; + } } @@ -945,7 +946,7 @@ void purge() struct neigh_node *neigh_node; struct pack_node *pack_node; struct gw_node *gw_node; - int gw_purged = 0; + int gw_purged = 0, purged_packets; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; if (debug_level == 4) @@ -955,6 +956,8 @@ void purge() list_for_each_safe(orig_pos, orig_temp, &orig_list) { orig_node = list_entry(orig_pos, struct orig_node, list); + purged_packets = 0; + /* for all neighbours towards the origins... */ list_for_each_safe(neigh_pos, neigh_temp, &orig_node->neigh_list) { neigh_node = list_entry(neigh_pos, struct neigh_node, list); @@ -972,14 +975,18 @@ void purge() output("Packet timeout (originator %s, neighbour %s, seqno %d, TTL %d, time %u)\n", orig_str, neigh_str, pack_node->seqno, pack_node->ttl, pack_node->time); } + + purged_packets++; list_del(pack_pos); free_memory(pack_node); + } else { /* if this packet is not outdated the following packets won't be either */ break; } + } /* if no more packets, remove neighbour (next hop) towards given origin */ @@ -996,6 +1003,7 @@ void purge() /* if no more neighbours (next hops) towards given origin, remove origin */ if (list_empty(&orig_node->neigh_list) && ((int)(orig_node->last_aware) + TIMEOUT <= ((int)(get_time())))) { + if (debug_level == 4) { addr_to_string(orig_node->orig, orig_str, sizeof (orig_str)); output("Removing orphaned originator %s\n", orig_str); @@ -1042,7 +1050,14 @@ void purge() free_memory(orig_node); } + + } else if ( purged_packets > 0 ) { + + /* update packet count of orginator */ + update_routes( orig_node, orig_node->hna_buff, orig_node->hna_buff_len ); + } + } if ( gw_purged ) -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 62688fe959336d17297023dfa094f149f4110108 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 15 17:18:46 2006 +0100 fix typo diff --git a/posix.c b/posix.c index ac597a2..6f5c246 100644 --- a/posix.c +++ b/posix.c @@ -964,7 +964,7 @@ int main(int argc, char *argv[]) printf( " / _ \\__^..^__/ _ \\ \n" ); printf( " _\\vv/ _\n" ); printf( " \\/ \n\n" ); - printf( "May the bat guide your paths ...\n" ); + printf( "May the bat guide your path ...\n" ); return (0); case 'h': @@ -1125,14 +1125,14 @@ int main(int argc, char *argv[]) batman_if->broad.sin_port = htons(PORT); batman_if->broad.sin_addr.s_addr = ((struct sockaddr_in *)&int_req.ifr_broadaddr)->sin_addr.s_addr; - if (setsockopt(batman_if->udp_send_sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (int)) < 0) + if ( setsockopt( batman_if->udp_send_sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (int) ) < 0 ) { do_log( "Error - can't enable broadcasts: %s\n", strerror(errno) ); close_all_sockets(); exit(EXIT_FAILURE); } - if (bind(batman_if->udp_send_sock, (struct sockaddr *)&batman_if->addr, sizeof (struct sockaddr_in)) < 0) + if ( bind( batman_if->udp_send_sock, (struct sockaddr *)&batman_if->addr, sizeof (struct sockaddr_in) ) < 0 ) { do_log( "Error - can't bind send socket: %s\n", strerror(errno) ); close_all_sockets(); @@ -1146,7 +1146,7 @@ int main(int argc, char *argv[]) } - if (bind(batman_if->udp_recv_sock, (struct sockaddr *)&batman_if->broad, sizeof (struct sockaddr_in)) < 0) + if ( bind( batman_if->udp_recv_sock, (struct sockaddr *)&batman_if->broad, sizeof (struct sockaddr_in) ) < 0 ) { do_log( "Error - can't bind receive socket: %s\n", strerror(errno) ); close_all_sockets(); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 0037c3ae2c0cc756d70d4a4a84e2b257e06709b9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 6 21:32:22 2006 +0100 check for running firewall diff --git a/posix.c b/posix.c index 7620832..fde3c28 100644 --- a/posix.c +++ b/posix.c @@ -526,12 +526,14 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha int send_packet(unsigned char *buff, int len, struct sockaddr_in *broad, int sock) { - if (sendto(sock, buff, len, 0, (struct sockaddr *)broad, sizeof (struct sockaddr_in)) < 0) - { + char log_str[200]; + + if ( sendto( sock, buff, len, 0, (struct sockaddr *)broad, sizeof (struct sockaddr_in) ) < 0 ) { if ( errno == 1 ) { - do_log( "Error - can't send packet: %s.\nDoes your Firewall allow outgoing UDP packets on port 1966 ?\n", strerror(errno) ); + snprintf( log_str, sizeof( log_str ), "Error - can't send packet: %s.\nDoes your firewall allow outgoing packets on port %i ?\n", strerror(errno), ntohs(broad->sin_port ) ); + do_log( log_str, strerror(errno) ); } else { -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit c16a85ffa93668db4bdb9897d45575536f698b08 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 6 20:37:30 2006 +0100 - memory leaks removed ;-) diff --git a/batman.c b/batman.c index f75e3d8..6262e03 100755 --- a/batman.c +++ b/batman.c @@ -53,6 +53,19 @@ int debug_level = 0; * this option is used to determine packet path */ +char *gw2string[] = { "No Gateway", + "56 KBit (e.g. Modem)", + "64 KBit (e.g. ISDN)", + "128 KBit (e.g. double ISDN)", + "256 KBit", + "512 KBit (e.g. UMTS)", + "1 MBit", + "2 MBit", + "3 MBit", + "5 MBit", + "6 MBit", + ">6 MBit" }; + int gateway_class = 0; /* "-r" is the command line switch for the routing class, @@ -109,7 +122,11 @@ void verbose_usage(void) fprintf(stderr, " -a announce network(s)\n" ); fprintf(stderr, " network/netmask is expected\n" ); fprintf(stderr, " -d debug level\n" ); - fprintf(stderr, " default: 0, allowed values: 0 - 3\n\n" ); + fprintf(stderr, " default: 0 -> debug disabled\n" ); + fprintf(stderr, " allowed values: 1 -> list neighbours\n" ); + fprintf(stderr, " 2 -> list gateways\n" ); + fprintf(stderr, " 3 -> observe batman\n" ); + fprintf(stderr, " 4 -> observe batman (very verbose)\n\n" ); fprintf(stderr, " -g gateway class\n" ); fprintf(stderr, " default: 0 -> this is not an internet gateway\n" ); fprintf(stderr, " allowed values: 1 -> modem line\n" ); @@ -151,7 +168,7 @@ struct orig_node *get_orig_node( unsigned int addr ) return orig_node; } - if (debug_level == 3) + if (debug_level == 4) output("Creating new originator\n"); orig_node = alloc_memory(sizeof(struct orig_node)); @@ -214,7 +231,7 @@ static void choose_gw() if ( curr_gateway != NULL ) { - if (debug_level == 1) + if (debug_level == 3) printf( "Removing default route - no gateway in range\n" ); del_default_route(); @@ -267,7 +284,7 @@ static void choose_gw() tmp_curr_gw = gw_node; - if (debug_level == 1) { + if (debug_level == 3) { addr_to_string( tmp_curr_gw->orig_node->orig, orig_str, ADDR_STR_LEN ); printf( "Preferred gateway found: %s (%i,%i,%i)\n", orig_str, gw_node->orig_node->gwflags, gw_node->orig_node->packet_count, ( gw_node->orig_node->packet_count * gw_node->orig_node->gwflags ) ); } @@ -283,7 +300,7 @@ static void choose_gw() if ( curr_gateway != NULL ) { - if (debug_level == 1) + if (debug_level == 3) printf( "Removing default route - better gateway found\n" ); del_default_route(); @@ -295,7 +312,7 @@ static void choose_gw() /* may be the last gateway is now gone */ if ( ( curr_gateway != NULL ) && ( !is_aborted() ) ) { - if (debug_level == 1) { + if (debug_level == 3) { addr_to_string( curr_gateway->orig_node->orig, orig_str, ADDR_STR_LEN ); printf( "Adding default route to %s (%i,%i,%i)\n", orig_str, max_gw_class, max_packets, max_gw_factor ); } @@ -320,7 +337,7 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ int max_pack, max_ttl, neigh_ttl[found_ifs], neigh_pkts[found_ifs]; static char orig_str[ADDR_STR_LEN], next_str[ADDR_STR_LEN]; - if (debug_level == 3) + if (debug_level == 4) output("update_routes() \n"); max_ttl = 0; @@ -345,21 +362,23 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ if ( neigh_pkts[pack_node->if_incoming->if_num] > neigh_pkts[max_if->if_num] ) max_if = pack_node->if_incoming; } - /* if received most orig_packets via this neighbour (or ) then + neigh_node->packet_count = neigh_pkts[max_if->if_num]; + + /* if received most orig_packets via this neighbour (or better ttl) then select this neighbour as next hop for this origin */ if ((neigh_pkts[max_if->if_num] > max_pack) || ((neigh_pkts[max_if->if_num] == max_pack) && (neigh_ttl[max_if->if_num] > max_ttl))) { max_pack = neigh_pkts[max_if->if_num]; max_ttl = neigh_ttl[max_if->if_num]; next_hop = neigh_node; - if (debug_level == 3) + if (debug_level == 4) output("%d living received packets via selected router \n", neigh_pkts[max_if->if_num] ); } } if ( next_hop != NULL ) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(orig_node->orig, orig_str, ADDR_STR_LEN); addr_to_string(next_hop->addr, next_str, ADDR_STR_LEN); output("Route to %s via %s\n", orig_str, next_str); @@ -369,12 +388,12 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ if (orig_node->router != next_hop->addr) { - if (debug_level == 3) + if (debug_level == 4) output("Route changed\n"); if (orig_node->router != 0) { - if (debug_level == 3) + if (debug_level == 4) output("Deleting previous route\n"); /* remove old announced network(s) */ @@ -385,7 +404,7 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ } - if (debug_level == 3) + if (debug_level == 4) output("Adding new route\n"); @@ -441,7 +460,7 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla if ( gw_node->orig_node == orig_node ) { - if (debug_level == 1) { + if (debug_level == 3) { addr_to_string( gw_node->orig_node->orig, orig_str, ADDR_STR_LEN ); printf( "Gateway class of originator %s changed from %i to %i\n", orig_str, gw_node->orig_node->gwflags, new_gwflags ); @@ -453,7 +472,7 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla list_del(gw_pos); free_memory(gw_pos); - if (debug_level == 1) + if (debug_level == 3) printf( "Gateway %s removed from gateway list\n", orig_str ); } else { @@ -469,7 +488,7 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla } - if (debug_level == 1) { + if (debug_level == 3) { addr_to_string( orig_node->orig, orig_str, ADDR_STR_LEN ); printf( "Found new gateway %s (class: %i)\n", orig_str, new_gwflags ); } @@ -488,68 +507,129 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla } -static void debug() -{ - struct list_head *forw_pos, *orig_pos, *neigh_pos, *pack_pos, *temp; + + +static void debug() { + + struct list_head *forw_pos, *orig_pos, *neigh_pos, *pack_pos; struct forw_node *forw_node; struct orig_node *orig_node; struct neigh_node *neigh_node; struct pack_node *pack_node; - static char str[ADDR_STR_LEN]; - int l; + struct gw_node *gw_node; + static char str[ADDR_STR_LEN], str2[ADDR_STR_LEN]; - if (debug_level != 2) + if ( ( debug_level == 0 ) || ( debug_level == 3 ) ) return; - if (debug_level == 2) { - output("------------------ DEBUG ------------------\n"); - output("Forward list\n"); + system( "clear" ); - list_for_each(forw_pos, &forw_list) { - forw_node = list_entry(forw_pos, struct forw_node, list); - addr_to_string(forw_node->pack.orig, str, sizeof (str)); - output(" %s at %u\n", str, forw_node->when); - } + if ( debug_level == 2 ) { + if ( list_empty(&gw_list) ) { - output("Originator list\n"); - } + printf( "No gateways in range ...\n" ); - list_for_each(orig_pos, &orig_list) { - orig_node = list_entry(orig_pos, struct orig_node, list); + } else { - addr_to_string(orig_node->orig, str, sizeof (str)); + list_for_each(orig_pos, &gw_list) { + gw_node = list_entry(orig_pos, struct gw_node, list); - output("%s, last_aware:%u, last_reply:%u, last_seen:%u via:\n", - str, orig_node->last_aware, orig_node->last_reply, orig_node->last_seen); + addr_to_string( gw_node->orig_node->orig, str, sizeof (str) ); + addr_to_string( gw_node->orig_node->router, str2, sizeof (str2) ); - list_for_each(neigh_pos, &orig_node->neigh_list) { - neigh_node = list_entry(neigh_pos, struct neigh_node, list); + if ( curr_gateway == gw_node ) { + printf( "=> %s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + } else { + printf( "%s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + } + + } + + } + + } else { + + if ( debug_level == 4 ) { + + output("------------------ DEBUG ------------------\n"); + output("Forward list\n"); - l = 0; - list_for_each(temp, &neigh_node->pack_list) { - l++; + list_for_each(forw_pos, &forw_list) { + forw_node = list_entry(forw_pos, struct forw_node, list); + addr_to_string(forw_node->pack.orig, str, sizeof (str)); + output(" %s at %u\n", str, forw_node->when); } - if (debug_level >= 2) { - addr_to_string(neigh_node->addr, str, sizeof (str)); - output("\t\t%s (%d)\n", str, l); + } + + if ( debug_level == 4 ) + output("Originator list\n"); + + if ( list_empty(&orig_list) ) { + + if ( debug_level != 4 ) { + printf( "No gateways in range ...\n" ); + } else { + output( "No gateways in range ...\n" ); } - if (debug_level >= 3) { - list_for_each(pack_pos, &neigh_node->pack_list) { - pack_node = list_entry(pack_pos, struct pack_node, list); - output(" Sequence number: %d, TTL: %d at: %u \n", - pack_node->seqno, pack_node->ttl, pack_node->time); + } else { + + list_for_each(orig_pos, &orig_list) { + orig_node = list_entry(orig_pos, struct orig_node, list); + + if ( orig_node->router == 0 ) + continue; + + addr_to_string( orig_node->orig, str, sizeof (str) ); + addr_to_string( orig_node->router, str2, sizeof (str2) ); + + if ( debug_level != 4 ) { + printf( "%s, GW: %s(%i) via:", str, str2, orig_node->packet_count ); + } else { + output("%s, GW: %s(%i), last_aware:%u, last_reply:%u, last_seen:%u via:\n", str, str2, orig_node->packet_count, orig_node->last_aware, orig_node->last_reply, orig_node->last_seen); + } + + list_for_each(neigh_pos, &orig_node->neigh_list) { + neigh_node = list_entry(neigh_pos, struct neigh_node, list); + + addr_to_string(neigh_node->addr, str, sizeof (str)); + + if ( debug_level != 4 ) { + printf( " %s(%i)", str, neigh_node->packet_count ); + } else { + output( "\t\t%s (%d)\n", str, neigh_node->packet_count ); + } + + if ( debug_level == 4 ) { + + list_for_each(pack_pos, &neigh_node->pack_list) { + pack_node = list_entry(pack_pos, struct pack_node, list); + output(" Sequence number: %d, TTL: %d at: %u \n", + pack_node->seqno, pack_node->ttl, pack_node->time); + } + + } + } + + if ( debug_level != 4 ) + printf( "\n" ); + } + } + + if ( debug_level == 4 ) + output("---------------------------------------------- END DEBUG\n"); + } - if (debug_level >= 2) - output("---------------------------------------------- END DEBUG\n"); } + + int isDuplicate(unsigned int orig, unsigned short seqno) { struct list_head *orig_pos, *neigh_pos, *pack_pos; @@ -603,7 +683,7 @@ struct orig_node *update_last_hop(struct packet *in, unsigned int neigh) { struct orig_node *orig_neigh_node; - if (debug_level == 3) { + if (debug_level == 4) { output("update_last_hop(): Searching originator entry of last-hop neighbour of received packet \n"); } orig_neigh_node = get_orig_node( neigh ); @@ -620,7 +700,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if struct neigh_node *neigh_node = NULL; struct pack_node *pack_node = NULL; - if (debug_level == 3) + if (debug_level == 4) output("update_originator(): Searching and updating originator entry of received packet, \n"); orig_node = get_orig_node( in->orig ); @@ -641,7 +721,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if } if (neigh_node == NULL) { - if (debug_level == 3) + if (debug_level == 4) output("Creating new last-hop neighbour of originator\n"); neigh_node = alloc_memory(sizeof (struct neigh_node)); @@ -651,7 +731,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if neigh_node->addr = neigh; list_add_tail(&neigh_node->list, &orig_node->neigh_list); - } else if (debug_level == 3) + } else if (debug_level == 4) output("Updating existing last-hop neighbour of originator\n"); list_for_each(pack_pos, &neigh_node->pack_list) { @@ -662,7 +742,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if } if (pack_node == NULL) { - if (debug_level == 3) + if (debug_level == 4) output("Creating new packet entry for last-hop neighbor of originator \n"); pack_node = alloc_memory(sizeof (struct pack_node)); @@ -672,7 +752,7 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if pack_node->if_incoming = if_incoming; list_add_tail(&pack_node->list, &neigh_node->pack_list); } else - if (debug_level == 3) + if (debug_level == 4) output("ERROR - Updating existing packet\n"); neigh_node->best_ttl = in->ttl; @@ -688,14 +768,14 @@ void schedule_forward_packet( struct packet *in, int unidirectional, struct orig struct forw_node *forw_node, *forw_node_new; struct list_head *forw_pos; - if (debug_level == 3) + if (debug_level == 4) output("schedule_forward_packet(): \n"); if (in->ttl <= 1) { - if (debug_level == 3) + if (debug_level == 4) output("ttl exceeded \n"); } else if ( ( orig_node->router != neigh ) && ( orig_node->router != 0 ) ) { - if (debug_level == 3) + if (debug_level == 4) output("not my best neighbour\n"); } else { @@ -707,7 +787,7 @@ void schedule_forward_packet( struct packet *in, int unidirectional, struct orig forw_node_new->pack.ttl--; if (unidirectional) { - if (debug_level == 3) + if (debug_level == 4) output("sending with unidirectional flag \n"); forw_node_new->pack.flags = (forw_node_new->pack.flags | UNIDIRECTIONAL); @@ -769,7 +849,7 @@ void send_outstanding_packets() } - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(forw_node->pack.orig, orig_str, ADDR_STR_LEN); output("Forwarding packet (originator %s, seqno %d, TTL %d)\n", orig_str, forw_node->pack.seqno, forw_node->pack.ttl); } @@ -779,13 +859,17 @@ void send_outstanding_packets() batman_if = list_entry(if_pos, struct batman_if, list); if (send_packet(send_buff, sizeof (struct packet) + forw_node->hna_buff_len, &batman_if->broad, batman_if->udp_send_sock) < 0) { - do_log( "ERROR: %s returned -1\n", "send_packet" ); - exit( -1); + exit( -1 ); } } + free_memory(send_buff); list_del(forw_pos); + + if ( forw_node->hna_buff_len > 0 ) + free_memory(forw_node->hna_buff); + free_memory(forw_node); } @@ -858,7 +942,7 @@ void purge() int gw_purged = 0; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; - if (debug_level == 3) + if (debug_level == 4) output("purge() \n"); /* for all origins... */ @@ -876,7 +960,7 @@ void purge() /* remove them if outdated */ if ((int)((pack_node->time + TIMEOUT) < get_time())) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(orig_node->orig, orig_str, ADDR_STR_LEN); addr_to_string(neigh_node->addr, neigh_str, ADDR_STR_LEN); output("Packet timeout (originator %s, neighbour %s, seqno %d, TTL %d, time %u)\n", @@ -894,7 +978,7 @@ void purge() /* if no more packets, remove neighbour (next hop) towards given origin */ if (list_empty(&neigh_node->pack_list)) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(neigh_node->addr, neigh_str, sizeof (neigh_str)); addr_to_string(orig_node->orig, orig_str, sizeof (orig_str)); output("Removing orphaned neighbour %s for originator %s\n", neigh_str, orig_str); @@ -906,7 +990,7 @@ void purge() /* if no more neighbours (next hops) towards given origin, remove origin */ if (list_empty(&orig_node->neigh_list) && ((int)(orig_node->last_aware) + TIMEOUT <= ((int)(get_time())))) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(orig_node->orig, orig_str, sizeof (orig_str)); output("Removing orphaned originator %s\n", orig_str); } @@ -918,7 +1002,7 @@ void purge() if ( gw_node->orig_node == orig_node ) { addr_to_string( gw_node->orig_node->orig, orig_str, ADDR_STR_LEN ); - if (debug_level == 1) + if (debug_level == 3) printf( "Removing gateway %s from gateway list\n", orig_str ); list_del(gw_pos); @@ -935,12 +1019,16 @@ void purge() list_del(orig_pos); /* remove old announced network(s) */ - if ( orig_node->hna_buff_len > 0 ) + if ( orig_node->hna_buff_len > 0 ) { + add_del_hna( orig_node, 1 ); + free_memory( orig_node->hna_buff ); + + } if ( orig_node->router != 0 ) { - if (debug_level == 3) + if (debug_level == 4) output("Deleting route to originator \n"); add_del_route(orig_node->orig, 32, orig_node->router, 1, orig_node->batman_if->dev, orig_node->batman_if->udp_send_sock); @@ -994,7 +1082,7 @@ int batman() struct neigh_node *neigh_node; struct hna_node *hna_node; struct packet in; - unsigned int neigh, hna, netmask; + unsigned int neigh, hna, netmask, debug_timeout; unsigned char hna_recv_buff[1500 - sizeof (struct packet)]; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; int forward_old, res, hna_buff_len, hna_buff_count; @@ -1002,6 +1090,7 @@ int batman() int time_count = 0; next_own = 0; + debug_timeout = get_time(); if ( !( list_empty(&hna_list) ) ) { @@ -1038,7 +1127,7 @@ int batman() while (!is_aborted()) { - if (debug_level == 3) + if (debug_level == 4) output(" \n \n"); schedule_own_packet(); @@ -1060,7 +1149,7 @@ int batman() if (res > 0) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(in.orig, orig_str, sizeof (orig_str)); addr_to_string(neigh, neigh_str, sizeof (neigh_str)); output("Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, in.seqno, in.ttl); @@ -1080,14 +1169,14 @@ int batman() if (is_my_addr == 1 /* && in.orig == my_addr */) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(neigh, neigh_str, sizeof (neigh_str)); output("Ignoring all (zero-hop) packets send by me (sender: %s)\n", neigh_str); } } else if (is_broadcast == 1) { - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(neigh, neigh_str, sizeof (neigh)); output("Ignoring all packets with broadcast source IP (sender: %s)\n", neigh_str); } @@ -1116,7 +1205,7 @@ int batman() } - if (debug_level == 3) { + if (debug_level == 4) { addr_to_string(in.orig, orig_str, sizeof (orig_str)); addr_to_string(neigh, neigh_str, sizeof (neigh_str)); @@ -1168,7 +1257,7 @@ int batman() if ( in.version != BATMAN_VERSION ) { - if (debug_level == 1) + if (debug_level == 3) output( "Incompatible batman version (%i) - ignoring packet... \n", in.version ); } else if ( in.flags & UNIDIRECTIONAL ) { @@ -1177,7 +1266,7 @@ int batman() orig_neigh_node->last_reply = get_time(); - if (debug_level == 3) + if (debug_level == 4) output("received my own packet from neighbour indicating bidirectional link, updating last_reply stamp \n"); } @@ -1209,7 +1298,7 @@ int batman() } else { - if (debug_level == 3) + if (debug_level == 4) output("Ignoring packet... \n"); } @@ -1223,8 +1312,16 @@ int batman() choose_gw(); purge(); - debug(); + + if ( debug_timeout + 1000 < get_time() ) { + + debug_timeout = get_time(); + debug(); + + } + time_count++; + } if ( debug_level > 0 ) diff --git a/batman.h b/batman.h index 59e0d44..fe6dbbd 100755 --- a/batman.h +++ b/batman.h @@ -42,7 +42,6 @@ - extern int debug_level; extern int orginator_interval; extern int gateway_class; @@ -93,6 +92,7 @@ struct neigh_node { struct list_head list; unsigned int addr; + unsigned int packet_count; /* packets gathered from this neighbour */ unsigned short best_ttl; /* ttl of last packet */ struct list_head pack_list; }; diff --git a/linux.c b/linux.c index d5cb6d6..e2a5f4d 100755 --- a/linux.c +++ b/linux.c @@ -124,9 +124,9 @@ void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router route.rt_metric = 0; - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { printf("%s default route via %s\n", del ? "Deleting" : "Adding", dev); - } else if ( debug_level == 3 ) { + } else if ( debug_level == 4 ) { output("%s default route via %s\n", del ? "Deleting" : "Adding", dev); } @@ -134,9 +134,9 @@ void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router route.rt_flags |= RTF_GATEWAY; - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { printf("%s route to %s/%i via %s (%s)\n", del ? "Deleting" : "Adding", str1, netmask, str2, dev); - } else if ( debug_level == 3 ) { + } else if ( debug_level == 4 ) { output("%s route to %s/%i via %s (%s)\n", del ? "Deleting" : "Adding", str1, netmask, str2, dev); } @@ -144,9 +144,9 @@ void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router } else { - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { printf("%s route to %s via 0.0.0.0 (%s)\n", del ? "Deleting" : "Adding", str1, dev); - } else if ( debug_level == 3 ) { + } else if ( debug_level == 4 ) { output("%s route to %s via 0.0.0.0 (%s)\n", del ? "Deleting" : "Adding", str1, dev); } diff --git a/posix.c b/posix.c index f71796c..7620832 100644 --- a/posix.c +++ b/posix.c @@ -210,7 +210,7 @@ void *client_to_gw_tun( void *arg ) { if ( write( curr_gateway_tcp_sock, keep_alive_string, sizeof( keep_alive_string ) ) < 0 ) { - if ( debug_level == 1 ) + if ( debug_level == 3 ) printf( "server_keepalive failed: no connect to server\n" ); gw_node->last_failure = get_time(); @@ -239,19 +239,19 @@ void *client_to_gw_tun( void *arg ) { if ( status > 0 ) { - if ( debug_level == 1 ) + if ( debug_level == 3 ) printf( "server message ?\n" ); } else if ( status < 0 ) { - if ( debug_level == 1 ) + if ( debug_level == 3 ) printf( "Cannot read message from gateway: %s\n", strerror(errno) ); break; } else if (status == 0) { - if ( debug_level == 1 ) + if ( debug_level == 3 ) printf( "Gateway closed connection - timeout ?\n" ); gw_node->last_failure = get_time(); @@ -383,6 +383,7 @@ int is_aborted() void *alloc_memory(int len) { + void *res = malloc(len); if (res == NULL) @@ -392,6 +393,7 @@ void *alloc_memory(int len) } return res; + } void *realloc_memory(void *ptr, int len) @@ -468,9 +470,13 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha } } - if (res == 0) + if ( res == 0 ) { + + free_memory( buff ); return 0; + } + addr_len = sizeof (struct sockaddr_in); list_for_each(if_pos, &if_list) { @@ -497,6 +503,7 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha } else { + free_memory( buff ); return 0; } @@ -508,21 +515,36 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha } + free_memory( buff ); *neigh = addr.sin_addr.s_addr; return 1; + } int send_packet(unsigned char *buff, int len, struct sockaddr_in *broad, int sock) { + if (sendto(sock, buff, len, 0, (struct sockaddr *)broad, sizeof (struct sockaddr_in)) < 0) { - do_log( "Error - can't send packet: %s\n", strerror(errno) ); + + if ( errno == 1 ) { + + do_log( "Error - can't send packet: %s.\nDoes your Firewall allow outgoing UDP packets on port 1966 ?\n", strerror(errno) ); + + } else { + + do_log( "Error - can't send packet: %s.\n", strerror(errno) ); + + } + return -1; + } return 0; + } static void handler(int sig) @@ -605,7 +627,7 @@ void *gw_listen( void *arg ) { list_add_tail(&gw_client->list, &batman_if->client_list); - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); printf( "gateway: %s (%s) got connection from %s (internet via %s)\n", gw_addr, batman_if->dev, str2, tun_dev ); } @@ -669,7 +691,7 @@ void *gw_listen( void *arg ) { if ( gw_client->sock > max_sock ) max_sock = gw_client->sock; - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); printf( "gateway: client %s sent keep alive on interface %s\n", str2, batman_if->dev ); } @@ -682,7 +704,7 @@ void *gw_listen( void *arg ) { } else { - if ( debug_level == 1 ) + if ( debug_level == 3 ) printf( "Client %s closed connection ...\n", str2 ); } @@ -730,7 +752,7 @@ void *gw_listen( void *arg ) { FD_CLR(gw_client->sock, &wait_sockets); close( gw_client->sock ); - if ( debug_level == 1 ) { + if ( debug_level == 3 ) { addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); printf( "gateway: client %s timeout on interface %s\n", str2, batman_if->dev ); } @@ -835,8 +857,8 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if ( debug_level < 0 || debug_level > 3 ) { - printf( "Invalid debug level: %i\nDebug level has to be between 0 and 3.\n", debug_level ); + if ( debug_level < 0 || debug_level > 4 ) { + printf( "Invalid debug level: %i\nDebug level has to be between 0 and 4.\n", debug_level ); exit(EXIT_FAILURE); } @@ -983,7 +1005,6 @@ int main(int argc, char *argv[]) break; case 0: /* child process - new daemon */ - openlog( "batmand", LOG_PID, LOG_DAEMON ); break; case 1: /* parent process */ @@ -1000,6 +1021,25 @@ int main(int argc, char *argv[]) } + /* fork again for openwrt */ + switch( pid = fork() ) { + + case -1: /* error */ + printf( "Error - can't fork to background: %s\n", strerror(errno) ); + close_all_sockets(); + exit(EXIT_FAILURE); + break; + + case 0: /* child process - new daemon */ + openlog( "batmand", LOG_PID, LOG_DAEMON ); + break; + + case 1: /* parent process */ + exit( EXIT_SUCCESS ); + break; + + } + close( STDIN_FILENO ); close( STDOUT_FILENO ); close( STDERR_FILENO ); -- batman; test conversation

1 0

batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054
by postmaster＠open-mesh.org 19 Dec '10

19 Dec '10

The following commit has been merged in the master branch: commit 3b4ae777ea8311c5d883f277a4e2cb91e088558d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 6 20:42:13 2006 +0100 changelog updated diff --git a/CHANGELOG b/CHANGELOG index f42328e..b429702 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ new functions: - Network announcement implemented - daemonizing batman -> batmand - improving output / logging to syslog added +- neighbours and gateways can be listed - FreeBSD support added - Mac OS X support added -- batman; test conversation

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010