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 3438fa2612921d0220b40db9872febeba17d8430 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Mar 12 15:55:02 2007 +0100 fix display bug while using batman client batch mode: let batman client exit quicker update routes after neighbour purge diff --git a/allocate.c b/allocate.c index 665cef3..52cbb34 100644 --- a/allocate.c +++ b/allocate.c @@ -143,12 +143,12 @@ void checkIntegrity(void) struct memoryUsage *memoryWalker; - debug_output( 3, "Memory usage information:\n" ); + debug_output( 3, " \nMemory usage information:\n" ); for ( memoryWalker = memoryList; memoryWalker != NULL; memoryWalker = memoryWalker->next ) { if ( memoryWalker->counter != 0 ) - debug_output( 3, " tag: %''4i, num malloc: % 4i, bytes per malloc: %''4i, total: % 6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); + debug_output( 3, " tag: %''4i, num malloc: %4i, bytes per malloc: %''4i, total: %6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); } diff --git a/batman.c b/batman.c index f6bf964..2ec4db4 100644 --- a/batman.c +++ b/batman.c @@ -644,7 +644,7 @@ int8_t batman() { addr_to_string( ((struct packet *)&in)->orig, orig_str, sizeof(orig_str) ); addr_to_string( neigh, neigh_str, sizeof(neigh_str) ); - debug_output( 4, "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, ((struct packet *)&in)->seqno, ((struct packet *)&in)->ttl ); + debug_output( 4, "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d) \n", neigh_str, orig_str, ((struct packet *)&in)->seqno, ((struct packet *)&in)->ttl ); is_my_addr = is_my_orig = is_broadcast = is_duplicate = is_bidirectional = forward_duplicate_packet = 0; @@ -672,7 +672,7 @@ int8_t batman() { if ( hna_buff_len > 4 ) { - debug_output( 4, "HNA information received (%i HNA network%s):\n", hna_buff_len / 5, ( hna_buff_len / 5 > 1 ? "s": "" ) ); + debug_output( 4, "HNA information received (%i HNA network%s): \n", hna_buff_len / 5, ( hna_buff_len / 5 > 1 ? "s": "" ) ); hna_buff_count = 0; while ( ( hna_buff_count + 1 ) * 5 <= hna_buff_len ) { @@ -685,7 +685,7 @@ int8_t batman() { if ( ( netmask > 0 ) && ( netmask < 33 ) ) debug_output( 4, "hna: %s/%i\n", orig_str, netmask ); else - debug_output( 4, "hna: %s/%i -> ignoring (invalid netmask)\n", orig_str, netmask ); + debug_output( 4, "hna: %s/%i -> ignoring (invalid netmask) \n", orig_str, netmask ); hna_buff_count++; @@ -700,11 +700,11 @@ int8_t batman() { } else if ( is_my_addr ) { - debug_output( 4, "Drop packet: received my own broadcast (sender: %s)\n", neigh_str ); + debug_output( 4, "Drop packet: received my own broadcast (sender: %s) \n", neigh_str ); } else if ( is_broadcast ) { - debug_output( 4, "Drop packet: ignoring all packets with broadcast source IP (sender: %s)\n", neigh_str ); + debug_output( 4, "Drop packet: ignoring all packets with broadcast source IP (sender: %s) \n", neigh_str ); } else if ( is_my_orig ) { diff --git a/batman.h b/batman.h index 575b17c..8b49a0f 100644 --- a/batman.h +++ b/batman.h @@ -104,7 +104,6 @@ struct packet struct orig_node /* structure for orig_list maintaining nodes of mesh */ { uint32_t orig; - struct list_head list; struct neigh_node *router; struct batman_if *batman_if; uint32_t *bidirect_link; /* if node is a bidrectional neighbour, when my originator packet was broadcasted (replied) by this node and received by me */ diff --git a/orginator.c b/orginator.c index ca7ef82..5d46624 100644 --- a/orginator.c +++ b/orginator.c @@ -80,7 +80,6 @@ struct orig_node *get_orig_node( uint32_t addr ) { orig_node = debugMalloc( sizeof(struct orig_node), 401 ); memset(orig_node, 0, sizeof(struct orig_node)); - INIT_LIST_HEAD(&orig_node->list); INIT_LIST_HEAD(&orig_node->neigh_list); orig_node->orig = addr; @@ -102,7 +101,6 @@ struct orig_node *get_orig_node( uint32_t addr ) { } prof_stop( PROF_get_orig_node ); - return orig_node; } @@ -209,7 +207,7 @@ void purge_orig( uint32_t curr_time ) { struct orig_node *orig_node; struct neigh_node *neigh_node, *best_neigh_node; struct gw_node *gw_node; - uint8_t gw_purged = 0, neigh_purged = 0, max_packet_count; + uint8_t gw_purged = 0, neigh_purged = 0; static char orig_str[ADDR_STR_LEN]; debug_output( 4, "purge() \n" ); @@ -264,7 +262,7 @@ void purge_orig( uint32_t curr_time ) { } else { - max_packet_count = 0; + best_neigh_node = NULL; /* for all neighbours towards this orginator ... */ list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { @@ -279,19 +277,15 @@ void purge_orig( uint32_t curr_time ) { } else { - if ( neigh_node->packet_count > max_packet_count ) { - - max_packet_count = neigh_node->packet_count; + if ( ( best_neigh_node == NULL ) || ( neigh_node->packet_count > best_neigh_node->packet_count ) ) best_neigh_node = neigh_node; - } - } } - if ( ( neigh_purged ) && ( ( orig_node->router == NULL ) || ( max_packet_count > orig_node->router->packet_count ) ) ) + if ( ( neigh_purged ) && ( ( best_neigh_node == NULL ) || ( orig_node->router == NULL ) || ( best_neigh_node->packet_count > orig_node->router->packet_count ) ) ) update_routes( orig_node, best_neigh_node, orig_node->hna_buff, orig_node->hna_buff_len ); } @@ -338,7 +332,7 @@ void debug_orig() { if ( list_empty( &gw_list ) ) { - debug_output( 2, "No gateways in range ...\n" ); + debug_output( 2, "No gateways in range ... \n" ); } else { @@ -353,18 +347,20 @@ void debug_orig() { addr_to_string( gw_node->orig_node->router->addr, str2, sizeof (str2) ); if ( curr_gateway == gw_node ) { - debug_output( 2, "=> %s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + debug_output( 2, "=> %s via: %s(%i), gw_class %i - %s, reliability: %i \n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); } else { - debug_output( 2, "%s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + debug_output( 2, "%s via: %s(%i), gw_class %i - %s, reliability: %i \n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); } } if ( batman_count == 0 ) - debug_output( 2, "No gateways in range ...\n" ); + debug_output( 2, "No gateways in range ... \n" ); } + debug_output( 2, "EOD\n" ); + } if ( ( debug_clients.clients_num[0] > 0 ) || ( debug_clients.clients_num[3] > 0 ) ) { @@ -373,16 +369,16 @@ void debug_orig() { if ( debug_clients.clients_num[3] > 0 ) { - debug_output( 4, "------------------ DEBUG ------------------\n" ); - debug_output( 4, "Forward list\n" ); + debug_output( 4, "------------------ DEBUG ------------------ \n" ); + debug_output( 4, "Forward list \n" ); list_for_each( forw_pos, &forw_list ) { forw_node = list_entry( forw_pos, struct forw_node, list ); addr_to_string( ((struct packet *)forw_node->pack_buff)->orig, str, sizeof (str) ); - debug_output( 4, " %s at %u\n", str, forw_node->send_time ); + debug_output( 4, " %s at %u \n", str, forw_node->send_time ); } - debug_output( 4, "Originator list\n" ); + debug_output( 4, "Originator list \n" ); } @@ -399,7 +395,7 @@ void debug_orig() { addr_to_string( orig_node->router->addr, str2, sizeof (str2) ); debug_output( 1, "%s, GW: %s(%i) via:", str, str2, orig_node->router->packet_count ); - debug_output( 4, "%s, GW: %s(%i), last_aware:%u via:\n", str, str2, orig_node->router->packet_count, orig_node->last_aware ); + debug_output( 4, "%s, GW: %s(%i), last_aware:%u via: \n", str, str2, orig_node->router->packet_count, orig_node->last_aware ); list_for_each( neigh_pos, &orig_node->neigh_list ) { neigh_node = list_entry( neigh_pos, struct neigh_node, list ); @@ -407,22 +403,23 @@ void debug_orig() { addr_to_string( neigh_node->addr, str, sizeof (str) ); debug_output( 1, " %s(%i)", str, neigh_node->packet_count ); - debug_output( 4, "\t\t%s (%d)\n", str, neigh_node->packet_count ); + debug_output( 4, "\t\t%s (%d) \n", str, neigh_node->packet_count ); } - debug_output( 1, "\n" ); + debug_output( 1, " \n" ); } if ( batman_count == 0 ) { - debug_output( 1, "No batman nodes in range ...\n" ); - debug_output( 4, "No batman nodes in range ...\n" ); + debug_output( 1, "No batman nodes in range ... \n" ); + debug_output( 4, "No batman nodes in range ... \n" ); } - debug_output( 4, "---------------------------------------------- END DEBUG\n" ); + debug_output( 1, "EOD\n" ); + debug_output( 4, "---------------------------------------------- END DEBUG \n" ); } diff --git a/posix-specific.c b/posix-specific.c index 3fd9dc8..de9e028 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -140,7 +140,7 @@ void *unix_listen( void *arg ) { struct timeval tv; int32_t status, max_sock; int8_t res; - unsigned char buff[1500]; + unsigned char buff[10]; fd_set wait_sockets, tmp_wait_sockets; socklen_t sun_size = sizeof(struct sockaddr_un); @@ -203,7 +203,7 @@ void *unix_listen( void *arg ) { /* debug_output( 3, "gateway: client sent data via unix socket: %s\n", buff ); */ - if ( ( buff[2] == '1' ) || ( buff[2] == '2' ) || ( buff[2] == '3' ) || ( buff[2] == '4' ) ) { + if ( ( status > 2 ) && ( ( buff[2] == '1' ) || ( buff[2] == '2' ) || ( buff[2] == '3' ) || ( buff[2] == '4' ) ) ) { if ( unix_client->debug_level != 0 ) { @@ -347,15 +347,14 @@ void apply_init_args( int argc, char *argv[] ) { struct batman_if *batman_if; struct hna_node *hna_node; struct debug_level_info *debug_level_info; -// struct timeval tv; - uint8_t found_args = 1, unix_client = 0, batch_mode = 0, batch_counter = 0; + uint8_t found_args = 1, unix_client = 0, batch_mode = 0; uint16_t netmask; int8_t res; int32_t optchar, recv_buff_len, bytes_written; - char str1[16], str2[16], *slash_ptr, unix_string[100], buff[1500], *buff_ptr, *cr_ptr; + char str1[16], str2[16], *slash_ptr, *unix_buff, *buff_ptr, *cr_ptr; uint32_t vis_server = 0; -// fd_set wait_sockets, tmp_wait_sockets; + memset( &tmp_ip_holder, 0, sizeof (struct in_addr) ); stop = 0; @@ -668,7 +667,7 @@ void apply_init_args( int argc, char *argv[] ) { unlink( UNIX_PATH ); - unix_if.unix_sock = socket(AF_LOCAL, SOCK_STREAM, 0); + unix_if.unix_sock = socket( AF_LOCAL, SOCK_STREAM, 0 ); memset( &unix_if.addr, 0, sizeof(struct sockaddr_un) ); unix_if.addr.sun_family = AF_LOCAL; @@ -736,47 +735,44 @@ void apply_init_args( int argc, char *argv[] ) { } - snprintf( unix_string, sizeof( unix_string ), "d:%i", debug_level ); - -// FD_ZERO(&wait_sockets); -// FD_SET(unix_if.unix_sock, &wait_sockets); + unix_buff = debugMalloc( 1500, 5001 ); + snprintf( unix_buff, 10, "d:%i", debug_level ); - if ( write( unix_if.unix_sock, unix_string, strlen( unix_string ) ) < 0 ) { + if ( write( unix_if.unix_sock, unix_buff, 10 ) < 0 ) { printf( "Error - can't write to unix socket: %s\n", strerror(errno) ); close( unix_if.unix_sock ); + debugFree( unix_buff, 5101 ); exit(EXIT_FAILURE); } - while ( ( recv_buff_len = read( unix_if.unix_sock, buff, sizeof( buff ) ) ) > 0 ) { + while ( ( recv_buff_len = read( unix_if.unix_sock, unix_buff, 1500 ) ) > 0 ) { - buff_ptr = buff; + unix_buff[recv_buff_len] = '\0'; + + buff_ptr = unix_buff; bytes_written = 0; while ( ( cr_ptr = strchr( buff_ptr, '\n' ) ) != NULL ) { *cr_ptr = '\0'; - if ( strcmp( buff_ptr, "BOD" ) == 0 ) { + if ( strncmp( buff_ptr, "EOD", 3 ) == 0 ) { if ( batch_mode ) { - if ( batch_counter ) { - - close( unix_if.unix_sock ); - exit(EXIT_SUCCESS); + close( unix_if.unix_sock ); + debugFree( unix_buff, 5102 ); + exit(EXIT_SUCCESS); - } - - batch_counter++; + } - } else { + } else if ( strncmp( buff_ptr, "BOD", 3 ) == 0 ) { + if ( ! batch_mode ) system( "clear" ); - } - } else { printf( "%s\n", buff_ptr ); @@ -793,10 +789,12 @@ void apply_init_args( int argc, char *argv[] ) { } + close( unix_if.unix_sock ); + debugFree( unix_buff, 5103 ); + if ( recv_buff_len < 0 ) { printf( "Error - can't read from unix socket: %s\n", strerror(errno) ); - close( unix_if.unix_sock ); exit(EXIT_FAILURE); } else { @@ -805,65 +803,6 @@ void apply_init_args( int argc, char *argv[] ) { } -// while ( 1 ) { -// -// if ( write( unix_if.unix_sock, unix_string, strlen( unix_string ) ) < 0 ) { -// -// printf( "Error - can't write to unix socket: %s\n", strerror(errno) ); -// close( unix_if.unix_sock ); -// exit(EXIT_FAILURE); -// -// } -// -// if ( ! batch_mode ) -// system( "clear" ); -// -// while ( 1 ) { -// -// tv.tv_sec = 1; -// tv.tv_usec = 0; -// tmp_wait_sockets = wait_sockets; -// -// res = select( unix_if.unix_sock + 1, &tmp_wait_sockets, NULL, NULL, &tv ); -// -// if ( res > 0 ) { -// -// if ( ( recv_buff_len = read( unix_if.unix_sock, buff, sizeof( buff ) ) ) < 0 ) { -// -// printf( "Error - can't read from unix socket: %s\n", strerror(errno) ); -// close( unix_if.unix_sock ); -// exit(EXIT_FAILURE); -// -// } else if ( recv_buff_len > 0 ) { -// -// printf( "%s", buff ); -// -// } -// -// /* timeout reached */ -// } else if ( res == 0 ) { -// -// break; -// -// } else if ( ( res < 0 ) && ( errno != EINTR ) ) { -// -// printf( "Error - can't select: %s\n", strerror(errno) ); -// close( unix_if.unix_sock ); -// exit(EXIT_FAILURE); -// -// } -// -// } -// -// if ( batch_mode ) -// break; -// -// sleep( 1 ); -// -// } - - close( unix_if.unix_sock ); - } exit(EXIT_SUCCESS); diff --git a/profile.c b/profile.c index eb373b2..d10f9ec 100644 --- a/profile.c +++ b/profile.c @@ -61,16 +61,14 @@ void prof_print() { int32_t index; - debug_output( 3, "\nProfile data:\n" ); + debug_output( 3, " \nProfile data:\n" ); for ( index = 0; index < PROF_COUNT; index++ ) { - debug_output( 3, " %''30s: cpu time = %10.3f, calls = %''6i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); + debug_output( 3, " %''30s: cpu time = %10.3f, calls = %''10i, avg time per call = %4.10f \n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls, ( (float)prof_container[index].calls == 0 ? 0.0 : ( ( (float)prof_container[index].total_time/CLOCKS_PER_SEC ) / (float)prof_container[index].calls ) ) ); } - debug_output( 3, "\n" ); - } -- 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 40b7e5478feeaf31bb4e19279a18f4dddec58628 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Mar 12 23:52:31 2007 +0100 merge hash memory leak fix from batman advanced fix hash_iterate (missing entries while using hash_iterate() && hash_remove()) no gateways in range display bug fixed try to remove routes from kernel routing table on SIGSEGV diff --git a/allocate.c b/allocate.c index 52cbb34..a09fb88 100644 --- a/allocate.c +++ b/allocate.c @@ -26,6 +26,7 @@ #include "os.h" #include "allocate.h" + #define DEBUG_MALLOC #define MEMORY_USAGE @@ -177,10 +178,13 @@ void checkIntegrity(void) void checkLeak(void) { + struct chunkHeader *walker; for (walker = chunkList; walker != NULL; walker = walker->next) fprintf(stderr, "Memory leak detected, malloc tag = %d\n", walker->tag); + + } void *debugMalloc(uint32_t length, int32_t tag) diff --git a/batman.c b/batman.c index 2ec4db4..6173270 100644 --- a/batman.c +++ b/batman.c @@ -508,7 +508,7 @@ int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { int isBidirectionalNeigh( struct orig_node *orig_neigh_node, struct batman_if *if_incoming ) { - if( orig_neigh_node->bidirect_link[if_incoming->if_num] > 0 && ( orig_neigh_node->bidirect_link[if_incoming->if_num] + (bidirectional_timeout) ) >= get_time() ) + if ( orig_neigh_node->bidirect_link[if_incoming->if_num] > 0 && ( orig_neigh_node->bidirect_link[if_incoming->if_num] + (bidirectional_timeout) ) >= get_time() ) return 1; else return 0; diff --git a/hash.c b/hash.c index 42c2bbc..da09301 100644 --- a/hash.c +++ b/hash.c @@ -19,7 +19,8 @@ #include <stdio.h> /* NULL */ -#include "batman.h" +#include "batman-specific.h" + /* clears the hash */ void hash_init(struct hashtable_t *hash) { @@ -60,8 +61,8 @@ void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) { /* free only the hashtable and the hash itself. */ void hash_destroy(struct hashtable_t *hash) { - debugFree( hash->table, 1301 ); - debugFree( hash, 1302 ); + debugFree( hash->table, 1302 ); + debugFree( hash, 1303 ); } @@ -76,24 +77,35 @@ struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_ if (iter_in == NULL) { iter= debugMalloc(sizeof(struct hash_it_t), 301); iter->index = -1; - iter->bucket = NULL; + iter->bucket = iter->next_bucket = NULL; } else iter= iter_in; - if ( iter->bucket!=NULL ) { - iter->bucket = iter->bucket->next; /* choose next */ - if (iter->bucket !=NULL) /* if fine, return it */ + if (iter->bucket!=NULL) { + /* if hash_remove() was used since last call our next pointer may not + correspond with our last next position - we don't to miss some entries */ + if ( (iter->next_bucket!=NULL) && (iter->bucket->next!=iter->next_bucket) ) { + iter->bucket = &(hash->table[ iter->index ]); + iter->next_bucket = ((struct element_t *)&(hash->table[ iter->index ]))->next; + return(iter); + } else if (iter->bucket->next!=NULL) { + iter->bucket = iter->bucket->next; /* choose next */ + iter->next_bucket = iter->bucket->next; return(iter); + } else { + iter->bucket = iter->next_bucket = NULL; + } } iter->index++; while ( iter->index < hash->size ) { /* go through the entries of the hash table */ if ((hash->table[ iter->index ].data) != NULL){ iter->bucket = &(hash->table[ iter->index ]); + iter->next_bucket = ((struct element_t *)&(hash->table[ iter->index ]))->next; return(iter); /* if this table entry is not null, return it */ } else iter->index++; /* else, go to the next */ } /* nothing to iterate over anymore */ - debugFree(iter, 1303); + debugFree(iter, 1304); return(NULL); } @@ -109,7 +121,7 @@ struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_cho hash->size= size; hash->table= debugMalloc( sizeof(struct element_t) * size, 303); if ( hash->table == NULL ) { /* could not allocate the table */ - debugFree(hash, 1304); + debugFree(hash, 1305); return(NULL); } hash->compare= compare; @@ -179,7 +191,7 @@ void *hash_find(struct hashtable_t *hash, void *keydata) { * we just need the key for comparing. */ void *hash_remove(struct hashtable_t *hash, void *data) { int index; - struct element_t *bucket, *last_bucket; + struct element_t *bucket, *last_bucket, *next_bucket; void *data_save; index = hash->choose( data , hash->size ); @@ -194,12 +206,15 @@ void *hash_remove(struct hashtable_t *hash, void *data) { if ( bucket->next == NULL ) { /* there is no next bucket, nothing to preserve. */ bucket->data= NULL; } else { /* else, move the second bucket onto the first one */ + next_bucket = bucket->next; bucket->data= bucket->next->data; bucket->next= bucket->next->next; + debugFree(next_bucket, 1306); /* free the next_bucket, as we copied its data into our + * first bucket. */ } } else { /* not the first entry */ last_bucket->next= bucket->next; - debugFree(bucket, 1305); + debugFree(bucket, 1307); } hash->elements--; @@ -244,22 +259,21 @@ struct hashtable_t *hash_resize(struct hashtable_t *hash, int size) { /* print the hash table for debugging */ -void hash_debug( struct hashtable_t *hash) { +void hash_debug(struct hashtable_t *hash) { int i; struct element_t *bucket; for (i=0; i<hash->size;i++) { - printf("[%d] ",i); +// printf("[%d] ",i); if (hash->table[i].data != NULL) { - printf("[%10p] ", hash->table[i].data); - + printf("[%d] [%10p] ", i, hash->table[i].data); bucket= hash->table[i].next; while (bucket != NULL) { printf("-> [%10p] ", bucket->data); bucket= bucket->next; } + printf("\n"); } - printf("\n"); } } diff --git a/hash.h b/hash.h index 8052078..5c21773 100644 --- a/hash.h +++ b/hash.h @@ -30,6 +30,7 @@ struct element_t { struct hash_it_t { int index; struct element_t *bucket; + struct element_t *next_bucket; }; struct hashtable_t { diff --git a/orginator.c b/orginator.c index 5d46624..6862637 100644 --- a/orginator.c +++ b/orginator.c @@ -20,6 +20,7 @@ #include <string.h> +#include <stdlib.h> #include "os.h" #include "batman.h" @@ -64,6 +65,8 @@ struct orig_node *get_orig_node( uint32_t addr ) { prof_start( PROF_get_orig_node ); struct orig_node *orig_node; + struct hashtable_t *swaphash; + static char orig_str[ADDR_STR_LEN]; orig_node = ((struct orig_node *)hash_find( orig_hash, &addr )); @@ -76,7 +79,8 @@ struct orig_node *get_orig_node( uint32_t addr ) { } - debug_output( 4, "Creating new originator\n" ); + addr_to_string( addr, orig_str, ADDR_STR_LEN ); + debug_output( 4, "Creating new originator: %s \n", orig_str ); orig_node = debugMalloc( sizeof(struct orig_node), 401 ); memset(orig_node, 0, sizeof(struct orig_node)); @@ -89,14 +93,21 @@ struct orig_node *get_orig_node( uint32_t addr ) { orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint32_t), 402 ); memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint32_t) ); - hash_add(orig_hash, orig_node); - if (orig_hash->elements * 4 > orig_hash->size) { - struct hashtable_t *swaphash; - swaphash = hash_resize(orig_hash, orig_hash->size*2); - if (swaphash == NULL) - debug_output( 0, "Couldn't resize hash table\n" ); - else - orig_hash = swaphash; + hash_add( orig_hash, orig_node ); + + if ( orig_hash->elements * 4 > orig_hash->size ) { + + swaphash = hash_resize( orig_hash, orig_hash->size * 2 ); + + if ( swaphash == NULL ) { + + debug_output( 0, "Couldn't resize hash table \n" ); + restore_defaults(); + exit(EXIT_FAILURE); + + } + + orig_hash = swaphash; } @@ -210,7 +221,6 @@ void purge_orig( uint32_t curr_time ) { uint8_t gw_purged = 0, neigh_purged = 0; static char orig_str[ADDR_STR_LEN]; - debug_output( 4, "purge() \n" ); /* for all origins... */ while ( NULL != ( hashit = hash_iterate( orig_hash, hashit ) ) ) { @@ -219,8 +229,8 @@ void purge_orig( uint32_t curr_time ) { if ( (int)( ( orig_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { - addr_to_string(orig_node->orig, orig_str, ADDR_STR_LEN); - debug_output( 4, "Orginator timeout: originator %s, last_aware %u)\n", orig_str, orig_node->last_aware ); + addr_to_string( orig_node->orig, orig_str, ADDR_STR_LEN ); + debug_output( 4, "Orginator timeout: originator %s, last_aware %u) \n", orig_str, orig_node->last_aware ); hash_remove( orig_hash, orig_node ); @@ -243,7 +253,7 @@ void purge_orig( uint32_t curr_time ) { if ( gw_node->orig_node == orig_node ) { addr_to_string( gw_node->orig_node->orig, orig_str, ADDR_STR_LEN ); - debug_output( 3, "Removing gateway %s from gateway list\n", orig_str ); + debug_output( 3, "Removing gateway %s from gateway list \n", orig_str ); gw_node->deleted = get_time(); @@ -352,6 +362,8 @@ void debug_orig() { debug_output( 2, "%s via: %s(%i), gw_class %i - %s, reliability: %i \n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); } + batman_count++; + } if ( batman_count == 0 ) diff --git a/posix-specific.c b/posix-specific.c index de9e028..2a5fda3 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -40,9 +40,8 @@ #include <syslog.h> #include "os.h" +#include "orginator.h" #include "batman-specific.h" -#include "list.h" -#include "allocate.h" @@ -112,13 +111,14 @@ void debug_output( int8_t debug_prio, char *format, ... ) { if ( debug_prio_intern == 3 ) dprintf( debug_level_info->fd, "[%10u] ", get_time() ); - if ( ( ( debug_level == 1 ) || ( debug_level == 2 ) ) && ( debug_level_info->fd == 1 ) && ( strcmp( format, "BOD\n" ) == 0 ) ) { + if ( ( ( debug_level == 1 ) || ( debug_level == 2 ) ) && ( debug_level_info->fd == 1 ) && ( strncmp( format, "BOD\n", 3 ) == 0 ) ) { system( "clear" ); } else { - vdprintf( debug_level_info->fd, format, args ); + if ( ( ( debug_level != 1 ) && ( debug_level != 2 ) ) || ( debug_level_info->fd != 1 ) || ( strncmp( format, "EOD\n", 3 ) == 0 ) ) + vdprintf( debug_level_info->fd, format, args ); } @@ -1587,9 +1587,11 @@ void *gw_listen( void *arg ) { void segmentation_fault( int32_t sig ) { + debug_output( 0, "Error - SIGSEGV received !\n" ); + restore_defaults(); - debug_output( 0, "Error - SIGSEGV received !\n" ); + purge_orig( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); exit(EXIT_FAILURE); -- 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 9473ce3886270b9a97d821f0e424ac7918fb3eae Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Mar 10 13:50:08 2007 +0100 - split hash_delete and hash_destroy diff --git a/batman.c b/batman.c index 6167373..f6bf964 100644 --- a/batman.c +++ b/batman.c @@ -854,7 +854,7 @@ int8_t batman() { purge_orig( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); - hash_delete( orig_hash ); + hash_destroy( orig_hash ); list_for_each_safe( hna_pos, hna_pos_tmp, &hna_list ) { diff --git a/hash.c b/hash.c index 84f7ffd..42c2bbc 100644 --- a/hash.c +++ b/hash.c @@ -35,7 +35,7 @@ void hash_init(struct hashtable_t *hash) { /* remove the hash structure. if hashdata_free_cb != NULL, * this function will be called to remove the elements inside of the hash. * if you don't remove the elements, memory might be leaked. */ -/*void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) { +void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) { struct element_t *bucket, *last_bucket; int i; @@ -52,12 +52,13 @@ void hash_init(struct hashtable_t *hash) { } } } -}*/ + hash_destroy(hash); +} -/* FYI: purge deletes all elements within that structure but we should free the hash itself !*/ -void hash_delete(struct hashtable_t *hash) { +/* free only the hashtable and the hash itself. */ +void hash_destroy(struct hashtable_t *hash) { debugFree( hash->table, 1301 ); debugFree( hash, 1302 ); @@ -234,7 +235,8 @@ struct hashtable_t *hash_resize(struct hashtable_t *hash, int size) { } } } - hash_delete(hash); + hash_delete(hash, NULL ); /* remove hash and eventual overflow buckets, + * but not the content itself. */ return( new_hash); diff --git a/hash.h b/hash.h index 71b4c8c..8052078 100644 --- a/hash.h +++ b/hash.h @@ -53,8 +53,10 @@ struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_cho /* remove the hash structure. if hashdata_free_cb != NULL, * this function will be called to remove the elements inside of the hash. * if you don't remove the elements, memory might be leaked. */ -void hash_delete(struct hashtable_t *hash); +void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb); +/* free only the hashtable and the hash itself. */ +void hash_destroy(struct hashtable_t *hash); /* adds data to the hashtable. returns 0 on success, -1 on error */ int hash_add(struct hashtable_t *hash, void *data); -- 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 919d0cfed1af72a523c2013a0e5118b6ef6b5bc6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 10 14:36:11 2007 +0100 in client mode do not block SIGTERM diff --git a/allocate.c b/allocate.c index cd43162..665cef3 100644 --- a/allocate.c +++ b/allocate.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> +#include "os.h" #include "allocate.h" #define DEBUG_MALLOC @@ -142,12 +143,12 @@ void checkIntegrity(void) struct memoryUsage *memoryWalker; - fprintf( stderr, "Memory usage information:\n" ); + debug_output( 3, "Memory usage information:\n" ); for ( memoryWalker = memoryList; memoryWalker != NULL; memoryWalker = memoryWalker->next ) { if ( memoryWalker->counter != 0 ) - fprintf( stderr, " tag: %''4i, num malloc: %''4i, bytes per malloc: %''4i, total: %''6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); + debug_output( 3, " tag: %''4i, num malloc: % 4i, bytes per malloc: %''4i, total: % 6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); } diff --git a/orginator.c b/orginator.c index 6f3cae8..ca7ef82 100644 --- a/orginator.c +++ b/orginator.c @@ -207,9 +207,9 @@ void purge_orig( uint32_t curr_time ) { struct list_head *neigh_pos, *neigh_temp; struct list_head *gw_pos, *gw_pos_tmp; struct orig_node *orig_node; - struct neigh_node *neigh_node; + struct neigh_node *neigh_node, *best_neigh_node; struct gw_node *gw_node; - uint8_t gw_purged = 0; + uint8_t gw_purged = 0, neigh_purged = 0, max_packet_count; static char orig_str[ADDR_STR_LEN]; debug_output( 4, "purge() \n" ); @@ -264,6 +264,8 @@ void purge_orig( uint32_t curr_time ) { } else { + max_packet_count = 0; + /* for all neighbours towards this orginator ... */ list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { @@ -271,13 +273,27 @@ void purge_orig( uint32_t curr_time ) { if ( (int)( ( neigh_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { + neigh_purged = 1; list_del( neigh_pos ); debugFree( neigh_node, 1404 ); + } else { + + if ( neigh_node->packet_count > max_packet_count ) { + + max_packet_count = neigh_node->packet_count; + best_neigh_node = neigh_node; + + } + + } } + if ( ( neigh_purged ) && ( ( orig_node->router == NULL ) || ( max_packet_count > orig_node->router->packet_count ) ) ) + update_routes( orig_node, best_neigh_node, orig_node->hna_buff, orig_node->hna_buff_len ); + } } @@ -295,11 +311,11 @@ void purge_orig( uint32_t curr_time ) { } + prof_stop( PROF_purge_orginator ); + if ( gw_purged ) choose_gw(); - prof_stop( PROF_purge_orginator ); - } diff --git a/posix-specific.c b/posix-specific.c index 9da3559..3fd9dc8 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -578,6 +578,10 @@ void apply_init_args( int argc, char *argv[] ) { exit(EXIT_FAILURE); } + signal( SIGINT, handler ); + signal( SIGTERM, handler ); + signal( SIGSEGV, segmentation_fault ); + for ( res = 0; res < 4; res++ ) { debug_clients.fd_list[res] = debugMalloc( sizeof(struct list_head), 204 ); diff --git a/posix.c b/posix.c index df46f58..82db1da 100644 --- a/posix.c +++ b/posix.c @@ -240,11 +240,6 @@ int main( int argc, char *argv[] ) { } - signal( SIGINT, handler ); - signal( SIGTERM, handler ); - signal( SIGSEGV, segmentation_fault ); - - apply_init_args( argc, argv ); diff --git a/profile.c b/profile.c index 766e1ef..eb373b2 100644 --- a/profile.c +++ b/profile.c @@ -65,7 +65,7 @@ void prof_print() { for ( index = 0; index < PROF_COUNT; index++ ) { - debug_output( 3, " %''30s: cpu time = %10.3f, calls = %''4i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); + debug_output( 3, " %''30s: cpu time = %10.3f, calls = %''6i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); } -- 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 7493b6a9ece567be7b17adf4110e6a6aa45837cd Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Mar 9 23:43:14 2007 +0100 batman.c code partly moved into orginator.c and schedule.c for better overview orginators are stored a hash instead of a list diff --git a/Makefile b/Makefile index fa0a8e4..870c0a2 100644 --- a/Makefile +++ b/Makefile @@ -31,23 +31,23 @@ LDFLAGS = -lpthread UNAME=$(shell uname) ifeq ($(UNAME),Linux) -OS_OBJ= posix-specific.o posix.o linux-specific.o linux.o allocate.o bitarray.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o linux-specific.o linux.o allocate.o bitarray.o hash.o endif ifeq ($(UNAME),Darwin) -OS_OBJ= posix-specific.o posix.o bsd.o allocate.o bitarray.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o endif ifeq ($(UNAME),FreeBSD) -OS_OBJ= posix-specific.o posix.o bsd.o allocate.o bitarray.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o endif ifeq ($(UNAME),OpenBSD) -OS_OBJ= posix-specific.o posix.o bsd.o allocate.o bitarray.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o endif -LINUX_SRC_C= batman.c posix-specific.c posix.c linux-specific.c linux.c allocate.c bitarray.c -LINUX_SRC_H= batman.h batman-specific.h list.h os.h allocate.h bitarray.h +LINUX_SRC_C= batman.c orginator.c schedule.c posix-specific.c posix.c linux-specific.c linux.c allocate.c bitarray.c hash.c +LINUX_SRC_H= batman.h orginator.h schedule.h batman-specific.h list.h os.h allocate.h bitarray.h hash.h all: batmand diff --git a/batman.c b/batman.c index a064718..9188dd9 100644 --- a/batman.c +++ b/batman.c @@ -27,7 +27,10 @@ #include "os.h" #include "list.h" #include "batman.h" -#include "allocate.h" +#include "orginator.h" +#include "schedule.h" + + /* "-d" is the command line switch for the debug level, * specify it multiple times to increase verbosity @@ -99,10 +102,10 @@ uint8_t found_ifs = 0; int32_t receive_max_sock = 0; fd_set receive_wait_set; +struct hashtable_t *orig_hash; -static LIST_HEAD(orig_list); -static LIST_HEAD(forw_list); -static LIST_HEAD(gw_list); +LIST_HEAD(forw_list); +LIST_HEAD(gw_list); LIST_HEAD(if_list); LIST_HEAD(hna_list); @@ -177,42 +180,6 @@ void verbose_usage( void ) { -/* this function finds or creates an originator entry for the given address if it does not exits */ -struct orig_node *get_orig_node( uint32_t addr ) { - - struct list_head *pos; - struct orig_node *orig_node; - - list_for_each( pos, &orig_list ) { - - orig_node = list_entry( pos, struct orig_node, list ); - - if ( orig_node->orig == addr ) - return orig_node; - - } - - debug_output( 4, "Creating new originator\n" ); - - orig_node = debugMalloc( sizeof(struct orig_node), 101 ); - memset(orig_node, 0, sizeof(struct orig_node)); - INIT_LIST_HEAD(&orig_node->list); - INIT_LIST_HEAD(&orig_node->neigh_list); - - orig_node->orig = addr; - orig_node->router = NULL; - - orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint32_t), 102 ); - memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint32_t) ); - - list_add_tail( &orig_node->list, &orig_list ); - - return orig_node; - -} - - - void add_del_hna( struct orig_node *orig_node, int8_t del ) { uint16_t hna_buff_count = 0; @@ -242,7 +209,7 @@ void add_del_hna( struct orig_node *orig_node, int8_t del ) { -static void choose_gw() { +void choose_gw() { struct list_head *pos; struct gw_node *gw_node, *tmp_curr_gw = NULL; @@ -353,7 +320,7 @@ static void choose_gw() { -static void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { +void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { static char orig_str[ADDR_STR_LEN], next_str[ADDR_STR_LEN]; @@ -403,7 +370,7 @@ static void update_routes( struct orig_node *orig_node, struct neigh_node *neigh /* add new announced network(s) */ if ( hna_buff_len > 0 ) { - orig_node->hna_buff = debugMalloc( hna_buff_len, 103 ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 101 ); orig_node->hna_buff_len = hna_buff_len; memmove( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -426,7 +393,7 @@ static void update_routes( struct orig_node *orig_node, struct neigh_node *neigh if ( hna_buff_len > 0 ) { - orig_node->hna_buff = debugMalloc( hna_buff_len, 104 ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 102 ); orig_node->hna_buff_len = hna_buff_len; memcpy( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -443,7 +410,7 @@ static void update_routes( struct orig_node *orig_node, struct neigh_node *neigh -static void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { +void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { struct list_head *gw_pos, *gw_pos_tmp; struct gw_node *gw_node; @@ -481,7 +448,7 @@ static void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { addr_to_string( orig_node->orig, orig_str, ADDR_STR_LEN ); debug_output( 3, "Found new gateway %s -> class: %i - %s\n", orig_str, new_gwflags, gw2string[new_gwflags] ); - gw_node = debugMalloc( sizeof(struct gw_node), 105 ); + gw_node = debugMalloc( sizeof(struct gw_node), 103 ); memset( gw_node, 0, sizeof(struct gw_node) ); INIT_LIST_HEAD( &gw_node->list ); @@ -497,136 +464,17 @@ static void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { -void debug() { +int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { - struct list_head *forw_pos, *orig_pos, *neigh_pos; - struct forw_node *forw_node; - struct orig_node *orig_node; - struct neigh_node *neigh_node; - struct gw_node *gw_node; - uint16_t batman_count = 0; - static char str[ADDR_STR_LEN], str2[ADDR_STR_LEN]; - - - if ( debug_clients.clients_num[1] > 0 ) { - - debug_output( 2, "BOD\n" ); - - if ( list_empty( &gw_list ) ) { - - debug_output( 2, "No gateways in range ...\n" ); - - } else { - - list_for_each( orig_pos, &gw_list ) { - - gw_node = list_entry( orig_pos, struct gw_node, list ); - - if ( gw_node->deleted ) - continue; - - addr_to_string( gw_node->orig_node->orig, str, sizeof (str) ); - addr_to_string( gw_node->orig_node->router->addr, str2, sizeof (str2) ); - - if ( curr_gateway == gw_node ) { - debug_output( 2, "=> %s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); - } else { - debug_output( 2, "%s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); - } - - } - - if ( batman_count == 0 ) - debug_output( 2, "No gateways in range ...\n" ); - - } - - } - - if ( ( debug_clients.clients_num[0] > 0 ) || ( debug_clients.clients_num[3] > 0 ) ) { - - debug_output( 1, "BOD\n" ); - - if ( debug_clients.clients_num[3] > 0 ) { - - debug_output( 4, "------------------ DEBUG ------------------\n" ); - debug_output( 4, "Forward list\n" ); - - list_for_each( forw_pos, &forw_list ) { - forw_node = list_entry( forw_pos, struct forw_node, list ); - addr_to_string( ((struct packet *)forw_node->pack_buff)->orig, str, sizeof (str) ); - debug_output( 4, " %s at %u\n", str, forw_node->send_time ); - } - - debug_output( 4, "Originator list\n" ); - - } - - list_for_each( orig_pos, &orig_list ) { - orig_node = list_entry( orig_pos, struct orig_node, list ); - - if ( orig_node->router == NULL ) - continue; - - batman_count++; - - addr_to_string( orig_node->orig, str, sizeof (str) ); - addr_to_string( orig_node->router->addr, str2, sizeof (str2) ); - - debug_output( 1, "%s, GW: %s(%i) via:", str, str2, orig_node->router->packet_count ); - debug_output( 4, "%s, GW: %s(%i), last_aware:%u via:\n", str, str2, orig_node->router->packet_count, orig_node->last_aware ); - - 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) ); - - debug_output( 1, " %s(%i)", str, neigh_node->packet_count ); - debug_output( 4, "\t\t%s (%d)\n", str, neigh_node->packet_count ); - - } - - debug_output( 1, "\n" ); - - } - - if ( batman_count == 0 ) { - - debug_output( 1, "No batman nodes in range ...\n" ); - debug_output( 4, "No batman nodes in range ...\n" ); - - } - - debug_output( 4, "---------------------------------------------- END DEBUG\n" ); - - } - -} - - - -int isDuplicate( uint32_t orig, uint16_t seqno ) { - - struct list_head *orig_pos, *neigh_pos; - struct orig_node *orig_node; + struct list_head *neigh_pos; struct neigh_node *neigh_node; - list_for_each( orig_pos, &orig_list ) { - orig_node = list_entry( orig_pos, struct orig_node, list ); - - if ( orig == orig_node->orig ) { - - list_for_each( neigh_pos, &orig_node->neigh_list ) { - neigh_node = list_entry( neigh_pos, struct neigh_node, list ); - - if ( get_bit_status( neigh_node->seq_bits, orig_node->last_seqno, seqno ) ) - return 1; - - } + list_for_each( neigh_pos, &orig_node->neigh_list ) { - return 0; + neigh_node = list_entry( neigh_pos, struct neigh_node, list ); - } + if ( get_bit_status( neigh_node->seq_bits, orig_node->last_seqno, seqno ) ) + return 1; } @@ -647,434 +495,18 @@ int isBidirectionalNeigh( struct orig_node *orig_neigh_node, struct batman_if *i -void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { - - struct list_head *neigh_pos; - struct neigh_node *neigh_node = NULL, *tmp_neigh_node, *best_neigh_node; - uint8_t max_packet_count = 0, is_new_seqno = 0; - - - debug_output( 4, "update_originator(): Searching and updating originator entry of received packet, \n" ); - - - list_for_each( neigh_pos, &orig_node->neigh_list ) { - - tmp_neigh_node = list_entry( neigh_pos, struct neigh_node, list ); - - if ( ( tmp_neigh_node->addr == neigh ) && ( tmp_neigh_node->if_incoming == if_incoming ) ) { - - neigh_node = tmp_neigh_node; - - } else { - - bit_get_packet( tmp_neigh_node->seq_bits, in->seqno - orig_node->last_seqno, 0 ); - tmp_neigh_node->packet_count = bit_packet_count( tmp_neigh_node->seq_bits ); - - if ( tmp_neigh_node->packet_count > max_packet_count ) { - - max_packet_count = tmp_neigh_node->packet_count; - best_neigh_node = tmp_neigh_node; - - } - - } - - } - - if ( neigh_node == NULL ) { - - debug_output( 4, "Creating new last-hop neighbour of originator\n" ); - - neigh_node = debugMalloc( sizeof (struct neigh_node), 106 ); - memset( neigh_node, 0, sizeof(struct neigh_node) ); - INIT_LIST_HEAD( &neigh_node->list ); - - neigh_node->addr = neigh; - neigh_node->if_incoming = if_incoming; - - list_add_tail( &neigh_node->list, &orig_node->neigh_list ); - - } else { - - debug_output( 4, "Updating existing last-hop neighbour of originator\n" ); - - } - - - is_new_seqno = bit_get_packet( neigh_node->seq_bits, in->seqno - orig_node->last_seqno, 1 ); - neigh_node->packet_count = bit_packet_count( neigh_node->seq_bits ); - - if ( neigh_node->packet_count > max_packet_count ) { - - max_packet_count = neigh_node->packet_count; - best_neigh_node = neigh_node; - - } - - - neigh_node->last_aware = get_time(); - - if ( is_new_seqno ) { - - debug_output( 4, "updating last_seqno: old %d, new %d \n", orig_node->last_seqno, in->seqno ); - - orig_node->last_seqno = in->seqno; - neigh_node->last_ttl = in->ttl; - - } - - /* update routing table and check for changed hna announcements */ - update_routes( orig_node, best_neigh_node, hna_recv_buff, hna_buff_len ); - - if ( orig_node->gwflags != in->gwflags ) - update_gw_list( orig_node, in->gwflags ); - - orig_node->gwflags = in->gwflags; - -} - - - -void schedule_own_packet( struct batman_if *batman_if ) { - - struct forw_node *forw_node_new, *forw_packet_tmp = NULL; - struct list_head *list_pos; - - - forw_node_new = debugMalloc( sizeof(struct forw_node), 107 ); - - INIT_LIST_HEAD( &forw_node_new->list ); - - forw_node_new->send_time = get_time() + orginator_interval - JITTER + rand_num( 2 * JITTER ); - forw_node_new->if_outgoing = batman_if; - forw_node_new->own = 1; - - if ( num_hna > 0 ) { - - forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char), 108 ); - memcpy( forw_node_new->pack_buff, (unsigned char *)&batman_if->out, sizeof(struct packet) ); - memcpy( forw_node_new->pack_buff + sizeof(struct packet), hna_buff, num_hna * 5 * sizeof(unsigned char) ); - forw_node_new->pack_buff_len = sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char); - - } else { - - forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 109 ); - memcpy( forw_node_new->pack_buff, &batman_if->out, sizeof(struct packet) ); - forw_node_new->pack_buff_len = sizeof(struct packet); - - } - - list_for_each( list_pos, &forw_list ) { - - forw_packet_tmp = list_entry( list_pos, struct forw_node, list ); - - if ( forw_packet_tmp->send_time > forw_node_new->send_time ) { - - list_add_before( &forw_list, list_pos, &forw_node_new->list ); - break; - - } - - } - - if ( ( forw_packet_tmp == NULL ) || ( forw_packet_tmp->send_time <= forw_node_new->send_time ) ) - list_add_tail( &forw_node_new->list, &forw_list ); - - batman_if->out.seqno++; - -} - - - -void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t directlink, unsigned char *hna_recv_buff, int16_t hna_buff_len, struct batman_if *if_outgoing ) { - - struct forw_node *forw_node_new; - - debug_output( 4, "schedule_forward_packet(): \n" ); - - if ( in->ttl <= 1 ) { - - debug_output( 4, "ttl exceeded \n" ); - - } else { - - forw_node_new = debugMalloc( sizeof(struct forw_node), 110 ); - - INIT_LIST_HEAD(&forw_node_new->list); - - if ( hna_buff_len > 0 ) { - - forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + hna_buff_len, 111 ); - memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); - memcpy( forw_node_new->pack_buff + sizeof(struct packet), hna_recv_buff, hna_buff_len ); - forw_node_new->pack_buff_len = sizeof(struct packet) + hna_buff_len; - - } else { - - forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 112 ); - memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); - forw_node_new->pack_buff_len = sizeof(struct packet); - - } - - - ((struct packet *)forw_node_new->pack_buff)->ttl--; - forw_node_new->send_time = get_time(); - forw_node_new->own = 0; - - forw_node_new->if_outgoing = if_outgoing; - - if ( unidirectional ) { - - ((struct packet *)forw_node_new->pack_buff)->flags = ( UNIDIRECTIONAL | DIRECTLINK ); - - } else if ( directlink ) { - - ((struct packet *)forw_node_new->pack_buff)->flags = DIRECTLINK; - - } else { - - ((struct packet *)forw_node_new->pack_buff)->flags = 0x00; - - } - - list_add( &forw_node_new->list, &forw_list ); - - } - -} - - - -void send_outstanding_packets() { - - struct forw_node *forw_node; - struct list_head *forw_pos, *if_pos, *temp; - struct batman_if *batman_if; - static char orig_str[ADDR_STR_LEN]; - uint8_t directlink; - uint32_t curr_time; - - - if ( list_empty( &forw_list ) ) - return; - - curr_time = get_time(); - - list_for_each_safe( forw_pos, temp, &forw_list ) { - forw_node = list_entry( forw_pos, struct forw_node, list ); - - if ( forw_node->send_time <= curr_time ) { - - addr_to_string( ((struct packet *)forw_node->pack_buff)->orig, orig_str, ADDR_STR_LEN ); - - directlink = ( ( ((struct packet *)forw_node->pack_buff)->flags & DIRECTLINK ) ? 1 : 0 ); - - ((struct packet *)forw_node->pack_buff)->seqno = htons( ((struct packet *)forw_node->pack_buff)->seqno ); /* change sequence number to network order */ - - - if ( ((struct packet *)forw_node->pack_buff)->flags & UNIDIRECTIONAL ) { - - if ( forw_node->if_outgoing != NULL ) { - - debug_output( 4, "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ntohs( ((struct packet *)forw_node->pack_buff)->seqno ), ((struct packet *)forw_node->pack_buff)->ttl, forw_node->if_outgoing->dev ); - - if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { - exit( -1 ); - } - - } else { - - debug_output( 0, "Error - can't forward packet with UDF: outgoing iface not specified \n" ); - - } - - /* multihomed peer assumed */ - } else if ( ( directlink ) && ( ((struct packet *)forw_node->pack_buff)->ttl == 1 ) ) { - - if ( ( forw_node->if_outgoing != NULL ) ) { - - if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { - exit( -1 ); - } - - } else { - - debug_output( 0, "Error - can't forward packet with IDF: outgoing iface not specified (multihomed) \n" ); - - } - - } else { - - if ( ( directlink ) && ( forw_node->if_outgoing == NULL ) ) { - - debug_output( 0, "Error - can't forward packet with IDF: outgoing iface not specified \n" ); - - } else { - - list_for_each(if_pos, &if_list) { - - batman_if = list_entry(if_pos, struct batman_if, list); - - if ( ( directlink ) && ( forw_node->if_outgoing == batman_if ) ) { - ((struct packet *)forw_node->pack_buff)->flags = DIRECTLINK; - } else { - ((struct packet *)forw_node->pack_buff)->flags = 0x00; - } - - debug_output( 4, "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ntohs( ((struct packet *)forw_node->pack_buff)->seqno ), ((struct packet *)forw_node->pack_buff)->ttl, batman_if->dev ); - - /* non-primary interfaces do not send hna information */ - if ( ( forw_node->own ) && ( ((struct packet *)forw_node->pack_buff)->orig != ((struct batman_if *)if_list.next)->addr.sin_addr.s_addr ) ) { - - if ( send_packet( forw_node->pack_buff, sizeof(struct packet), &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { - exit( -1 ); - } - - } else { - - if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { - exit( -1 ); - } - - } - - } +void send_vis_packet() { - } - - } - - list_del( forw_pos ); - - if ( forw_node->own ) - schedule_own_packet( forw_node->if_outgoing ); - - debugFree( forw_node->pack_buff, 1102 ); - debugFree( forw_node, 1103 ); - - } else { - - break; - - } - - } - -} - - - -void purge( uint32_t curr_time ) { - - struct list_head *orig_pos, *neigh_pos, *orig_temp, *neigh_temp; - struct list_head *gw_pos, *gw_pos_tmp; - struct orig_node *orig_node; - struct neigh_node *neigh_node; - struct gw_node *gw_node; - uint8_t gw_purged = 0; - static char orig_str[ADDR_STR_LEN]; - - debug_output( 4, "purge() \n" ); - - /* for all origins... */ - list_for_each_safe( orig_pos, orig_temp, &orig_list ) { - - orig_node = list_entry( orig_pos, struct orig_node, list ); - - if ( (int)( ( orig_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { - - addr_to_string(orig_node->orig, orig_str, ADDR_STR_LEN); - debug_output( 4, "Orginator timeout: originator %s, last_aware %u)\n", orig_str, orig_node->last_aware ); - - /* for all neighbours towards this orginator ... */ - list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { - neigh_node = list_entry(neigh_pos, struct neigh_node, list); - - list_del( neigh_pos ); - debugFree( neigh_node, 1104 ); - - } - - list_for_each_safe( gw_pos, gw_pos_tmp, &gw_list ) { - - gw_node = list_entry( gw_pos, struct gw_node, list ); - - if ( gw_node->deleted ) - continue; - - if ( gw_node->orig_node == orig_node ) { - - addr_to_string( gw_node->orig_node->orig, orig_str, ADDR_STR_LEN ); - debug_output( 3, "Removing gateway %s from gateway list\n", orig_str ); - - gw_node->deleted = get_time(); - - gw_purged = 1; - - break; - - } - - } - - list_del( orig_pos ); - - update_routes( orig_node, NULL, NULL, 0 ); - - debugFree( orig_node->bidirect_link, 1105 ); - debugFree( orig_node, 1106 ); - - } else { - - /* for all neighbours towards this orginator ... */ - list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { - - neigh_node = list_entry( neigh_pos, struct neigh_node, list ); - - if ( (int)( ( neigh_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { - - list_del( neigh_pos ); - debugFree( neigh_node, 1107 ); - - } - - } - - } - - } - - list_for_each_safe(gw_pos, gw_pos_tmp, &gw_list) { - - gw_node = list_entry(gw_pos, struct gw_node, list); - - if ( ( gw_node->deleted ) && ( (int)((gw_node->deleted + 3 * TIMEOUT) < curr_time) ) ) { - - list_del( gw_pos ); - debugFree( gw_pos, 1108 ); - - } - - } - - if ( gw_purged ) - choose_gw(); - -} - - - -void send_vis_packet() -{ - struct list_head *pos; + struct hash_it_t *hashit = NULL; struct orig_node *orig_node; unsigned char *packet=NULL; int step = 5, size=0,cnt=0; - list_for_each(pos, &orig_list) { - orig_node = list_entry(pos, struct orig_node, list); + while ( NULL != ( hashit = hash_iterate( orig_hash, hashit ) ) ) { + + orig_node = hashit->bucket->data; + if ( ( orig_node->router != NULL ) && ( orig_node->orig == orig_node->router->addr ) ) { if(cnt >= size) @@ -1090,10 +522,12 @@ void send_vis_packet() if(packet != NULL) { send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); - debugFree( packet, 1109 ); + debugFree( packet, 1102 ); } } + + int8_t batman() { struct list_head *if_pos, *neigh_pos, *hna_pos, *hna_pos_tmp, *forw_pos, *forw_pos_tmp; @@ -1114,6 +548,9 @@ int8_t batman() { debug_timeout = get_time(); bidirectional_timeout = orginator_interval * 3; + if ( NULL == ( orig_hash = hash_new( 128, orig_comp, orig_choose ) ) ) + return(-1); + if ( !( list_empty( &hna_list ) ) ) { list_for_each( hna_pos, &hna_list ) { @@ -1296,7 +733,7 @@ int8_t batman() { orig_neigh_node = get_orig_node( neigh ); - is_duplicate = isDuplicate( ((struct packet *)&in)->orig, ((struct packet *)&in)->seqno ); + is_duplicate = isDuplicate( orig_node, ((struct packet *)&in)->seqno ); is_bidirectional = isBidirectionalNeigh( orig_neigh_node, if_incoming ); /* update ranking */ @@ -1385,13 +822,13 @@ int8_t batman() { send_outstanding_packets(); - purge( get_time() ); + purge_orginator( get_time() ); if ( debug_timeout + 1000 < get_time() ) { debug_timeout = get_time(); - debug(); + debug_orginator(); checkIntegrity(); @@ -1404,22 +841,25 @@ int8_t batman() { } + if ( debug_level > 0 ) printf( "Deleting all BATMAN routes\n" ); - purge( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); + purge_orginator( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); + + hash_delete( orig_hash ); list_for_each_safe( hna_pos, hna_pos_tmp, &hna_list ) { hna_node = list_entry(hna_pos, struct hna_node, list); - debugFree( hna_node, 1110 ); + debugFree( hna_node, 1103 ); } if ( hna_buff != NULL ) - debugFree( hna_buff, 1111 ); + debugFree( hna_buff, 1104 ); list_for_each_safe( forw_pos, forw_pos_tmp, &forw_list ) { @@ -1427,8 +867,8 @@ int8_t batman() { list_del( forw_pos ); - debugFree( forw_node->pack_buff, 1112 ); - debugFree( forw_node, 1113 ); + debugFree( forw_node->pack_buff, 1105 ); + debugFree( forw_node, 1106 ); } diff --git a/batman.h b/batman.h index 3801b74..134eb23 100644 --- a/batman.h +++ b/batman.h @@ -26,6 +26,9 @@ #include <stdint.h> #include "list.h" #include "bitarray.h" +#include "hash.h" +#include "allocate.h" + #define SOURCE_VERSION "0.2 alpha" @@ -73,12 +76,18 @@ extern uint8_t found_ifs; extern int32_t receive_max_sock; extern fd_set receive_wait_set; +extern struct hashtable_t *orig_hash; + extern struct list_head if_list; extern struct list_head hna_list; +extern struct list_head gw_list; +extern struct list_head forw_list; extern struct vis_if vis_if; extern struct unix_if unix_if; extern struct debug_clients debug_clients; +extern char *gw2string[]; + struct packet { uint32_t orig; @@ -91,8 +100,8 @@ struct packet struct orig_node /* structure for orig_list maintaining nodes of mesh */ { - struct list_head list; uint32_t orig; + struct list_head list; struct neigh_node *router; struct batman_if *batman_if; uint32_t *bidirect_link; /* if node is a bidrectional neighbour, when my originator packet was broadcasted (replied) by this node and received by me */ @@ -204,9 +213,17 @@ struct curr_gw_data { int8_t batman( void ); -void usage( void ); -void verbose_usage( void ); -void del_default_route(); +void usage( void ); +void verbose_usage( void ); +void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ); +void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ); +void choose_gw(); +void del_default_route(); int8_t add_default_route(); +void debug_output( int8_t debug_prio, char *format, ... ); +uint32_t get_time( void ); +void addr_to_string( uint32_t addr, char *str, int32_t len ); +int32_t rand_num( int32_t limit ); +int8_t send_packet( unsigned char *packet_buff, int32_t packet_buff_len, struct sockaddr_in *broad, int32_t send_sock ); #endif diff --git a/hash.c b/hash.c new file mode 100644 index 0000000..067fe39 --- /dev/null +++ b/hash.c @@ -0,0 +1,263 @@ +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + +#include <stdio.h> /* NULL */ +#include "batman.h" + +/* clears the hash */ +void hash_init(struct hashtable_t *hash) { + int i; + hash->elements=0; + for (i=0 ; i<hash->size ; i++) { + hash->table[i].data= NULL; + hash->table[i].next= NULL; + } +} + + +/* remove the hash structure. if hashdata_free_cb != NULL, + * this function will be called to remove the elements inside of the hash. + * if you don't remove the elements, memory might be leaked. */ +/*void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) { + struct element_t *bucket, *last_bucket; + int i; + + for (i=0; i<hash->size; i++) { + if (hash->table[i].data != NULL) { + if (free_cb!=NULL) free_cb( hash->table[i].data ); + + bucket= hash->table[i].next; + while (bucket != NULL) { + if (free_cb!=NULL) free_cb( hash->table[i].data ); + last_bucket= bucket; + bucket= bucket->next; + debugFree(last_bucket, 1301); + } + } + } +}*/ + + + +/* FYI: purge deletes all elements within that structure but we should free the hash itself !*/ +void hash_delete(struct hashtable_t *hash) { + + debugFree( hash->table, 1301 ); + debugFree( hash, 1302 ); + +} + + + + +/* iterate though the hash. first element is selected with iter_in NULL. + * use the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in) { + struct hash_it_t *iter; + + if (iter_in == NULL) { + iter= debugMalloc(sizeof(struct hash_it_t), 301); + iter->index = -1; + iter->bucket = NULL; + } else + iter= iter_in; + if ( iter->bucket!=NULL ) { + iter->bucket = iter->bucket->next; /* choose next */ + if (iter->bucket !=NULL) /* if fine, return it */ + return(iter); + } + iter->index++; + while ( iter->index < hash->size ) { /* go through the entries of the hash table */ + if ((hash->table[ iter->index ].data) != NULL){ + iter->bucket = &(hash->table[ iter->index ]); + return(iter); /* if this table entry is not null, return it */ + } else + iter->index++; /* else, go to the next */ + } + /* nothing to iterate over anymore */ + debugFree(iter, 1303); + return(NULL); +} + + +/* allocates and clears the hash */ +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose) { + struct hashtable_t *hash; + + hash= debugMalloc( sizeof(struct hashtable_t) , 302); + if ( hash == NULL ) /* could not allocate the hash control structure */ + return (NULL); + + hash->size= size; + hash->table= debugMalloc( sizeof(struct element_t) * size, 303); + if ( hash->table == NULL ) { /* could not allocate the table */ + debugFree(hash, 1304); + return(NULL); + } + hash->compare= compare; + hash->choose= choose; + return(hash); +} + + +/* adds data to the hashtable. returns 0 on success, -1 on error */ +int hash_add(struct hashtable_t *hash, void *data) { + int index; + struct element_t *bucket, *new_bucket; + + index = hash->choose( data , hash->size ); + bucket = &(hash->table[index]); + + if ( bucket->data==NULL ) { /* bucket is empty, put it in */ + bucket->data=data; + hash->elements++; + return(0); + } else { + new_bucket= bucket; + do { + if (0 == hash->compare( new_bucket->data, data )) { /* already added, don't add again */ + return(-1); + } + bucket= new_bucket; + new_bucket= bucket->next; + } while ( new_bucket!=NULL); + + /* found the tail of the list, add new element */ + if (NULL == (new_bucket= debugMalloc(sizeof(struct element_t),304))) + return(-1); /* debugMalloc failed */ + + new_bucket->data= data; /* init the new bucket */ + new_bucket->next= NULL; + bucket->next= new_bucket; /* and link it */ + hash->elements++; + return(0); + + } +} +/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ +void *hash_find(struct hashtable_t *hash, void *keydata) { + int index; + struct element_t *bucket; + + index = hash->choose( keydata , hash->size ); + bucket = &(hash->table[index]); + + if ( bucket->data!=NULL ) { + do { + if (0 == hash->compare( bucket->data, keydata )) { + return( bucket->data ); + } + bucket= bucket->next; + } while ( bucket!=NULL ); + } + return(NULL); + +} + + +/* removes data from hash, if found. returns pointer do data on success, + * so you can remove the used structure yourself, or NULL on error . + * data could be the structure you use with just the key filled, + * we just need the key for comparing. */ +void *hash_remove(struct hashtable_t *hash, void *data) { + int index; + struct element_t *bucket, *last_bucket; + void *data_save; + + index = hash->choose( data , hash->size ); + bucket = &(hash->table[index]); + + if (bucket->data != NULL) { + last_bucket=NULL; + do { + if (0 == hash->compare( bucket->data, data )) { /* found entry, delete it. */ + data_save = bucket->data; /* save the pointer to the data */ + if ( last_bucket == NULL ) { /* we're on the first entry */ + if ( bucket->next == NULL ) { /* there is no next bucket, nothing to preserve. */ + bucket->data= NULL; + } else { /* else, move the second bucket onto the first one */ + bucket->data= bucket->next->data; + bucket->next= bucket->next->next; + } + } else { /* not the first entry */ + last_bucket->next= bucket->next; + debugFree(bucket, 1305); + } + + hash->elements--; + return( data_save ); + } + last_bucket= bucket; + bucket= bucket->next; + } while (bucket!=NULL); + } + + return(NULL); +} + + +/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success. */ +struct hashtable_t *hash_resize(struct hashtable_t *hash, int size) { + struct hashtable_t *new_hash; + struct element_t *bucket; + int i; + + /* initialize a new hash with the new size */ + if (NULL == (new_hash= hash_new(size, hash->compare, hash->choose))) + return(NULL); + + /* copy the elements */ + for (i=0; i<hash->size; i++) { + if (hash->table[i].data != NULL) { + hash_add( new_hash, hash->table[i].data ); + bucket= hash->table[i].next; + while (bucket != NULL) { + hash_add( new_hash, bucket->data ); + bucket= bucket->next; + } + } + } + hash_delete(hash); + + return( new_hash); + +} + + +/* print the hash table for debugging */ +void hash_debug( struct hashtable_t *hash) { + int i; + struct element_t *bucket; + for (i=0; i<hash->size;i++) { + printf("[%d] ",i); + if (hash->table[i].data != NULL) { + printf("[%10p] ", hash->table[i].data); + + + bucket= hash->table[i].next; + while (bucket != NULL) { + printf("-> [%10p] ", bucket->data); + bucket= bucket->next; + } + } + printf("\n"); + + } +} + diff --git a/hash.h b/hash.h new file mode 100644 index 0000000..8a05514 --- /dev/null +++ b/hash.h @@ -0,0 +1,79 @@ +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + +typedef int (*hashdata_compare_cb)(void *, void *); +typedef int (*hashdata_choose_cb)(void *, int); +typedef void (*hashdata_free_cb)(void *); + +struct element_t { + void *data; /* pointer to the data */ + struct element_t *next; /* overflow bucket pointer */ +}; + +struct hash_it_t { + int index; + struct element_t *bucket; +}; + +struct hashtable_t { + struct element_t *table; /* the hashtable itself, with the buckets */ + int elements; /* number of elements registered */ + int size; /* size of hashtable */ + hashdata_compare_cb compare; /* callback to a compare function. + * should compare 2 element datas for their keys, + * return 0 if same and not 0 if not same */ + hashdata_choose_cb choose; /* the hashfunction, should return an index based + * on the key in the data of the first argument + * and the size the second */ +}; + +/* clears the hash */ +void hash_init(struct hashtable_t *hash); + +/* allocates and clears the hash */ +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose); + +/* remove the hash structure. if hashdata_free_cb != NULL, + * this function will be called to remove the elements inside of the hash. + * if you don't remove the elements, memory might be leaked. */ +void hash_delete(struct hashtable_t *hash); + + +/* adds data to the hashtable. returns 0 on success, -1 on error */ +int hash_add(struct hashtable_t *hash, void *data); + +/* removes data from hash, if found. returns pointer do data on success, + * so you can remove the used structure yourself, or NULL on error . + * data could be the structure you use with just the key filled, + * we just need the key for comparing. */ +void *hash_remove(struct hashtable_t *hash, void *data); + +/* adds data to the hashtable. returns 0 on success, -1 on error */ +void *hash_find(struct hashtable_t *hash, void *keydata); + +/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success */ +struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); + +/* print the hash table for debugging */ +void hash_debug( struct hashtable_t *hash); + +/* iterate though the hash. first element is selected with iter_in NULL. + * use the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); + diff --git a/orginator.c b/orginator.c new file mode 100644 index 0000000..f4d59ca --- /dev/null +++ b/orginator.c @@ -0,0 +1,401 @@ +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich, Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + + +#include <string.h> +#include "batman.h" + + + +/* needed for hash, compares 2 struct orig_node, but only their ip-addresses. assumes that + * the ip address is the first field in the struct */ +int orig_comp(void *data1, void *data2) { + + return(memcmp(data1, data2, 4)); + +} + + + +/* hashfunction to choose an entry in a hash table of given size */ +/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ +int orig_choose(void *data, int32_t size) { + + unsigned char *key= data; + uint32_t hash = 0; + size_t i; + + for (i = 0; i < 4; i++) { + hash += key[i]; + hash += (hash << 10); + hash ^= (hash >> 6); + } + + hash += (hash << 3); + hash ^= (hash >> 11); + hash += (hash << 15); + + return (hash%size); + +} + + + +/* this function finds or creates an originator entry for the given address if it does not exits */ +struct orig_node *get_orig_node( uint32_t addr ) { + + struct orig_node *orig_node; + + + orig_node = ((struct orig_node *)hash_find( orig_hash, &addr )); + + if ( orig_node != NULL ) + return orig_node; + + + debug_output( 4, "Creating new originator\n" ); + + orig_node = debugMalloc( sizeof(struct orig_node), 401 ); + memset(orig_node, 0, sizeof(struct orig_node)); + INIT_LIST_HEAD(&orig_node->list); + INIT_LIST_HEAD(&orig_node->neigh_list); + + orig_node->orig = addr; + orig_node->router = NULL; + orig_node->batman_if = NULL; + + orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint32_t), 402 ); + memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint32_t) ); + + hash_add(orig_hash, orig_node); + if (orig_hash->elements * 4 > orig_hash->size) { + struct hashtable_t *swaphash; + swaphash = hash_resize(orig_hash, orig_hash->size*2); + if (swaphash == NULL) + debug_output( 0, "Couldn't resize hash table\n" ); + else + orig_hash = swaphash; + + } + + return orig_node; + +} + + + +void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { + + struct list_head *neigh_pos; + struct neigh_node *neigh_node = NULL, *tmp_neigh_node, *best_neigh_node; + uint8_t max_packet_count = 0, is_new_seqno = 0; + + + debug_output( 4, "update_originator(): Searching and updating originator entry of received packet, \n" ); + + + list_for_each( neigh_pos, &orig_node->neigh_list ) { + + tmp_neigh_node = list_entry( neigh_pos, struct neigh_node, list ); + + if ( ( tmp_neigh_node->addr == neigh ) && ( tmp_neigh_node->if_incoming == if_incoming ) ) { + + neigh_node = tmp_neigh_node; + + } else { + + bit_get_packet( tmp_neigh_node->seq_bits, in->seqno - orig_node->last_seqno, 0 ); + tmp_neigh_node->packet_count = bit_packet_count( tmp_neigh_node->seq_bits ); + + if ( tmp_neigh_node->packet_count > max_packet_count ) { + + max_packet_count = tmp_neigh_node->packet_count; + best_neigh_node = tmp_neigh_node; + + } + + } + + } + + if ( neigh_node == NULL ) { + + debug_output( 4, "Creating new last-hop neighbour of originator\n" ); + + neigh_node = debugMalloc( sizeof (struct neigh_node), 403 ); + memset( neigh_node, 0, sizeof(struct neigh_node) ); + INIT_LIST_HEAD( &neigh_node->list ); + + neigh_node->addr = neigh; + neigh_node->if_incoming = if_incoming; + + list_add_tail( &neigh_node->list, &orig_node->neigh_list ); + + } else { + + debug_output( 4, "Updating existing last-hop neighbour of originator\n" ); + + } + + + is_new_seqno = bit_get_packet( neigh_node->seq_bits, in->seqno - orig_node->last_seqno, 1 ); + neigh_node->packet_count = bit_packet_count( neigh_node->seq_bits ); + + if ( neigh_node->packet_count > max_packet_count ) { + + max_packet_count = neigh_node->packet_count; + best_neigh_node = neigh_node; + + } + + + neigh_node->last_aware = get_time(); + + if ( is_new_seqno ) { + + debug_output( 4, "updating last_seqno: old %d, new %d \n", orig_node->last_seqno, in->seqno ); + + orig_node->last_seqno = in->seqno; + neigh_node->last_ttl = in->ttl; + + } + + /* update routing table and check for changed hna announcements */ + update_routes( orig_node, best_neigh_node, hna_recv_buff, hna_buff_len ); + + if ( orig_node->gwflags != in->gwflags ) + update_gw_list( orig_node, in->gwflags ); + + orig_node->gwflags = in->gwflags; + +} + + + +void purge_orginator( uint32_t curr_time ) { + + struct hash_it_t *hashit = NULL; + struct list_head *neigh_pos, *neigh_temp; + struct list_head *gw_pos, *gw_pos_tmp; + struct orig_node *orig_node; + struct neigh_node *neigh_node; + struct gw_node *gw_node; + uint8_t gw_purged = 0; + static char orig_str[ADDR_STR_LEN]; + + debug_output( 4, "purge() \n" ); + + /* for all origins... */ + while ( NULL != ( hashit = hash_iterate( orig_hash, hashit ) ) ) { + + orig_node = hashit->bucket->data; + + if ( (int)( ( orig_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { + + addr_to_string(orig_node->orig, orig_str, ADDR_STR_LEN); + debug_output( 4, "Orginator timeout: originator %s, last_aware %u)\n", orig_str, orig_node->last_aware ); + + hash_remove( orig_hash, orig_node ); + + /* for all neighbours towards this orginator ... */ + list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { + neigh_node = list_entry(neigh_pos, struct neigh_node, list); + + list_del( neigh_pos ); + debugFree( neigh_node, 1401 ); + + } + + list_for_each( gw_pos, &gw_list ) { + + gw_node = list_entry( gw_pos, struct gw_node, list ); + + if ( gw_node->deleted ) + continue; + + if ( gw_node->orig_node == orig_node ) { + + addr_to_string( gw_node->orig_node->orig, orig_str, ADDR_STR_LEN ); + debug_output( 3, "Removing gateway %s from gateway list\n", orig_str ); + + gw_node->deleted = get_time(); + + gw_purged = 1; + + break; + + } + + } + + update_routes( orig_node, NULL, NULL, 0 ); + + debugFree( orig_node->bidirect_link, 1402 ); + debugFree( orig_node, 1403 ); + + } else { + + /* for all neighbours towards this orginator ... */ + list_for_each_safe( neigh_pos, neigh_temp, &orig_node->neigh_list ) { + + neigh_node = list_entry( neigh_pos, struct neigh_node, list ); + + if ( (int)( ( neigh_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { + + list_del( neigh_pos ); + debugFree( neigh_node, 1404 ); + + } + + } + + } + + } + + list_for_each_safe(gw_pos, gw_pos_tmp, &gw_list) { + + gw_node = list_entry(gw_pos, struct gw_node, list); + + if ( ( gw_node->deleted ) && ( (int)((gw_node->deleted + 3 * TIMEOUT) < curr_time) ) ) { + + list_del( gw_pos ); + debugFree( gw_pos, 1405 ); + + } + + } + + if ( gw_purged ) + choose_gw(); + +} + + + +void debug_orginator() { + + struct hash_it_t *hashit = NULL; + struct list_head *forw_pos, *orig_pos, *neigh_pos; + struct forw_node *forw_node; + struct orig_node *orig_node; + struct neigh_node *neigh_node; + struct gw_node *gw_node; + uint16_t batman_count = 0; + static char str[ADDR_STR_LEN], str2[ADDR_STR_LEN]; + + + if ( debug_clients.clients_num[1] > 0 ) { + + debug_output( 2, "BOD\n" ); + + if ( list_empty( &gw_list ) ) { + + debug_output( 2, "No gateways in range ...\n" ); + + } else { + + list_for_each( orig_pos, &gw_list ) { + + gw_node = list_entry( orig_pos, struct gw_node, list ); + + if ( gw_node->deleted ) + continue; + + addr_to_string( gw_node->orig_node->orig, str, sizeof (str) ); + addr_to_string( gw_node->orig_node->router->addr, str2, sizeof (str2) ); + + if ( curr_gateway == gw_node ) { + debug_output( 2, "=> %s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + } else { + debug_output( 2, "%s via: %s(%i), gw_class %i - %s, reliability: %i\n", str, str2, gw_node->orig_node->router->packet_count, gw_node->orig_node->gwflags, gw2string[gw_node->orig_node->gwflags], gw_node->unavail_factor ); + } + + } + + if ( batman_count == 0 ) + debug_output( 2, "No gateways in range ...\n" ); + + } + + } + + if ( ( debug_clients.clients_num[0] > 0 ) || ( debug_clients.clients_num[3] > 0 ) ) { + + debug_output( 1, "BOD\n" ); + + if ( debug_clients.clients_num[3] > 0 ) { + + debug_output( 4, "------------------ DEBUG ------------------\n" ); + debug_output( 4, "Forward list\n" ); + + list_for_each( forw_pos, &forw_list ) { + forw_node = list_entry( forw_pos, struct forw_node, list ); + addr_to_string( ((struct packet *)forw_node->pack_buff)->orig, str, sizeof (str) ); + debug_output( 4, " %s at %u\n", str, forw_node->send_time ); + } + + debug_output( 4, "Originator list\n" ); + + } + + while ( NULL != ( hashit = hash_iterate( orig_hash, hashit ) ) ) { + + orig_node = hashit->bucket->data; + + if ( orig_node->router == NULL ) + continue; + + batman_count++; + + addr_to_string( orig_node->orig, str, sizeof (str) ); + addr_to_string( orig_node->router->addr, str2, sizeof (str2) ); + + debug_output( 1, "%s, GW: %s(%i) via:", str, str2, orig_node->router->packet_count ); + debug_output( 4, "%s, GW: %s(%i), last_aware:%u via:\n", str, str2, orig_node->router->packet_count, orig_node->last_aware ); + + 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) ); + + debug_output( 1, " %s(%i)", str, neigh_node->packet_count ); + debug_output( 4, "\t\t%s (%d)\n", str, neigh_node->packet_count ); + + } + + debug_output( 1, "\n" ); + + } + + if ( batman_count == 0 ) { + + debug_output( 1, "No batman nodes in range ...\n" ); + debug_output( 4, "No batman nodes in range ...\n" ); + + } + + debug_output( 4, "---------------------------------------------- END DEBUG\n" ); + + } + +} + + diff --git a/allocate.h b/orginator.h similarity index 59% copy from allocate.h copy to orginator.h index 979e9b5..ece749b 100644 --- a/allocate.h +++ b/orginator.h @@ -1,6 +1,6 @@ -/* - * Copyright (C) 2006 B.A.T.M.A.N. contributors: - * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich, Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. @@ -18,16 +18,11 @@ */ -#ifndef _ALLOCATE_H -#define _ALLOCATE_H 1 -#include <stdint.h> - - -void checkIntegrity(void); -void checkLeak(void); -void *debugMalloc(uint32_t length, int32_t tag); -void *debugRealloc(void *memory, uint32_t length, int32_t tag); -void debugFree(void *memoryParameter, int32_t tag); +int orig_comp(void *data1, void *data2); +int orig_choose(void *data, int32_t size); +struct orig_node *get_orig_node( uint32_t addr ); +void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ); +void purge_orginator( uint32_t curr_time ); +void debug_orginator(); -#endif diff --git a/schedule.c b/schedule.c new file mode 100644 index 0000000..2fdb92f --- /dev/null +++ b/schedule.c @@ -0,0 +1,256 @@ +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich, Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + + +#include <string.h> +#include <stdlib.h> +#include "batman.h" + + + +void schedule_own_packet( struct batman_if *batman_if ) { + + struct forw_node *forw_node_new, *forw_packet_tmp = NULL; + struct list_head *list_pos; + + + forw_node_new = debugMalloc( sizeof(struct forw_node), 501 ); + + INIT_LIST_HEAD( &forw_node_new->list ); + + forw_node_new->send_time = get_time() + orginator_interval - JITTER + rand_num( 2 * JITTER ); + forw_node_new->if_outgoing = batman_if; + forw_node_new->own = 1; + + if ( num_hna > 0 ) { + + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char), 502 ); + memcpy( forw_node_new->pack_buff, (unsigned char *)&batman_if->out, sizeof(struct packet) ); + memcpy( forw_node_new->pack_buff + sizeof(struct packet), hna_buff, num_hna * 5 * sizeof(unsigned char) ); + forw_node_new->pack_buff_len = sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char); + + } else { + + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 503 ); + memcpy( forw_node_new->pack_buff, &batman_if->out, sizeof(struct packet) ); + forw_node_new->pack_buff_len = sizeof(struct packet); + + } + + list_for_each( list_pos, &forw_list ) { + + forw_packet_tmp = list_entry( list_pos, struct forw_node, list ); + + if ( forw_packet_tmp->send_time > forw_node_new->send_time ) { + + list_add_before( &forw_list, list_pos, &forw_node_new->list ); + break; + + } + + } + + if ( ( forw_packet_tmp == NULL ) || ( forw_packet_tmp->send_time <= forw_node_new->send_time ) ) + list_add_tail( &forw_node_new->list, &forw_list ); + + batman_if->out.seqno++; + +} + + + +void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t directlink, unsigned char *hna_recv_buff, int16_t hna_buff_len, struct batman_if *if_outgoing ) { + + struct forw_node *forw_node_new; + + debug_output( 4, "schedule_forward_packet(): \n" ); + + if ( in->ttl <= 1 ) { + + debug_output( 4, "ttl exceeded \n" ); + + } else { + + forw_node_new = debugMalloc( sizeof(struct forw_node), 504 ); + + INIT_LIST_HEAD(&forw_node_new->list); + + if ( hna_buff_len > 0 ) { + + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + hna_buff_len, 505 ); + memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); + memcpy( forw_node_new->pack_buff + sizeof(struct packet), hna_recv_buff, hna_buff_len ); + forw_node_new->pack_buff_len = sizeof(struct packet) + hna_buff_len; + + } else { + + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 506 ); + memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); + forw_node_new->pack_buff_len = sizeof(struct packet); + + } + + + ((struct packet *)forw_node_new->pack_buff)->ttl--; + forw_node_new->send_time = get_time(); + forw_node_new->own = 0; + + forw_node_new->if_outgoing = if_outgoing; + + if ( unidirectional ) { + + ((struct packet *)forw_node_new->pack_buff)->flags = ( UNIDIRECTIONAL | DIRECTLINK ); + + } else if ( directlink ) { + + ((struct packet *)forw_node_new->pack_buff)->flags = DIRECTLINK; + + } else { + + ((struct packet *)forw_node_new->pack_buff)->flags = 0x00; + + } + + list_add( &forw_node_new->list, &forw_list ); + + } + +} + + + +void send_outstanding_packets() { + + struct forw_node *forw_node; + struct list_head *forw_pos, *if_pos, *temp; + struct batman_if *batman_if; + static char orig_str[ADDR_STR_LEN]; + uint8_t directlink; + uint32_t curr_time; + + + if ( list_empty( &forw_list ) ) + return; + + curr_time = get_time(); + + list_for_each_safe( forw_pos, temp, &forw_list ) { + forw_node = list_entry( forw_pos, struct forw_node, list ); + + if ( forw_node->send_time <= curr_time ) { + + addr_to_string( ((struct packet *)forw_node->pack_buff)->orig, orig_str, ADDR_STR_LEN ); + + directlink = ( ( ((struct packet *)forw_node->pack_buff)->flags & DIRECTLINK ) ? 1 : 0 ); + + ((struct packet *)forw_node->pack_buff)->seqno = htons( ((struct packet *)forw_node->pack_buff)->seqno ); /* change sequence number to network order */ + + + if ( ((struct packet *)forw_node->pack_buff)->flags & UNIDIRECTIONAL ) { + + if ( forw_node->if_outgoing != NULL ) { + + debug_output( 4, "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ntohs( ((struct packet *)forw_node->pack_buff)->seqno ), ((struct packet *)forw_node->pack_buff)->ttl, forw_node->if_outgoing->dev ); + + if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { + exit(EXIT_FAILURE); + } + + } else { + + debug_output( 0, "Error - can't forward packet with UDF: outgoing iface not specified \n" ); + + } + + /* multihomed peer assumed */ + } else if ( ( directlink ) && ( ((struct packet *)forw_node->pack_buff)->ttl == 1 ) ) { + + if ( ( forw_node->if_outgoing != NULL ) ) { + + if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { + exit(EXIT_FAILURE); + } + + } else { + + debug_output( 0, "Error - can't forward packet with IDF: outgoing iface not specified (multihomed) \n" ); + + } + + } else { + + if ( ( directlink ) && ( forw_node->if_outgoing == NULL ) ) { + + debug_output( 0, "Error - can't forward packet with IDF: outgoing iface not specified \n" ); + + } else { + + list_for_each(if_pos, &if_list) { + + batman_if = list_entry(if_pos, struct batman_if, list); + + if ( ( directlink ) && ( forw_node->if_outgoing == batman_if ) ) { + ((struct packet *)forw_node->pack_buff)->flags = DIRECTLINK; + } else { + ((struct packet *)forw_node->pack_buff)->flags = 0x00; + } + + debug_output( 4, "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ntohs( ((struct packet *)forw_node->pack_buff)->seqno ), ((struct packet *)forw_node->pack_buff)->ttl, batman_if->dev ); + + /* non-primary interfaces do not send hna information */ + if ( ( forw_node->own ) && ( ((struct packet *)forw_node->pack_buff)->orig != ((struct batman_if *)if_list.next)->addr.sin_addr.s_addr ) ) { + + if ( send_packet( forw_node->pack_buff, sizeof(struct packet), &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { + exit(EXIT_FAILURE); + } + + } else { + + if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { + exit(EXIT_FAILURE); + } + + } + + } + + } + + } + + list_del( forw_pos ); + + if ( forw_node->own ) + schedule_own_packet( forw_node->if_outgoing ); + + debugFree( forw_node->pack_buff, 1501 ); + debugFree( forw_node, 1502 ); + + } else { + + break; + + } + + } + +} + + diff --git a/batman-specific.h b/schedule.h similarity index 65% copy from batman-specific.h copy to schedule.h index 47ebb22..4e11961 100644 --- a/batman-specific.h +++ b/schedule.h @@ -1,6 +1,6 @@ -/* - * Copyright (C) 2006 B.A.T.M.A.N. contributors: - * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich, Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. @@ -18,4 +18,6 @@ */ -#include "batman.h" +void schedule_own_packet( struct batman_if *batman_if ); +void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t directlink, unsigned char *hna_recv_buff, int16_t hna_buff_len, struct batman_if *if_outgoing ); +void send_outstanding_packets(); -- 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 09b9c9a8f02c0e5259da9aaff338fc97b6b49dd4 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 10 01:14:15 2007 +0100 internal cpu profiler added diff --git a/Makefile b/Makefile index 870c0a2..b3c6b9f 100644 --- a/Makefile +++ b/Makefile @@ -31,23 +31,23 @@ LDFLAGS = -lpthread UNAME=$(shell uname) ifeq ($(UNAME),Linux) -OS_OBJ= orginator.o schedule.o posix-specific.o posix.o linux-specific.o linux.o allocate.o bitarray.o hash.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o linux-specific.o linux.o allocate.o bitarray.o hash.o profile.o endif ifeq ($(UNAME),Darwin) -OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o profile.o endif ifeq ($(UNAME),FreeBSD) -OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o profile.o endif ifeq ($(UNAME),OpenBSD) -OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o +OS_OBJ= orginator.o schedule.o posix-specific.o posix.o bsd.o allocate.o bitarray.o hash.o profile.o endif -LINUX_SRC_C= batman.c orginator.c schedule.c posix-specific.c posix.c linux-specific.c linux.c allocate.c bitarray.c hash.c -LINUX_SRC_H= batman.h orginator.h schedule.h batman-specific.h list.h os.h allocate.h bitarray.h hash.h +LINUX_SRC_C= batman.c orginator.c schedule.c posix-specific.c posix.c linux-specific.c linux.c allocate.c bitarray.c hash.c profile.c +LINUX_SRC_H= batman.h orginator.h schedule.h batman-specific.h list.h os.h allocate.h bitarray.h hash.h profile.h all: batmand diff --git a/allocate.c b/allocate.c index 46e4164..fab9849 100644 --- a/allocate.c +++ b/allocate.c @@ -26,7 +26,7 @@ #include "allocate.h" #define DEBUG_MALLOC -/*#define MEMORY_USAGE*/ +#define MEMORY_USAGE #define MAGIC_NUMBER 0x12345678 diff --git a/batman.c b/batman.c index 9188dd9..e89535e 100644 --- a/batman.c +++ b/batman.c @@ -211,15 +211,20 @@ void add_del_hna( struct orig_node *orig_node, int8_t del ) { void choose_gw() { + prof_start( PROF_choose_gw ); struct list_head *pos; struct gw_node *gw_node, *tmp_curr_gw = NULL; uint8_t max_gw_class = 0, max_packets = 0, max_gw_factor = 0; static char orig_str[ADDR_STR_LEN]; - if ( routing_class == 0 ) + if ( routing_class == 0 ) { + + prof_stop( PROF_choose_gw ); return; + } + if ( list_empty(&gw_list) ) { if ( curr_gateway != NULL ) { @@ -230,6 +235,7 @@ void choose_gw() { } + prof_stop( PROF_choose_gw ); return; } @@ -316,12 +322,15 @@ void choose_gw() { } + prof_stop( PROF_choose_gw ); + } void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { + prof_start( PROF_update_routes ); static char orig_str[ADDR_STR_LEN], next_str[ADDR_STR_LEN]; @@ -406,12 +415,15 @@ void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, } + prof_stop( PROF_update_routes ); + } void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { + prof_start( PROF_update_gw_list ); struct list_head *gw_pos, *gw_pos_tmp; struct gw_node *gw_node; static char orig_str[ADDR_STR_LEN]; @@ -438,6 +450,7 @@ void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { } + prof_stop( PROF_update_gw_list ); choose_gw(); return; @@ -458,6 +471,8 @@ void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { list_add_tail( &gw_node->list, &gw_list ); + prof_stop( PROF_update_gw_list ); + choose_gw(); } @@ -466,6 +481,7 @@ void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { + prof_start( PROF_is_duplicate ); struct list_head *neigh_pos; struct neigh_node *neigh_node; @@ -473,11 +489,17 @@ int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { neigh_node = list_entry( neigh_pos, struct neigh_node, list ); - if ( get_bit_status( neigh_node->seq_bits, orig_node->last_seqno, seqno ) ) + if ( get_bit_status( neigh_node->seq_bits, orig_node->last_seqno, seqno ) ) { + + prof_stop( PROF_is_duplicate ); return 1; + } + } + prof_stop( PROF_is_duplicate ); + return 0; } @@ -551,6 +573,17 @@ int8_t batman() { if ( NULL == ( orig_hash = hash_new( 128, orig_comp, orig_choose ) ) ) return(-1); + /* for profiling the functions */ + prof_init( PROF_choose_gw, "choose_gw" ); + prof_init( PROF_update_routes, "update_routes" ); + prof_init( PROF_update_gw_list, "update_gw_list" ); + prof_init( PROF_is_duplicate, "isDuplicate" ); + prof_init( PROF_get_orig_node, "get_orig_node" ); + prof_init( PROF_update_originator, "update_originator" ); + prof_init( PROF_purge_orginator, "purge_orginator" ); + prof_init( PROF_schedule_forward_packet, "schedule_forward_packet" ); + prof_init( PROF_send_outstanding_packets, "send_outstanding_packets" ); + if ( !( list_empty( &hna_list ) ) ) { list_for_each( hna_pos, &hna_list ) { diff --git a/batman.h b/batman.h index 134eb23..4edf79b 100644 --- a/batman.h +++ b/batman.h @@ -28,10 +28,11 @@ #include "bitarray.h" #include "hash.h" #include "allocate.h" +#include "profile.h" -#define SOURCE_VERSION "0.2 alpha" +#define SOURCE_VERSION "0.2 alpha (debug)" #define COMPAT_VERSION 2 #define PORT 1966 #define UNIDIRECTIONAL 0x80 @@ -40,6 +41,8 @@ #define UNIX_PATH "/var/run/batmand.socket" +#define PROFILE_DATA + /* * No configuration files or fancy command line switches yet diff --git a/hash.c b/hash.c index 067fe39..84f7ffd 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,6 @@ /* Copyright (C) 2006 B.A.T.M.A.N. contributors: - * Simon Wunderlich + * Simon Wunderlich, Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. diff --git a/hash.h b/hash.h index 8a05514..71b4c8c 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,6 @@ /* Copyright (C) 2006 B.A.T.M.A.N. contributors: - * Simon Wunderlich + * Simon Wunderlich, Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. diff --git a/orginator.c b/orginator.c index f4d59ca..d720c87 100644 --- a/orginator.c +++ b/orginator.c @@ -61,14 +61,19 @@ int orig_choose(void *data, int32_t size) { /* this function finds or creates an originator entry for the given address if it does not exits */ struct orig_node *get_orig_node( uint32_t addr ) { + prof_start( PROF_get_orig_node ); struct orig_node *orig_node; orig_node = ((struct orig_node *)hash_find( orig_hash, &addr )); - if ( orig_node != NULL ) + if ( orig_node != NULL ) { + + prof_stop( PROF_get_orig_node ); return orig_node; + } + debug_output( 4, "Creating new originator\n" ); @@ -95,6 +100,8 @@ struct orig_node *get_orig_node( uint32_t addr ) { } + prof_stop( PROF_get_orig_node ); + return orig_node; } @@ -103,6 +110,7 @@ struct orig_node *get_orig_node( uint32_t addr ) { void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { + prof_start( PROF_update_originator ); struct list_head *neigh_pos; struct neigh_node *neigh_node = NULL, *tmp_neigh_node, *best_neigh_node; uint8_t max_packet_count = 0, is_new_seqno = 0; @@ -185,12 +193,15 @@ void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t orig_node->gwflags = in->gwflags; + prof_stop( PROF_update_originator ); + } void purge_orginator( uint32_t curr_time ) { + prof_start( PROF_purge_orginator ); struct hash_it_t *hashit = NULL; struct list_head *neigh_pos, *neigh_temp; struct list_head *gw_pos, *gw_pos_tmp; @@ -286,6 +297,8 @@ void purge_orginator( uint32_t curr_time ) { if ( gw_purged ) choose_gw(); + prof_stop( PROF_purge_orginator ); + } @@ -396,6 +409,9 @@ void debug_orginator() { } + if ( debug_clients.clients_num[2] > 0 ) + prof_print(); + } diff --git a/profile.c b/profile.c new file mode 100644 index 0000000..64e6e6c --- /dev/null +++ b/profile.c @@ -0,0 +1,101 @@ +/* Copyright (C) 2006 B.A.T.M.A.N. contributors: + * Simon Wunderlich, Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + + +#include "batman.h" + + + +#if defined PROFILE_DATA + + +static struct prof_container prof_container[PROF_COUNT]; + + + +void prof_init( int32_t index, char *name ) { + + prof_container[index].total_time = 0; + prof_container[index].calls = 0; + prof_container[index].name = name; + +} + + + +void prof_start( int32_t index ) { + + prof_container[index].start_time = clock(); + +} + + + +void prof_stop( int32_t index ) { + + prof_container[index].calls++; + prof_container[index].total_time += clock() - prof_container[index].start_time; + +} + + +void prof_print() { + + int32_t index; + + debug_output( 3, "\nProfile data:\n" ); + + for ( index = 0; index < PROF_COUNT; index++ ) { + + debug_output( 3, " %''30s: cpu time = %10.3f, calls = %i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); + + } + + debug_output( 3, "\n" ); + +} + + +#else + + +void prof_init( int32_t index, char *name ) { + +} + + + +void prof_start( int32_t index ) { + +} + + + +void prof_stop( int32_t index ) { + +} + + +void prof_print() { + +} + + +#endif diff --git a/orginator.h b/profile.h similarity index 61% copy from orginator.h copy to profile.h index ece749b..653c7f4 100644 --- a/orginator.h +++ b/profile.h @@ -19,10 +19,33 @@ -int orig_comp(void *data1, void *data2); -int orig_choose(void *data, int32_t size); -struct orig_node *get_orig_node( uint32_t addr ); -void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ); -void purge_orginator( uint32_t curr_time ); -void debug_orginator(); +enum { + PROF_choose_gw, + PROF_update_routes, + PROF_update_gw_list, + PROF_is_duplicate, + PROF_get_orig_node, + PROF_update_originator, + PROF_purge_orginator, + PROF_schedule_forward_packet, + PROF_send_outstanding_packets, + PROF_COUNT + +}; + + +struct prof_container { + + clock_t start_time; + clock_t total_time; + char *name; + uint32_t calls; + +}; + + +void prof_init( int32_t index, char *name ); +void prof_start( int32_t index ); +void prof_stop( int32_t index ); +void prof_print(); diff --git a/schedule.c b/schedule.c index 2fdb92f..0ea0136 100644 --- a/schedule.c +++ b/schedule.c @@ -78,6 +78,7 @@ void schedule_own_packet( struct batman_if *batman_if ) { void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t directlink, unsigned char *hna_recv_buff, int16_t hna_buff_len, struct batman_if *if_outgoing ) { + prof_start( PROF_schedule_forward_packet ); struct forw_node *forw_node_new; debug_output( 4, "schedule_forward_packet(): \n" ); @@ -132,12 +133,15 @@ void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t } + prof_stop( PROF_schedule_forward_packet ); + } void send_outstanding_packets() { + prof_start( PROF_send_outstanding_packets ); struct forw_node *forw_node; struct list_head *forw_pos, *if_pos, *temp; struct batman_if *batman_if; @@ -251,6 +255,8 @@ void send_outstanding_packets() { } + prof_stop( PROF_send_outstanding_packets ); + } -- 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 a9e259cceddb2d602bbaa4c3b0cbe7a06c770057 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 10 13:09:37 2007 +0100 exit gracefully on sigsegv code cleanup diff --git a/allocate.c b/allocate.c index fab9849..cd43162 100644 --- a/allocate.c +++ b/allocate.c @@ -147,7 +147,7 @@ void checkIntegrity(void) for ( memoryWalker = memoryList; memoryWalker != NULL; memoryWalker = memoryWalker->next ) { if ( memoryWalker->counter != 0 ) - fprintf( stderr, " tag: %i, num malloc: %i, bytes per malloc: %i, total: %i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); + fprintf( stderr, " tag: %''4i, num malloc: %''4i, bytes per malloc: %''4i, total: %''6i\n", memoryWalker->tag, memoryWalker->counter, memoryWalker->length, memoryWalker->counter * memoryWalker->length ); } diff --git a/batman.c b/batman.c index e89535e..6167373 100644 --- a/batman.c +++ b/batman.c @@ -558,19 +558,19 @@ int8_t batman() { struct neigh_node *neigh_node; struct hna_node *hna_node; struct forw_node *forw_node; - uint32_t neigh, hna, netmask, debug_timeout, select_timeout; + uint32_t neigh, hna, netmask, debug_timeout, select_timeout, curr_time; unsigned char in[1501], *hna_recv_buff; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; int16_t hna_buff_count, hna_buff_len; uint8_t forward_old, if_rp_filter_all_old, if_rp_filter_default_old; uint8_t is_my_addr, is_my_orig, is_broadcast, is_duplicate, is_bidirectional, forward_duplicate_packet; int8_t res; - uint32_t time_count = 0, curr_time; + debug_timeout = get_time(); bidirectional_timeout = orginator_interval * 3; - if ( NULL == ( orig_hash = hash_new( 128, orig_comp, orig_choose ) ) ) + if ( NULL == ( orig_hash = hash_new( 128, compare_orig, choose_orig ) ) ) return(-1); /* for profiling the functions */ @@ -631,12 +631,6 @@ int8_t batman() { debug_output( 4, " \n \n" ); - if(vis_if.sock && time_count == 50) - { - time_count = 0; - send_vis_packet(); - } - /* harden select_timeout against sudden time change (e.g. ntpdate) */ curr_time = get_time(); select_timeout = ( curr_time < ((struct forw_node *)forw_list.next)->send_time ? ((struct forw_node *)forw_list.next)->send_time - curr_time : 10 ); @@ -673,28 +667,6 @@ int8_t batman() { } - addr_to_string( ((struct packet *)&in)->orig, orig_str, sizeof (orig_str) ); - addr_to_string( neigh, neigh_str, sizeof (neigh_str) ); - debug_output( 4, "new packet - orig: %s, sender: %s\n", orig_str, neigh_str ); - - /*if ( is_duplicate ) - output("Duplicate packet \n"); - - if ( in.orig == neigh ) - output("Originator packet from neighbour \n"); - - if ( is_my_orig == 1 ) - output("Originator packet from myself (via neighbour) \n"); - - if ( in.flags & UNIDIRECTIONAL ) - output("Packet with unidirectional flag \n"); - - if ( is_bidirectional ) - output("received via bidirectional link \n"); - - if ( !( in.flags & UNIDIRECTIONAL ) && ( !is_bidirectional ) ) - output("neighbour thinks connection is bidirectional - I disagree \n");*/ - if ( ((struct packet *)&in)->gwflags != 0 ) debug_output( 4, "Is an internet gateway (class %i) \n", ((struct packet *)&in)->gwflags ); @@ -722,10 +694,6 @@ int8_t batman() { } - /*if ( ( ! is_my_addr ) && ( ! is_my_orig ) ) - debug_output( 3, "IP: %s send packet with sequence number: %i from %s\n", neigh_str, ((struct packet *)&in)->seqno, orig_str );*/ - - if ( ((struct packet *)&in)->version != COMPAT_VERSION ) { debug_output( 4, "Drop packet: incompatible batman version (%i) \n", ((struct packet *)&in)->version ); @@ -771,7 +739,7 @@ int8_t batman() { /* update ranking */ if ( ( is_bidirectional ) && ( !is_duplicate ) ) - update_originator( orig_node, (struct packet *)&in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); + update_orig( orig_node, (struct packet *)&in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); /* is single hop (direct) neighbour */ if ( ((struct packet *)&in)->orig == neigh ) { @@ -853,24 +821,30 @@ int8_t batman() { } + send_outstanding_packets(); - purge_orginator( get_time() ); if ( debug_timeout + 1000 < get_time() ) { debug_timeout = get_time(); - debug_orginator(); + purge_orig( get_time() ); + + debug_orig(); checkIntegrity(); + if ( debug_clients.clients_num[2] > 0 ) + prof_print(); + if ( ( routing_class != 0 ) && ( curr_gateway == NULL ) ) choose_gw(); - } + if ( vis_if.sock ) + send_vis_packet(); - time_count++; + } } @@ -878,7 +852,7 @@ int8_t batman() { if ( debug_level > 0 ) printf( "Deleting all BATMAN routes\n" ); - purge_orginator( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); + purge_orig( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); hash_delete( orig_hash ); diff --git a/batman.h b/batman.h index 4edf79b..575b17c 100644 --- a/batman.h +++ b/batman.h @@ -223,10 +223,5 @@ void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ); void choose_gw(); void del_default_route(); int8_t add_default_route(); -void debug_output( int8_t debug_prio, char *format, ... ); -uint32_t get_time( void ); -void addr_to_string( uint32_t addr, char *str, int32_t len ); -int32_t rand_num( int32_t limit ); -int8_t send_packet( unsigned char *packet_buff, int32_t packet_buff_len, struct sockaddr_in *broad, int32_t send_sock ); #endif diff --git a/orginator.c b/orginator.c index d720c87..6f3cae8 100644 --- a/orginator.c +++ b/orginator.c @@ -20,13 +20,14 @@ #include <string.h> +#include "os.h" #include "batman.h" /* needed for hash, compares 2 struct orig_node, but only their ip-addresses. assumes that * the ip address is the first field in the struct */ -int orig_comp(void *data1, void *data2) { +int compare_orig(void *data1, void *data2) { return(memcmp(data1, data2, 4)); @@ -36,7 +37,7 @@ int orig_comp(void *data1, void *data2) { /* hashfunction to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ -int orig_choose(void *data, int32_t size) { +int choose_orig(void *data, int32_t size) { unsigned char *key= data; uint32_t hash = 0; @@ -108,7 +109,7 @@ struct orig_node *get_orig_node( uint32_t addr ) { -void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { +void update_orig( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ) { prof_start( PROF_update_originator ); struct list_head *neigh_pos; @@ -199,7 +200,7 @@ void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t -void purge_orginator( uint32_t curr_time ) { +void purge_orig( uint32_t curr_time ) { prof_start( PROF_purge_orginator ); struct hash_it_t *hashit = NULL; @@ -303,7 +304,7 @@ void purge_orginator( uint32_t curr_time ) { -void debug_orginator() { +void debug_orig() { struct hash_it_t *hashit = NULL; struct list_head *forw_pos, *orig_pos, *neigh_pos; @@ -409,9 +410,6 @@ void debug_orginator() { } - if ( debug_clients.clients_num[2] > 0 ) - prof_print(); - } diff --git a/orginator.h b/orginator.h index ece749b..af1ea96 100644 --- a/orginator.h +++ b/orginator.h @@ -19,10 +19,10 @@ -int orig_comp(void *data1, void *data2); -int orig_choose(void *data, int32_t size); +int compare_orig(void *data1, void *data2); +int choose_orig(void *data, int32_t size); struct orig_node *get_orig_node( uint32_t addr ); -void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ); -void purge_orginator( uint32_t curr_time ); -void debug_orginator(); +void update_orig( struct orig_node *orig_node, struct packet *in, uint32_t neigh, struct batman_if *if_incoming, unsigned char *hna_recv_buff, int16_t hna_buff_len ); +void purge_orig( uint32_t curr_time ); +void debug_orig(); diff --git a/os.h b/os.h index 50d2332..2ef174a 100644 --- a/os.h +++ b/os.h @@ -23,22 +23,23 @@ #include "batman-specific.h" uint32_t get_time( void ); +int32_t rand_num( int32_t limit ); +void addr_to_string( uint32_t addr, char *str, int32_t len ); + void set_forwarding(int32_t state); int32_t get_forwarding(void); void set_rp_filter(int32_t state, char* dev); int32_t get_rp_filter(char *dev); - - void add_del_route( uint32_t dest, uint16_t netmask, uint32_t router, int8_t del, char *dev, int32_t sock ); int8_t is_aborted(); -void addr_to_string( uint32_t addr, char *str, int32_t len ); +void handler( int32_t sig ); +void segmentation_fault( int32_t sig ); -int8_t receive_packet( unsigned char *packet_buff, int32_t packet_buff_len, int16_t *hna_buff_len, uint32_t *neigh, uint32_t timeout, struct batman_if **if_incoming ); +int8_t receive_packet( unsigned char *packet_buff, int32_t packet_buff_len, int16_t *hna_buff_len, uint32_t *neigh, uint32_t timeout, struct batman_if **if_incoming ); int8_t send_packet( unsigned char *packet_buff, int packet_buff_len, struct sockaddr_in *broad, int send_sock ); -int32_t rand_num( int32_t limit ); -int8_t bind_to_iface( int32_t sock, char *dev ); + int8_t probe_tun(); int8_t del_dev_tun( int32_t fd ); int8_t add_dev_tun( struct batman_if *batman_if, uint32_t dest_addr, char *tun_dev, size_t tun_dev_size, int32_t *fd ); @@ -46,9 +47,10 @@ int8_t add_dev_tun( struct batman_if *batman_if, uint32_t dest_addr, char *tun_d void apply_init_args( int argc, char *argv[] ); void init_interface ( struct batman_if *batman_if ); void init_interface_gw ( struct batman_if *batman_if ); +int8_t bind_to_iface( int32_t sock, char *dev ); void print_animation( void ); -void close_all_sockets(); +void restore_defaults(); void *gw_listen( void *arg ); void *client_to_gw_tun( void *arg ); @@ -58,5 +60,4 @@ void debug_output( int8_t debug_prio, char *format, ... ); void cleanup(); - #endif diff --git a/posix-specific.c b/posix-specific.c index f8d4695..9da3559 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -45,6 +45,27 @@ #include "allocate.h" + +static int8_t stop; + + + +int8_t is_aborted() { + + return stop != 0; + +} + + + +void handler( int32_t sig ) { + + stop = 1; + +} + + + void debug_output( int8_t debug_prio, char *format, ... ) { struct list_head *debug_pos; @@ -337,6 +358,7 @@ void apply_init_args( int argc, char *argv[] ) { // fd_set wait_sockets, tmp_wait_sockets; memset( &tmp_ip_holder, 0, sizeof (struct in_addr) ); + stop = 0; printf( "WARNING: You are using the unstable batman branch. If you are interested in *using* batman get the latest stable release !\n" ); @@ -439,7 +461,7 @@ void apply_init_args( int argc, char *argv[] ) { case 'H': verbose_usage(); - exit(0); + exit(EXIT_SUCCESS); case 'o': @@ -505,7 +527,7 @@ void apply_init_args( int argc, char *argv[] ) { case 'v': printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); - exit(0); + exit(EXIT_SUCCESS); case 'V': @@ -514,12 +536,12 @@ void apply_init_args( int argc, char *argv[] ) { printf( "\x1B[0;0HB.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" ); - exit(0); + exit(EXIT_SUCCESS); case 'h': default: usage(); - exit(0); + exit(EXIT_SUCCESS); } @@ -552,7 +574,7 @@ void apply_init_args( int argc, char *argv[] ) { if ( argc <= found_args ) { fprintf( stderr, "Error - no interface specified\n" ); usage(); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -571,7 +593,7 @@ void apply_init_args( int argc, char *argv[] ) { if ( daemon( 0, 0 ) < 0 ) { printf( "Error - can't fork to background: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -650,13 +672,13 @@ void apply_init_args( int argc, char *argv[] ) { if ( bind ( unix_if.unix_sock, (struct sockaddr *)&unix_if.addr, sizeof (struct sockaddr_un) ) < 0 ) { debug_output( 0, "Error - can't bind unix socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( listen( unix_if.unix_sock, 10 ) < 0 ) { debug_output( 0, "Error - can't listen unix socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -855,14 +877,14 @@ void init_interface ( struct batman_if *batman_if ) if ( strlen( batman_if->dev ) > IFNAMSIZ - 1 ) { debug_output( 0, "Error - interface name too long: %s\n", batman_if->dev ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } batman_if->udp_send_sock = socket( PF_INET, SOCK_DGRAM, 0 ); if (batman_if->udp_send_sock < 0) { debug_output( 0, "Error - can't create send socket: %s", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -870,7 +892,7 @@ void init_interface ( struct batman_if *batman_if ) if ( batman_if->udp_recv_sock < 0 ) { debug_output( 0, "Error - can't create recieve socket: %s", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -881,7 +903,7 @@ void init_interface ( struct batman_if *batman_if ) if ( ioctl( batman_if->udp_recv_sock, SIOCGIFADDR, &int_req ) < 0 ) { debug_output( 0, "Error - can't get IP address of interface %s\n", batman_if->dev ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -893,7 +915,7 @@ void init_interface ( struct batman_if *batman_if ) if ( ioctl( batman_if->udp_recv_sock, SIOCGIFBRDADDR, &int_req ) < 0 ) { debug_output( 0, "Error - can't get broadcast IP address of interface %s\n", batman_if->dev ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -905,14 +927,14 @@ void init_interface ( struct batman_if *batman_if ) if ( setsockopt( batman_if->udp_send_sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (int) ) < 0 ) { debug_output( 0, "Error - can't enable broadcasts: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( bind_to_iface( batman_if->udp_send_sock, batman_if->dev ) < 0 ) { - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -920,14 +942,14 @@ void init_interface ( struct batman_if *batman_if ) if ( bind( batman_if->udp_send_sock, (struct sockaddr *)&batman_if->addr, sizeof (struct sockaddr_in) ) < 0 ) { debug_output( 0, "Error - can't bind send socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( bind_to_iface( batman_if->udp_recv_sock, batman_if->dev ) < 0 ) { - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -935,7 +957,7 @@ void init_interface ( struct batman_if *batman_if ) if ( bind( batman_if->udp_recv_sock, (struct sockaddr *)&batman_if->broad, sizeof (struct sockaddr_in) ) < 0 ) { debug_output( 0, "Error - can't bind receive socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -954,38 +976,38 @@ void init_interface_gw ( struct batman_if *batman_if ) if ( batman_if->tcp_gw_sock < 0 ) { debug_output( 0, "Error - can't create socket: %s", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( setsockopt( batman_if->tcp_gw_sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(int) ) < 0 ) { debug_output( 0, "Error - can't enable reuse of address: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( bind( batman_if->tcp_gw_sock, (struct sockaddr*)&batman_if->addr, sizeof(struct sockaddr_in) ) < 0 ) { debug_output( 0, "Error - can't bind socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( listen( batman_if->tcp_gw_sock, 10 ) < 0 ) { debug_output( 0, "Error - can't listen socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } batman_if->tunnel_sock = socket(PF_INET, SOCK_DGRAM, 0); if ( batman_if->tunnel_sock < 0 ) { debug_output( 0, "Error - can't create tunnel socket: %s", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } if ( bind( batman_if->tunnel_sock, (struct sockaddr *)&batman_if->addr, sizeof (struct sockaddr_in) ) < 0 ) { debug_output( 0, "Error - can't bind tunnel socket: %s\n", strerror(errno) ); - close_all_sockets(); + restore_defaults(); exit(EXIT_FAILURE); } @@ -1249,11 +1271,14 @@ int8_t add_default_route() { -void close_all_sockets() { +void restore_defaults() { struct list_head *if_pos, *if_pos_tmp; struct batman_if *batman_if; + + stop = 1; + list_for_each_safe( if_pos, if_pos_tmp, &if_list ) { batman_if = list_entry( if_pos, struct batman_if, list ); @@ -1617,6 +1642,18 @@ void *gw_listen( void *arg ) { +void segmentation_fault( int32_t sig ) { + + restore_defaults(); + + debug_output( 0, "Error - SIGSEGV received !\n" ); + + exit(EXIT_FAILURE); + +} + + + void cleanup() { int8_t i; diff --git a/posix.c b/posix.c index ca145f2..df46f58 100644 --- a/posix.c +++ b/posix.c @@ -38,8 +38,6 @@ #include "os.h" #include "batman-specific.h" -#include "list.h" -#include "allocate.h" @@ -51,7 +49,6 @@ extern struct vis_if vis_if; static struct timeval start_time; -static int8_t stop; static void get_time_internal( struct timeval *tv ) { @@ -213,14 +210,6 @@ void print_animation( void ) { -int8_t is_aborted() { - - return stop != 0; - -} - - - void addr_to_string( uint32_t addr, char *str, int32_t len ) { inet_ntop( AF_INET, &addr, str, len ); @@ -237,17 +226,9 @@ int32_t rand_num( int32_t limit ) { -static void handler( int32_t sig ) { - - stop = 1; - -} - - int main( int argc, char *argv[] ) { int8_t res; - stop = 0; /* check if user is root */ @@ -258,20 +239,21 @@ int main( int argc, char *argv[] ) { } - apply_init_args( argc, argv ); - signal( SIGINT, handler ); signal( SIGTERM, handler ); + signal( SIGSEGV, segmentation_fault ); + + + apply_init_args( argc, argv ); + gettimeofday( &start_time, NULL ); srand( getpid() ); - res = batman(); - - close_all_sockets(); + restore_defaults(); cleanup(); checkLeak(); return res; diff --git a/profile.c b/profile.c index 64e6e6c..766e1ef 100644 --- a/profile.c +++ b/profile.c @@ -19,6 +19,7 @@ +#include "os.h" #include "batman.h" @@ -64,7 +65,7 @@ void prof_print() { for ( index = 0; index < PROF_COUNT; index++ ) { - debug_output( 3, " %''30s: cpu time = %10.3f, calls = %i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); + debug_output( 3, " %''30s: cpu time = %10.3f, calls = %''4i\n", prof_container[index].name, (float)prof_container[index].total_time/CLOCKS_PER_SEC, prof_container[index].calls ); } diff --git a/schedule.c b/schedule.c index 0ea0136..a64a186 100644 --- a/schedule.c +++ b/schedule.c @@ -21,6 +21,7 @@ #include <string.h> #include <stdlib.h> +#include "os.h" #include "batman.h" @@ -174,6 +175,7 @@ void send_outstanding_packets() { debug_output( 4, "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ntohs( ((struct packet *)forw_node->pack_buff)->seqno ), ((struct packet *)forw_node->pack_buff)->ttl, forw_node->if_outgoing->dev ); if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { + restore_defaults(); exit(EXIT_FAILURE); } @@ -189,6 +191,7 @@ void send_outstanding_packets() { if ( ( forw_node->if_outgoing != NULL ) ) { if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &forw_node->if_outgoing->broad, forw_node->if_outgoing->udp_send_sock ) < 0 ) { + restore_defaults(); exit(EXIT_FAILURE); } @@ -222,12 +225,14 @@ void send_outstanding_packets() { if ( ( forw_node->own ) && ( ((struct packet *)forw_node->pack_buff)->orig != ((struct batman_if *)if_list.next)->addr.sin_addr.s_addr ) ) { if ( send_packet( forw_node->pack_buff, sizeof(struct packet), &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { + restore_defaults(); exit(EXIT_FAILURE); } } else { if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { + restore_defaults(); exit(EXIT_FAILURE); } -- 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 4c63479cc9a076b4ffa5450d4bc449d91ba18f9e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Mar 9 15:19:26 2007 +0100 hash integration completed diff --git a/allocate.h b/allocate.h index 91ca752..979e9b5 100644 --- a/allocate.h +++ b/allocate.h @@ -19,7 +19,7 @@ #ifndef _ALLOCATE_H -#define _ALLOCATE_H 1 +#define _ALLOCATE_H 1 #include <stdint.h> @@ -30,16 +30,4 @@ void *debugMalloc(uint32_t length, int32_t tag); void *debugRealloc(void *memory, uint32_t length, int32_t tag); void debugFree(void *memoryParameter, int32_t tag); -enum { - TAG_HASH=0, - TAG_HASH_TABLE, - TAG_HASH_BUCKET, - TAG_HASH_ITER, - TAG_HASH_ALLOC_FAILED, - TAG_HASH_BUCKET_REMOVE, - TAG_HASH_DELETE, - TAG_HASH_ITER_REMOVE, - - -}; #endif diff --git a/batman.c b/batman.c index c853253..a064718 100644 --- a/batman.c +++ b/batman.c @@ -1080,7 +1080,7 @@ void send_vis_packet() if(cnt >= size) { size += step; - packet = debugRealloc(packet, size * sizeof(unsigned char), 14); + packet = debugRealloc(packet, size * sizeof(unsigned char), 113); } memmove(&packet[cnt], (unsigned char*)&orig_node->orig,4); *(packet + cnt + 4) = (unsigned char) orig_node->router->packet_count; -- 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 9469fd55f42a492454fc639877aaf52ff6927c7f Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Fri Mar 9 13:47:10 2007 +0100 - enum{} example in allocate.h - hash.c with allocate.c debug-functions diff --git a/allocate.h b/allocate.h index 6f610ec..91ca752 100644 --- a/allocate.h +++ b/allocate.h @@ -18,7 +18,8 @@ */ - +#ifndef _ALLOCATE_H +#define _ALLOCATE_H 1 #include <stdint.h> @@ -28,3 +29,17 @@ void checkLeak(void); void *debugMalloc(uint32_t length, int32_t tag); void *debugRealloc(void *memory, uint32_t length, int32_t tag); void debugFree(void *memoryParameter, int32_t tag); + +enum { + TAG_HASH=0, + TAG_HASH_TABLE, + TAG_HASH_BUCKET, + TAG_HASH_ITER, + TAG_HASH_ALLOC_FAILED, + TAG_HASH_BUCKET_REMOVE, + TAG_HASH_DELETE, + TAG_HASH_ITER_REMOVE, + + +}; +#endif -- 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 f7b1ff0b2575ef3c5250029e6bc88835bb4ddd16 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 8 19:53:19 2007 +0100 debug msg for malformed packet II diff --git a/batman.c b/batman.c index b873903..ed6a7eb 100644 --- a/batman.c +++ b/batman.c @@ -202,8 +202,8 @@ struct orig_node *get_orig_node( uint32_t addr ) { orig_node->orig = addr; orig_node->router = NULL; - orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(int), 2 ); - memset( orig_node->bidirect_link, 0, found_ifs * sizeof(int) ); + orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint32_t), 2 ); + memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint32_t) ); list_add_tail( &orig_node->list, &orig_list ); -- batman; test conversation

1 0

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010