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 39a5a4f27e17f5c388e84e427b4bd6aa8cf72f47 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 13 18:22:13 2006 +0100 - rewrite receive_packet, so no mallow is neccessary - v option added - release 0.1 ! diff --git a/batman.c b/batman.c index 9cf73ed..793d5fb 100644 --- a/batman.c +++ b/batman.c @@ -116,6 +116,7 @@ void usage(void) fprintf(stderr, " -p preferred gateway\n" ); fprintf(stderr, " -r routing class\n" ); fprintf(stderr, " -s visualisation server\n" ); + fprintf(stderr, " -v print version\n" ); } void verbose_usage(void) @@ -155,6 +156,7 @@ void verbose_usage(void) fprintf(stderr, " 3 -> use best statistic internet connection (olsr style)\n\n" ); fprintf(stderr, " -s visualisation server\n" ); fprintf(stderr, " default: none, allowed values: IP\n\n" ); + fprintf(stderr, " -v print version\n" ); } @@ -1163,9 +1165,8 @@ int batman() struct batman_if *batman_if, *if_incoming; struct neigh_node *neigh_node; struct hna_node *hna_node; - struct packet in; unsigned int neigh, hna, netmask, debug_timeout, select_timeout; - unsigned char hna_recv_buff[1500 - sizeof (struct packet)]; + unsigned char in[1501], *hna_recv_buff; static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; int forward_old, res, hna_buff_len, hna_buff_count; int is_my_addr, is_my_orig, is_broadcast, is_duplicate, is_bidirectional, forward_duplicate_packet; @@ -1218,13 +1219,11 @@ int batman() send_vis_packet(); } - hna_buff_len = 1500 - sizeof (struct packet); - /* harden select_timeout against sudden time change (e.g. ntpdate) */ curr_time = get_time(); select_timeout = ( curr_time >= last_own_packet + orginator_interval - 10 ? orginator_interval : last_own_packet + orginator_interval - curr_time ); - res = receive_packet((unsigned char *)&in, sizeof (struct packet), hna_recv_buff, &hna_buff_len, &neigh, select_timeout, &if_incoming); + res = receive_packet( ( unsigned char *)&in, 1501, &hna_buff_len, &neigh, select_timeout, &if_incoming ); if (res < 0) return -1; @@ -1232,13 +1231,16 @@ int batman() if (res > 0) { if ( debug_level == 4 ) { - addr_to_string(in.orig, orig_str, sizeof (orig_str)); - addr_to_string(neigh, neigh_str, sizeof (neigh_str)); - output( "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, in.seqno, in.ttl ); + addr_to_string( ((struct packet *)&in)->orig, orig_str, sizeof(orig_str) ); + addr_to_string( neigh, neigh_str, sizeof(neigh_str) ); + output( "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, ((struct packet *)&in)->seqno, ((struct packet *)&in)->ttl ); } is_my_addr = is_my_orig = is_broadcast = is_duplicate = is_bidirectional = forward_duplicate_packet = 0; + hna_buff_len -= sizeof(struct packet); + hna_recv_buff = ( hna_buff_len > 4 ? in + sizeof(struct packet) : NULL ); + list_for_each(if_pos, &if_list) { batman_if = list_entry(if_pos, struct batman_if, list); @@ -1246,7 +1248,7 @@ int batman() if ( neigh == batman_if->addr.sin_addr.s_addr ) is_my_addr = 1; - if ( in.orig == batman_if->addr.sin_addr.s_addr ) + if ( ((struct packet *)&in)->orig == batman_if->addr.sin_addr.s_addr ) is_my_orig = 1; if ( neigh == batman_if->broad.sin_addr.s_addr ) @@ -1255,13 +1257,11 @@ int batman() } - /* orig_neigh_node = update_last_hop( &in, neigh ); */ - if ( debug_level == 4 ) { - addr_to_string(in.orig, orig_str, sizeof (orig_str)); - addr_to_string(neigh, neigh_str, sizeof (neigh_str)); - output("new packet - orig: %s, sender: %s\n",orig_str , neigh_str); + addr_to_string( ((struct packet *)&in)->orig, orig_str, sizeof (orig_str) ); + addr_to_string( neigh, neigh_str, sizeof (neigh_str) ); + output( "new packet - orig: %s, sender: %s\n",orig_str , neigh_str ); /*if ( is_duplicate ) output("Duplicate packet \n"); @@ -1281,8 +1281,8 @@ int batman() if ( !( in.flags & UNIDIRECTIONAL ) && ( !is_bidirectional ) ) output("neighbour thinks connection is bidirectional - I disagree \n");*/ - if ( in.gwflags != 0 ) - output( "Is an internet gateway (class %i) \n", in.gwflags ); + if ( ((struct packet *)&in)->gwflags != 0 ) + output( "Is an internet gateway (class %i) \n", ((struct packet *)&in)->gwflags ); if ( hna_buff_len > 4 ) { @@ -1294,7 +1294,7 @@ int batman() memmove( &hna, ( unsigned int *)&hna_recv_buff[ hna_buff_count * 5 ], 4 ); netmask = ( unsigned int )hna_recv_buff[ ( hna_buff_count * 5 ) + 4 ]; - addr_to_string(hna, orig_str, sizeof (orig_str)); + addr_to_string( hna, orig_str, sizeof (orig_str) ); if ( ( netmask > 0 ) && ( netmask < 33 ) ) output( "hna: %s/%i\n", orig_str, netmask ); @@ -1310,10 +1310,10 @@ int batman() } - if ( in.version != BATMAN_VERSION ) { + if ( ((struct packet *)&in)->version != BATMAN_VERSION ) { if ( debug_level == 4 ) - output( "Drop packet: incompatible batman version (%i) \n", in.version ); + output( "Drop packet: incompatible batman version (%i) \n", ((struct packet *)&in)->version ); } else if ( is_my_addr ) { @@ -1331,10 +1331,10 @@ int batman() } else if ( is_my_orig ) { - orig_neigh_node = update_last_hop( &in, neigh ); + orig_neigh_node = update_last_hop( (struct packet *)&in, neigh ); /* neighbour has to indicating direct link and it has to come via the corresponding interface */ - if ( ( in.flags & DIRECTLINK ) && ( if_incoming->addr.sin_addr.s_addr == in.orig ) ) { + if ( ( ((struct packet *)&in)->flags & DIRECTLINK ) && ( if_incoming->addr.sin_addr.s_addr == ((struct packet *)&in)->orig ) ) { orig_neigh_node->last_reply[if_incoming->if_num] = get_time(); @@ -1344,32 +1344,32 @@ int batman() } if ( debug_level == 4 ) - output( "Drop packet: originator packet from myself (via neighbour) \n", in.version ); + output( "Drop packet: originator packet from myself (via neighbour) \n" ); - } else if ( in.flags & UNIDIRECTIONAL ) { + } else if ( ((struct packet *)&in)->flags & UNIDIRECTIONAL ) { if ( debug_level == 4 ) output( "Drop packet: originator packet with unidirectional flag \n" ); } else { - orig_neigh_node = update_last_hop( &in, neigh ); + orig_neigh_node = update_last_hop( (struct packet *)&in, neigh ); - is_duplicate = isDuplicate( in.orig, in.seqno ); + is_duplicate = isDuplicate( ((struct packet *)&in)->orig, ((struct packet *)&in)->seqno ); is_bidirectional = isBidirectionalNeigh( orig_neigh_node, if_incoming ); /* update ranking */ if ( ( is_bidirectional ) && ( !is_duplicate ) ) - update_originator( &in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); + update_originator( (struct packet *)&in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); /* is single hop (direct) neighbour */ - if ( in.orig == neigh ) { + if ( ((struct packet *)&in)->orig == neigh ) { /* it is our best route towards him */ if ( ( is_bidirectional ) && ( orig_neigh_node->router == neigh ) ) { /* mark direct link on incoming interface */ - schedule_forward_packet( &in, 0, 1, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); + schedule_forward_packet( (struct packet *)&in, 0, 1, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: rebroadcast neighbour packet with direct link flag \n" ); @@ -1378,7 +1378,7 @@ int batman() /* if a bidirectional neighbour sends us a packet - retransmit it with unidirectional flag if it is not our best link to it in order to prevent routing problems */ } else if ( ( ( is_bidirectional ) && ( orig_neigh_node->router != neigh ) ) || ( !is_bidirectional ) ) { - schedule_forward_packet( &in, 1, 1, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); + schedule_forward_packet( (struct packet *)&in, 1, 1, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: rebroadcast neighbour packet with direct link and unidirectional flag \n" ); @@ -1392,7 +1392,7 @@ int batman() if ( !is_duplicate ) { - schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); + schedule_forward_packet( (struct packet *)&in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: rebroadcast orginator packet \n" ); @@ -1405,7 +1405,7 @@ int batman() if ( neigh_node->addr == neigh ) { - if ( neigh_node->best_ttl == in.ttl ) + if ( neigh_node->best_ttl == ((struct packet *)&in)->ttl ) forward_duplicate_packet = 1; break; @@ -1417,7 +1417,7 @@ int batman() /* we are forwarding duplicate o-packets if they come via our best neighbour and ttl is valid */ if ( forward_duplicate_packet ) { - schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); + schedule_forward_packet( (struct packet *)&in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: duplicate packet received via best neighbour with best ttl \n" ); diff --git a/batman.h b/batman.h index f7c5a17..4ff893b 100644 --- a/batman.h +++ b/batman.h @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1 rc7" +#define VERSION "0.1" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0x80 diff --git a/os.h b/os.h index 5a5c980..345337d 100644 --- a/os.h +++ b/os.h @@ -32,7 +32,7 @@ void *alloc_memory(int len); void *realloc_memory(void *ptr, int len); void free_memory(void *mem); void addr_to_string(unsigned int addr, char *str, int len); -int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned char *hna_buff, int *hna_buff_len, unsigned int *neigh, unsigned int timeout, struct batman_if **if_incoming); +int receive_packet(unsigned char *packet_buff, int packet_buff_len, int *hna_buff_len, unsigned int *neigh, unsigned int timeout, struct batman_if **if_incoming); int send_packet(unsigned char *buff, int len, struct sockaddr_in *broad, int sock); int rand_num(int limit); int bind_to_iface( int udp_recv_sock, char *dev ); diff --git a/posix.c b/posix.c index 7830afa..2cd9c5e 100644 --- a/posix.c +++ b/posix.c @@ -562,13 +562,12 @@ int rand_num(int limit) return rand() % limit; } -int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned char *hna_buff, int *hna_buff_len, unsigned int *neigh, unsigned int timeout, struct batman_if **if_incoming) -{ +int receive_packet( unsigned char *packet_buff, int packet_buff_len, int *hna_buff_len, unsigned int *neigh, unsigned int timeout, struct batman_if **if_incoming ) { + fd_set wait_set; - int res, bytes_read, max_sock = 0; + int res, max_sock = 0; struct sockaddr_in addr; unsigned int addr_len; - unsigned char *buff = NULL; struct timeval tv; struct list_head *if_pos; struct batman_if *batman_if; @@ -577,7 +576,6 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; - buff = alloc_memory( packet_buff_len + *hna_buff_len ); FD_ZERO(&wait_set); @@ -586,6 +584,7 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha batman_if = list_entry(if_pos, struct batman_if, list); FD_SET(batman_if->udp_recv_sock, &wait_set); + if ( batman_if->udp_recv_sock > max_sock ) max_sock = batman_if->udp_recv_sock; @@ -593,25 +592,20 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha for (;;) { - res = select(max_sock + 1, &wait_set, NULL, NULL, &tv); + res = select( max_sock + 1, &wait_set, NULL, NULL, &tv ); if (res >= 0) break; - if (errno != EINTR) - { + if ( errno != EINTR ) { do_log( "Error - can't select: %s\n", strerror(errno) ); return -1; } } - if ( res == 0 ) { - - free_memory( buff ); + if ( res == 0 ) return 0; - } - addr_len = sizeof (struct sockaddr_in); list_for_each(if_pos, &if_list) { @@ -619,29 +613,15 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha if ( FD_ISSET( batman_if->udp_recv_sock, &wait_set) ) { - if ( ( bytes_read = recvfrom( batman_if->udp_recv_sock, buff, packet_buff_len + *hna_buff_len, 0, (struct sockaddr *)&addr, &addr_len ) ) < 0 ) - { + if ( ( *hna_buff_len = recvfrom( batman_if->udp_recv_sock, packet_buff, packet_buff_len - 1, 0, (struct sockaddr *)&addr, &addr_len ) ) < 0 ) { do_log( "Error - can't receive packet: %s\n", strerror(errno) ); return -1; } - if ( bytes_read == packet_buff_len ) { - - memmove( packet_buff, buff, bytes_read ); - *hna_buff_len = 0; - - } else if ( bytes_read > packet_buff_len ) { - - memmove( packet_buff, buff, packet_buff_len ); - memmove( hna_buff, buff + packet_buff_len, bytes_read - packet_buff_len ); - *hna_buff_len = bytes_read - packet_buff_len; - - } else { - - free_memory( buff ); + if ( *hna_buff_len < sizeof(struct packet) ) return 0; - } + packet_buff[*hna_buff_len] = '\0'; (*if_incoming) = batman_if; break; @@ -650,8 +630,6 @@ int receive_packet(unsigned char *packet_buff, int packet_buff_len, unsigned cha } - free_memory( buff ); - *neigh = addr.sin_addr.s_addr; return 1; @@ -934,7 +912,7 @@ int main(int argc, char *argv[]) dev = NULL; memset(&tmp_ip_holder, 0, sizeof (struct in_addr)); - while ( ( optchar = getopt ( argc, argv, "a:d:hHo:g:p:r:s:V" ) ) != -1 ) { + while ( ( optchar = getopt ( argc, argv, "a:d:hHo:g:p:r:s:vV" ) ) != -1 ) { switch ( optchar ) { @@ -1093,6 +1071,11 @@ int main(int argc, char *argv[]) found_args += 2; break; + case 'v': + + printf( "B.A.T.M.A.N-III v%s (internal version %i)", VERSION, BATMAN_VERSION ); + return (0); + case 'V': print_animation(); -- 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 3d78acfdfc120d3e81985bf48b7d11fa65d25ce8 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 14 01:39:55 2006 +0100 - fix neighbour list bug - fix packet list bug - add malloc / free debug functions diff --git a/Makefile b/Makefile index 92e908b..b103b6a 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ LDFLAGS = -lpthread UNAME=$(shell uname) ifeq ($(UNAME),Linux) -OS_OBJ= posix.o linux.o +OS_OBJ= posix.o linux.o allocate.o endif ifeq ($(UNAME),Darwin) diff --git a/allocate.c b/allocate.c new file mode 100644 index 0000000..0956c01 --- /dev/null +++ b/allocate.c @@ -0,0 +1,229 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "allocate.h" + +#define DEBUG_MALLOC + +#define MAGIC_NUMBER 0x12345678 + +#if defined DEBUG_MALLOC + +struct chunkHeader *chunkList = NULL; + +struct chunkHeader +{ + struct chunkHeader *next; + unsigned int length; + int tag; + unsigned int magicNumber; +}; + +struct chunkTrailer +{ + unsigned int magicNumber; +}; + +void checkIntegrity(void) +{ + struct chunkHeader *walker; + struct chunkTrailer *chunkTrailer; + unsigned char *memory; + + for (walker = chunkList; walker != NULL; walker = walker->next) + { + if (walker->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", walker->magicNumber, walker->tag); + exit(1); + } + + memory = (unsigned char *)walker; + + chunkTrailer = (struct chunkTrailer *)(memory + 16 + walker->length); + + if (chunkTrailer->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkTrailer->magicNumber, walker->tag); + exit(1); + } + } +} + +void checkLeak(void) +{ + struct chunkHeader *walker; + + for (walker = chunkList; walker != NULL; walker = walker->next) + fprintf(stderr, "Memory leak detected, tag = %d\n", walker->tag); +} + +void *debugMalloc(unsigned int length, int tag) +{ + unsigned char *memory; + struct chunkHeader *chunkHeader; + struct chunkTrailer *chunkTrailer; + unsigned char *chunk; + +// printf("sizeof(struct chunkHeader) = %u, sizeof (struct chunkTrailer) = %u\n", sizeof (struct chunkHeader), sizeof (struct chunkTrailer)); + + memory = malloc(length + 20); + + if (memory == NULL) + { + fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", length + 20, tag); + exit(1); + } + + chunkHeader = (struct chunkHeader *)memory; + chunk = memory + 16; + chunkTrailer = (struct chunkTrailer *)(memory + 16 + length); + + chunkHeader->length = length; + chunkHeader->tag = tag; + chunkHeader->magicNumber = MAGIC_NUMBER; + + chunkTrailer->magicNumber = MAGIC_NUMBER; + + chunkHeader->next = chunkList; + chunkList = chunkHeader; + + return chunk; +} + +void *debugRealloc(void *memoryParameter, unsigned int length, int tag) +{ + unsigned char *memory; + struct chunkHeader *chunkHeader; + struct chunkTrailer *chunkTrailer; + unsigned char *result; + unsigned int copyLength; + + memory = memoryParameter; + chunkHeader = (struct chunkHeader *)(memory - 16); + + if (chunkHeader->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkHeader->magicNumber, chunkHeader->tag); + exit(1); + } + + chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length); + + if (chunkTrailer->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkTrailer->magicNumber, chunkHeader->tag); + exit(1); + } + + result = debugMalloc(length, tag); + + copyLength = length; + + if (copyLength > chunkHeader->length) + copyLength = chunkHeader->length; + + memcpy(result, memoryParameter, length); + + debugFree(memoryParameter); + + return result; +} + +void debugFree(void *memoryParameter) +{ + unsigned char *memory; + struct chunkHeader *chunkHeader; + struct chunkTrailer *chunkTrailer; + struct chunkHeader *walker; + struct chunkHeader *previous; + + memory = memoryParameter; + chunkHeader = (struct chunkHeader *)(memory - 16); + + if (chunkHeader->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkHeader->magicNumber, chunkHeader->tag); + exit(1); + } + + previous = NULL; + + for (walker = chunkList; walker != NULL; walker = walker->next) + { + if (walker == chunkHeader) + break; + + previous = walker; + } + + if (walker == NULL) + { + fprintf(stderr, "Double free detected, tag = %d\n", chunkHeader->tag); + exit(1); + } + + if (previous == NULL) + chunkList = walker->next; + + else + previous->next = walker->next; + + chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length); + + if (chunkTrailer->magicNumber != MAGIC_NUMBER) + { + fprintf(stderr, "Invalid magic number in header: %08x, tag = %d\n", chunkTrailer->magicNumber, chunkHeader->tag); + exit(1); + } + + free(chunkHeader); +} + +#else + +void checkIntegrity(void) +{ +} + +void checkLeak(void) +{ +} + +void *debugMalloc(unsigned int length, int tag) +{ + void *result; + + result = malloc(length); + + if (result == NULL) + { + fprintf(stderr, "Cannot allocate %u bytes, tag = %d\n", length, tag); + exit(1); + } + + return result; +} + +void *debugRealloc(void *memory, unsigned int length, int tag) +{ + void *result; + + result = realloc(memory, length); + + if (result == NULL) + { + fprintf(stderr, "Cannot re-allocate %u bytes, tag = %d\n", length, tag); + exit(1); + } + + return result; +} + +void debugFree(void *memory) +{ + free(memory); +} + +#endif diff --git a/allocate.h b/allocate.h new file mode 100644 index 0000000..9777b3a --- /dev/null +++ b/allocate.h @@ -0,0 +1,5 @@ +void checkIntegrity(void); +void checkLeak(void); +void *debugMalloc(unsigned int length, int tag); +void *debugRealloc(void *memory, unsigned int length, int tag); +void debugFree(void *memoryParameter); diff --git a/batman.c b/batman.c index 793d5fb..585889d 100644 --- a/batman.c +++ b/batman.c @@ -25,6 +25,7 @@ #include "os.h" #include "list.h" #include "batman.h" +#include "allocate.h" /* "-d" is the command line switch for the debug level, * specify it multiple times to increase verbosity @@ -175,7 +176,7 @@ struct orig_node *get_orig_node( unsigned int addr ) if (debug_level == 4) output("Creating new originator\n"); - orig_node = alloc_memory(sizeof(struct orig_node)); + orig_node = debugMalloc(sizeof(struct orig_node), 1); memset(orig_node, 0, sizeof(struct orig_node)); INIT_LIST_HEAD(&orig_node->list); INIT_LIST_HEAD(&orig_node->neigh_list); @@ -185,7 +186,7 @@ struct orig_node *get_orig_node( unsigned int addr ) orig_node->packet_count = 0; orig_node->hna_buff_len = 0; - orig_node->last_reply = alloc_memory( found_ifs * sizeof(int) ); + orig_node->last_reply = debugMalloc( found_ifs * sizeof(int), 2 ); memset( orig_node->last_reply, 0, found_ifs * sizeof(int) ); list_add_tail(&orig_node->list, &orig_list); @@ -214,7 +215,7 @@ void add_del_hna( struct orig_node *orig_node, int del ) { if ( del ) { - free_memory( orig_node->hna_buff ); + debugFree( orig_node->hna_buff ); orig_node->hna_buff_len = 0; } @@ -379,6 +380,8 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ max_pack = neigh_pkts[max_if->if_num]; max_ttl = neigh_ttl[max_if->if_num]; + orig_node->packet_count = neigh_pkts[max_if->if_num]; + next_hop = neigh_node; if ( debug_level == 4 ) output( "%d living received packets via selected router \n", neigh_pkts[max_if->if_num] ); @@ -427,7 +430,7 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ /* add new announced network(s) */ if ( hna_buff_len > 0 ) { - orig_node->hna_buff = alloc_memory( hna_buff_len ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 3 ); orig_node->hna_buff_len = hna_buff_len; memcpy( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -443,7 +446,7 @@ static void update_routes( struct orig_node *orig_node, unsigned char *hna_recv_ if ( hna_buff_len > 0 ) { - orig_node->hna_buff = alloc_memory( hna_buff_len ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 4 ); orig_node->hna_buff_len = hna_buff_len; memcpy( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -481,7 +484,7 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla if ( new_gwflags == 0 ) { list_del(gw_pos); - free_memory(gw_pos); + debugFree(gw_pos); if (debug_level == 3) printf( "Gateway %s removed from gateway list\n", orig_str ); @@ -504,7 +507,7 @@ static void update_gw_list( struct orig_node *orig_node, unsigned char new_gwfla printf( "Found new gateway %s -> class: %i - %s\n", orig_str, new_gwflags, gw2string[new_gwflags] ); } - gw_node = alloc_memory(sizeof(struct gw_node)); + gw_node = debugMalloc(sizeof(struct gw_node), 5); memset(gw_node, 0, sizeof(struct gw_node)); INIT_LIST_HEAD(&gw_node->list); @@ -731,15 +734,17 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if list_for_each(neigh_pos, &orig_node->neigh_list) { neigh_node = list_entry(neigh_pos, struct neigh_node, list); - if (neigh_node->addr != neigh) - neigh_node = NULL; + if (neigh_node->addr == neigh) + break; + + neigh_node = NULL; } if (neigh_node == NULL) { if (debug_level == 4) output("Creating new last-hop neighbour of originator\n"); - neigh_node = alloc_memory(sizeof (struct neigh_node)); + neigh_node = debugMalloc(sizeof (struct neigh_node), 6); INIT_LIST_HEAD(&neigh_node->list); INIT_LIST_HEAD(&neigh_node->pack_list); @@ -752,15 +757,17 @@ void update_originator( struct packet *in, unsigned int neigh, struct batman_if list_for_each(pack_pos, &neigh_node->pack_list) { pack_node = list_entry(pack_pos, struct pack_node, list); - if (pack_node->seqno != in->seqno) - pack_node = NULL; + if (pack_node->seqno == in->seqno) + break; + + pack_node = NULL; } if (pack_node == NULL) { if (debug_level == 4) output("Creating new packet entry for last-hop neighbour of originator \n"); - pack_node = alloc_memory(sizeof (struct pack_node)); + pack_node = debugMalloc(sizeof (struct pack_node), 7); INIT_LIST_HEAD(&pack_node->list); pack_node->seqno = in->seqno; @@ -792,20 +799,20 @@ void schedule_forward_packet( struct packet *in, int unidirectional, int directl } else { - forw_node_new = alloc_memory( sizeof(struct forw_node) ); + forw_node_new = debugMalloc( sizeof(struct forw_node), 8 ); INIT_LIST_HEAD(&forw_node_new->list); if ( hna_buff_len > 0 ) { - forw_node_new->pack_buff = alloc_memory( sizeof(struct packet) + hna_buff_len ); + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + hna_buff_len, 9 ); 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 = alloc_memory( sizeof(struct packet) ); + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 10 ); memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); forw_node_new->pack_buff_len = sizeof(struct packet); @@ -942,8 +949,8 @@ void send_outstanding_packets() { list_del( forw_pos ); - free_memory( forw_node->pack_buff ); - free_memory( forw_node ); + debugFree( forw_node->pack_buff ); + debugFree( forw_node ); } @@ -967,7 +974,7 @@ void schedule_own_packet() { batman_if = list_entry(if_pos, struct batman_if, list); - forw_node_new = alloc_memory( sizeof(struct forw_node) ); + forw_node_new = debugMalloc( sizeof(struct forw_node), 11 ); INIT_LIST_HEAD(&forw_node_new->list); @@ -977,14 +984,14 @@ void schedule_own_packet() { if ( num_hna > 0 ) { - forw_node_new->pack_buff = alloc_memory( sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char) ); + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char), 12 ); 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 = alloc_memory( sizeof(struct packet) ); + forw_node_new->pack_buff = debugMalloc( sizeof(struct packet), 13 ); memcpy( forw_node_new->pack_buff, &batman_if->out, sizeof(struct packet) ); forw_node_new->pack_buff_len = sizeof(struct packet); @@ -1041,7 +1048,7 @@ void purge() purged_packets++; list_del(pack_pos); - free_memory(pack_node); + debugFree(pack_node); } else { @@ -1060,7 +1067,7 @@ void purge() output("Removing orphaned neighbour %s for originator %s\n", neigh_str, orig_str); } list_del(neigh_pos); - free_memory(neigh_node); + debugFree(neigh_node); } } @@ -1083,7 +1090,7 @@ void purge() printf( "Removing gateway %s from gateway list\n", orig_str ); list_del(gw_pos); - free_memory(gw_pos); + debugFree(gw_pos); gw_purged = 1; @@ -1099,7 +1106,7 @@ void purge() if ( orig_node->hna_buff_len > 0 ) { add_del_hna( orig_node, 1 ); - free_memory( orig_node->hna_buff ); + debugFree( orig_node->hna_buff ); } @@ -1112,8 +1119,8 @@ void purge() } - free_memory( orig_node->last_reply ); - free_memory( orig_node ); + debugFree( orig_node->last_reply ); + debugFree( orig_node ); } else if ( purged_packets > 0 ) { @@ -1144,7 +1151,7 @@ void send_vis_packet() if(cnt >= size) { size += step; - packet = realloc_memory(packet, size * sizeof(unsigned char)); + packet = debugRealloc(packet, size * sizeof(unsigned char), 14); } memmove(&packet[cnt], (unsigned char*)&orig_node->orig,4); *(packet + cnt + 4) = (unsigned char) orig_node->packet_count; @@ -1154,7 +1161,7 @@ void send_vis_packet() if(packet != NULL) { send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); - free_memory(packet); + debugFree(packet); } } @@ -1181,7 +1188,7 @@ int batman() hna_node = list_entry(hna_pos, struct hna_node, list); - hna_buff = realloc_memory( hna_buff, ( num_hna + 1 ) * 5 * sizeof( unsigned char ) ); + hna_buff = debugRealloc( hna_buff, ( num_hna + 1 ) * 5 * sizeof( unsigned char ), 15 ); memmove( &hna_buff[ num_hna * 5 ], ( unsigned char *)&hna_node->addr, 4 ); hna_buff[ ( num_hna * 5 ) + 4 ] = ( unsigned char ) hna_node->netmask; @@ -1462,6 +1469,7 @@ int batman() debug_timeout = get_time(); debug(); + checkIntegrity(); } @@ -1487,6 +1495,8 @@ int batman() set_forwarding( forward_old ); + checkLeak(); + return 0; } diff --git a/os.h b/os.h index 345337d..82b28a7 100644 --- a/os.h +++ b/os.h @@ -28,9 +28,6 @@ int get_forwarding(void); void output(char *format, ...); void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router, int del, char *dev, int sock ); int is_aborted(); -void *alloc_memory(int len); -void *realloc_memory(void *ptr, int len); -void free_memory(void *mem); void addr_to_string(unsigned int addr, char *str, int len); int receive_packet(unsigned char *packet_buff, int packet_buff_len, int *hna_buff_len, unsigned int *neigh, unsigned int timeout, struct batman_if **if_incoming); int send_packet(unsigned char *buff, int len, struct sockaddr_in *broad, int sock); diff --git a/posix.c b/posix.c index 2cd9c5e..3287fb0 100644 --- a/posix.c +++ b/posix.c @@ -39,7 +39,7 @@ #include "os.h" #include "batman.h" #include "list.h" - +#include "allocate.h" #define BAT_LOGO_PRINT(x,y,z) printf( "\x1B[%i;%iH%c", y + 1, x, z ) /* write char 'z' into column 'x', row 'y' */ #define BAT_LOGO_END(x,y) printf("\x1B[8;0H");fflush(NULL);bat_wait( x, y ); /* end of current picture */ @@ -519,39 +519,6 @@ int is_aborted() return stop != 0; } -void *alloc_memory(int len) -{ - - void *res = malloc(len); - - if (res == NULL) - { - do_log( "Error - out of memory: %s\n", strerror(errno) ); - exit(EXIT_FAILURE); - } - - return res; - -} - -void *realloc_memory(void *ptr, int len) -{ - void *res = realloc(ptr,len); - - if (res == NULL) - { - do_log( "Error - out of memory: %s\n", strerror(errno) ); - exit(EXIT_FAILURE); - } - - return res; -} - -void free_memory(void *mem) -{ - free(mem); -} - void addr_to_string(unsigned int addr, char *str, int len) { inet_ntop(AF_INET, &addr, str, len); @@ -725,7 +692,7 @@ void *gw_listen( void *arg ) { /* new client */ if ( FD_ISSET( batman_if->tcp_gw_sock, &tmp_wait_sockets ) ) { - gw_client = alloc_memory( sizeof(struct gw_client) ); + gw_client = debugMalloc( sizeof(struct gw_client), 18 ); memset( gw_client, 0, sizeof(struct gw_client) ); if ( ( gw_client->sock = accept(batman_if->tcp_gw_sock, (struct sockaddr *)&gw_client->addr, &sin_size) ) == -1 ) { @@ -829,7 +796,7 @@ void *gw_listen( void *arg ) { close( gw_client->sock ); list_del(client_pos); - free_memory(client_pos); + debugFree(client_pos); } @@ -874,7 +841,7 @@ void *gw_listen( void *arg ) { } list_del(client_pos); - free_memory(client_pos); + debugFree(client_pos); } else { @@ -951,7 +918,7 @@ int main(int argc, char *argv[]) } - hna_node = alloc_memory(sizeof(struct hna_node)); + hna_node = debugMalloc(sizeof(struct hna_node), 16); memset(hna_node, 0, sizeof(struct hna_node)); INIT_LIST_HEAD(&hna_node->list); @@ -1149,7 +1116,7 @@ int main(int argc, char *argv[]) while ( argc > found_args ) { - batman_if = alloc_memory(sizeof(struct batman_if)); + batman_if = debugMalloc(sizeof(struct batman_if), 17); memset(batman_if, 0, sizeof(struct batman_if)); INIT_LIST_HEAD(&batman_if->list); INIT_LIST_HEAD(&batman_if->client_list); -- 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 2c509899635d6af11d290167456f58d3c7d92e45 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 11 13:13:28 2006 +0100 - new batman animation - rebroadcast packets with IDF and TTL 1 only on incoming interface diff --git a/batman.c b/batman.c index ee74227..9cf73ed 100644 --- a/batman.c +++ b/batman.c @@ -861,6 +861,8 @@ void send_outstanding_packets() { if ( debug_level == 4 ) 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 ); + if ( ((struct packet *)forw_node->pack_buff)->flags & UNIDIRECTIONAL ) { @@ -879,11 +881,24 @@ void send_outstanding_packets() { } - } else { + /* 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 { + + do_log( "Error - can't forward packet with IDF: outgoing iface not specified (multihomed) \n", "" ); + + } - directlink = ( ( ((struct packet *)forw_node->pack_buff)->flags & DIRECTLINK ) ? 1 : 0 ); + } else { - if ( ( directlink ) && ( forw_node->if_outgoing == NULL ) ) { + if ( ( directlink ) && ( forw_node->if_outgoing == NULL ) ) { do_log( "Error - can't forward packet with IDF: outgoing iface not specified \n", "" ); @@ -893,10 +908,11 @@ void send_outstanding_packets() { batman_if = list_entry(if_pos, struct batman_if, list); - if ( ( directlink ) && ( forw_node->if_outgoing == batman_if ) ) + if ( ( directlink ) && ( forw_node->if_outgoing == batman_if ) ) { ((struct packet *)forw_node->pack_buff)->flags = DIRECTLINK; - else + } else { ((struct packet *)forw_node->pack_buff)->flags = 0x00; + } if ( debug_level == 4 ) output( "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ((struct packet *)forw_node->pack_buff)->seqno, ((struct packet *)forw_node->pack_buff)->ttl, batman_if->dev ); diff --git a/batman.h b/batman.h index d62a456..f7c5a17 100644 --- a/batman.h +++ b/batman.h @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1 rc6" +#define VERSION "0.1 rc7" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0x80 diff --git a/posix.c b/posix.c index 85f4ccf..7830afa 100644 --- a/posix.c +++ b/posix.c @@ -40,6 +40,11 @@ #include "batman.h" #include "list.h" + +#define BAT_LOGO_PRINT(x,y,z) printf( "\x1B[%i;%iH%c", y + 1, x, z ) /* write char 'z' into column 'x', row 'y' */ +#define BAT_LOGO_END(x,y) printf("\x1B[8;0H");fflush(NULL);bat_wait( x, y ); /* end of current picture */ + + extern struct vis_if vis_if; static struct timeval start_time; @@ -85,6 +90,8 @@ void output(char *format, ...) va_end(args); } + + void do_log( char *description, char *error_msg ) { if ( debug_level == 0 ) { @@ -101,6 +108,137 @@ void do_log( char *description, char *error_msg ) { +/* batman animation */ +void sym_print( char x, char y, char *z ) { + + char i = 0, Z; + + do{ + + BAT_LOGO_PRINT( 25 + (int)x + (int)i, (int)y, z[(int)i] ); + + switch ( z[(int)i] ) { + + case 92: + Z = 47; // "\" --> "/" + break; + + case 47: + Z = 92; // "/" --> "\" + break; + + case 41: + Z = 40; // ")" --> "(" + break; + + default: + Z = z[(int)i]; + break; + + } + + BAT_LOGO_PRINT( 24 - (int)x - (int)i, (int)y, Z ); + i++; + + } while( z[(int)i - 1] ); + + return; + +} + + + +void bat_wait( int T, int t ) { + + struct timeval time; + + time.tv_sec = T; + time.tv_usec = ( t * 10000 ); + + select(0, NULL, NULL, NULL, &time); + + return; + +} + + + +int print_animation( void ) { + + system( "clear" ); + BAT_LOGO_END( 0, 50 ); + + sym_print( 0, 3, "." ); + BAT_LOGO_END( 1, 0 ); + + sym_print( 0, 4, "v" ); + BAT_LOGO_END( 0, 20 ); + + sym_print( 1, 3, "^" ); + BAT_LOGO_END( 0, 20 ); + + sym_print( 1, 4, "/" ); + sym_print( 0, 5, "/" ); + BAT_LOGO_END( 0, 10 ); + + sym_print( 2, 3, "\\" ); + sym_print( 2, 5, "/" ); + sym_print( 0, 6, ")/" ); + BAT_LOGO_END( 0, 10 ); + + sym_print( 2, 3, "_\\" ); + sym_print( 4, 4, ")" ); + sym_print( 2, 5, " /" ); + sym_print( 0, 6, " )/" ); + BAT_LOGO_END( 0, 10 ); + + sym_print( 4, 2, "'\\" ); + sym_print( 2, 3, "__/ \\" ); + sym_print( 4, 4, " )" ); + sym_print( 1, 5, " " ); + sym_print( 2, 6, " /" ); + sym_print( 3, 7, "\\" ); + BAT_LOGO_END( 0, 15 ); + + sym_print( 6, 3, " \\" ); + sym_print( 3, 4, "_ \\ \\" ); + sym_print( 10, 5, "\\" ); + sym_print( 1, 6, " \\" ); + sym_print( 3, 7, " " ); + BAT_LOGO_END( 0, 20 ); + + sym_print( 7, 1, "____________" ); + sym_print( 7, 3, " _ \\" ); + sym_print( 3, 4, "_ " ); + sym_print( 10, 5, " " ); + sym_print( 11, 6, " " ); + BAT_LOGO_END( 0, 25 ); + + sym_print( 3, 1, "____________ " ); + sym_print( 1, 2, "'|\\ \\" ); + sym_print( 2, 3, " / " ); + sym_print( 3, 4, " " ); + BAT_LOGO_END( 0, 25 ); + + sym_print( 3, 1, " ____________" ); + sym_print( 1, 2, " '\\ " ); + sym_print( 2, 3, "__/ _ \\" ); + sym_print( 3, 4, "_" ); + BAT_LOGO_END( 0, 35 ); + + sym_print( 7, 1, " " ); + sym_print( 7, 3, " \\ " ); + sym_print( 5, 4, "\\ \\" ); + sym_print( 11, 5, "\\" ); + sym_print( 12, 6, "\\" ); + BAT_LOGO_END( 0 ,35 ); + + return 0; + +} + + + void *client_to_gw_tun( void *arg ) { struct gw_node *gw_node = (struct gw_node *)arg; @@ -788,7 +926,6 @@ int main(int argc, char *argv[]) struct batman_if *batman_if; struct hna_node *hna_node; struct ifreq int_req; - struct timespec sleep_time = { 0, 250 * 1000 * 1000 }; /* 500 mili seconds */ int on = 1, res, optchar, found_args = 1, netmask; char str1[16], str2[16], *dev, *slash_ptr; unsigned int vis_server = 0; @@ -957,35 +1094,12 @@ int main(int argc, char *argv[]) break; case 'V': - res = 3; - - while( res > 0 ) { - system( "clear" ); - printf( "\n\n ____________ ____________\n / /|\\` ´/|\\ \\ \n \\ ^..^ / \n \\vv/ \n \\/ \n" ); - nanosleep( &sleep_time, NULL ); - - system( "clear" ); - printf( "\n\n ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); - nanosleep( &sleep_time, NULL ); - - system( "clear" ); - printf( "\n\n\n /\\` ´\\ \n / \\__^..^__/ \\ \n / / _\\vv/ _\\ \\ \n / \\/ \\ \n / \\ \n\n" ); - nanosleep( &sleep_time, NULL ); - - system( "clear" ); - printf( "\n\n ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); - nanosleep( &sleep_time, NULL ); - - res--; - - } + print_animation(); - system( "clear" ); + printf( "\x1B[0;0HB.A.T.M.A.N-III v%s (internal version %i)", VERSION, BATMAN_VERSION ); + printf( "\x1B[9;0HMay the bat guide your path ...\n" ); - printf( "B.A.T.M.A.N-III v%s (internal version %i)\n\n", VERSION, BATMAN_VERSION ); - printf( " ____________ ____________\n /` ´\\ \n / _ \\__^..^__/ _ \\ \n _\\vv/ _\n \\/ \n\n" ); - printf( "May the bat guide your path ...\n" ); return (0); case 'h': -- 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 562c4f4aff17bcc59433553f993ca75b3ade90cd Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Dec 8 18:22:46 2006 +0100 fix documentation diff --git a/INSTALL b/INSTALL index 3dcbfe2..b608c24 100644 --- a/INSTALL +++ b/INSTALL @@ -29,9 +29,9 @@ Use - like always - at your own risk! Features -------- -Improved B.A.T.M.A.N-III algorithm -IP-Tunnels via UDP -Gateway classes +Improved B.A.T.M.A.N-III algorithm +IP-Tunnels via UDP +Gateway classes Multiple Interfaces support Support for a server that collects link-state information from each node to generate two dimensional or three dimensional topology graphs. @@ -44,7 +44,7 @@ Roadmap Testing, improvements in the documentation. Support for Free-BSD and Mac OS-X is broken at the moment since we -introduced UDP-Tunnels - we hope this will be fixed in the near future. +introduced UDP-Tunnels - we hope this will be fixed in the near future. Develop B.A.T.M.A.N-Advanced that routes on Layer 2 and creates a Link-Local-Illusion for higher OSI-Layers @@ -73,7 +73,7 @@ executable is quite big because it is not stripped. Strip it by performing: -strip batman <press enter> +strip batmand <press enter> Note there is no installation script at the moment. If you want to install it, copy the deamon to a location somewhere in your path, for example @@ -89,12 +89,12 @@ executing: ipkg update -ipkg install batman-iii +ipkg install batman-iii If you use Freifunk-Firmware you can use the web user-interface for b.a.t.m.a.n: -ipkg install batman-iii +ipkg install freifunk-batman-de @@ -102,19 +102,19 @@ ipkg install batman-iii Use --- -Make sure you have no firewall running that is blocking UDP port 1966. +Make sure you have no firewall running that is blocking UDP port 1966. I like examples - so let's start with them. I'll assume you perform the following steps in the batman source directory after compilation. Typical client usage example: -./batman -p <ip of preferred gateway> -r 2 -o 2000 -s <visualisation-server ip> wlan0 eth1 ath0 +batmand -p <ip of preferred gateway> -r 2 -o 2000 -s <visualisation-server ip> wlan0 eth1 ath0 Typical gateway usage example: -./batman -g 7 -o 2000 -s <visualisation-server ip> ath0 +batmand -g 7 -o 2000 -s <visualisation-server ip> ath0 NOTE: @@ -123,11 +123,11 @@ class will be used to look for a fallback gateway if the preferred gateway is unavailable. Level 2 or 3 is recommended. Level 1 is not really useable yet. -Originator interval must be the same on all nodes in the mesh. - +Originator interval must be the same on all nodes in the mesh. + Here's what you see if you start long help (with some extra comments) -./batman -H +batmand -H Usage: batman [options] interface [interface interface] @@ -172,7 +172,7 @@ Usage: batman [options] interface [interface interface] therefore weaker routes will find their way into the routing table. And vice versa. - + -p preferred gateway This will set up an IP-Tunnel to the destination IP @@ -220,9 +220,9 @@ ifconfig wlan0:0 103.30.30.30 netmask 255.0.0.0 broadcast 103.255.255.255 The ifconfig command may not be available on your system. To perform the same operation using the command provided by iproute2: -ip addr add 103.30.30.30/8 dev wlan0 label wlan0:0 +ip addr add 103.30.30.30/8 broadcast 103.255.255.255 dev wlan0 label wlan0:0 -./batman -o 2000 wlan0:0 +batmand -o 2000 wlan0:0 Now you can check out which protocol works better. -- 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 981d5c2ff81a773b6d17708ef4f8a2319575e240 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 7 16:41:56 2006 +0100 non-primary interfaces do not send hna information II diff --git a/batman.c b/batman.c index 047f5cc..ee74227 100644 --- a/batman.c +++ b/batman.c @@ -812,6 +812,7 @@ void schedule_forward_packet( struct packet *in, int unidirectional, int directl ((struct packet *)forw_node_new->pack_buff)->ttl--; forw_node_new->when = get_time(); + forw_node_new->own = 0; forw_node_new->if_outgoing = if_outgoing; @@ -901,7 +902,7 @@ void send_outstanding_packets() { output( "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ((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 ( ( batman_if->if_num > 1 ) && ( forw_node->own ) ) { + 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 ); @@ -954,7 +955,7 @@ void schedule_own_packet() { forw_node_new->when = curr_time + rand_num( JITTER ); forw_node_new->if_outgoing = NULL; - forw_node_new->own++; + forw_node_new->own = 1; if ( num_hna > 0 ) { diff --git a/batman.h b/batman.h index 2e46f73..d62a456 100644 --- a/batman.h +++ b/batman.h @@ -24,7 +24,7 @@ #include <pthread.h> #include "list.h" -#define VERSION "0.1 rc 6b" +#define VERSION "0.1 rc6" #define BATMAN_VERSION 1 #define PORT 1966 #define UNIDIRECTIONAL 0x80 @@ -77,12 +77,12 @@ struct orig_node /* structure for orig_list maintaining nodes of unsigned int orig; unsigned int router; struct batman_if *batman_if; - unsigned int packet_count; /* packets gathered from its router */ - unsigned int last_seen; /* when last originator packet (with new seq-number) from this node was received */ + unsigned int packet_count; /* packets gathered from its router */ + unsigned int last_seen; /* when last originator packet (with new seq-number) from this node was received */ unsigned int *last_reply; /* if node is a neighbour, when my originator packet was last broadcasted (replied) by this node and received by me */ - unsigned int last_aware; /* if node is a neighbour, when last packet via this node was received */ + unsigned int last_aware; /* if node is a neighbour, when last packet via this node was received */ unsigned char flags; - unsigned char gwflags; /* flags related to gateway functions: gateway class */ + unsigned char gwflags; /* flags related to gateway functions: gateway class */ unsigned char *hna_buff; int hna_buff_len; struct list_head neigh_list; @@ -163,10 +163,6 @@ struct vis_if { struct sockaddr_in addr; }; -/* -static void update_routes(); -static void debug(); -*/ int batman(); -- 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 fdf053af6208ece48362f9f684f65dfda4b1db4d Author: Corinna 'Elektra' Aichele <onelektra(a)gmx.net> Date: Fri Dec 8 16:37:56 2006 +0100 Some updates in the documentation for the upcoming release. diff --git a/INSTALL b/INSTALL index cf44dc2..3dcbfe2 100644 --- a/INSTALL +++ b/INSTALL @@ -8,6 +8,7 @@ Axel Neumann (neumann-at-notmail.org) Corinna 'Elektra' Aichele (onelektra-at-gmx.net) Thomas Lopatic (thomas-at-lopatic.de) Felix Fietkau (nbd-at-nbd.name) +Ludger Schmudde (lui-at-schmudde.com) ------- @@ -18,8 +19,8 @@ This is still a experimental piece of code to test the viability of the B.A.T.M.A.N routing algorithm based on initial ideas of Thomas Lopatic and Corinna 'Elektra' Aichele. -This is implementation 0.1-rc0 of the improved B.A.T.M.A.N-III algorithm. It -is not unlikely that we have to fix some bugs. +This is implementation 0.1-rc6b of the improved B.A.T.M.A.N-III algorithm. It +is not unlikely that we still have to fix some bugs. Use - like always - at your own risk! @@ -29,8 +30,6 @@ Features -------- Improved B.A.T.M.A.N-III algorithm -Free-BSD support -Mac OS-X support IP-Tunnels via UDP Gateway classes Multiple Interfaces support @@ -42,7 +41,10 @@ dimensional or three dimensional topology graphs. Roadmap ------- -Testing, improvements in the documentation. +Testing, improvements in the documentation. + +Support for Free-BSD and Mac OS-X is broken at the moment since we +introduced UDP-Tunnels - we hope this will be fixed in the near future. Develop B.A.T.M.A.N-Advanced that routes on Layer 2 and creates a Link-Local-Illusion for higher OSI-Layers @@ -56,8 +58,6 @@ Requirements ------------ Linux with kernel-module 'tun' loaded if you want to use/be a gateway -FreeBSD -MacOS-X ------------ Installation @@ -79,6 +79,23 @@ Note there is no installation script at the moment. If you want to install it, copy the deamon to a location somewhere in your path, for example /usr/sbin or /usr/local/bin. +If you use a wireless router based on Freifunk-Firmware or OpenWRT you can +use the ipkg-package management system. Add the line: + +src lui http://freifunk.schmudde.com/ipkg + +to your package sources and update the list of available packages by +executing: + +ipkg update + +ipkg install batman-iii + +If you use Freifunk-Firmware you can use the web user-interface for +b.a.t.m.a.n: + +ipkg install batman-iii + --- @@ -142,6 +159,20 @@ Usage: batman [options] interface [interface interface] -o orginator interval in ms default: 1000, allowed values: >0 + Note: By default B.A.T.M.A.N keeps track of packets received in the + last 60 seconds (this is called sliding window size). B.A.T.M.A.N + will perform it's routing decisions based on statistics about 60 + packages for a node with an orginator interval of one second. If a + node manages to send us at least 1 message in 60 seconds, it will be + in our routing table. If the orginator interval is increased to 3 + seconds only 20 packets will be kept in the B.A.T.M.A.N statistic - + thus the node must manage to send us 1 out of 20 packets to be in + our routing table. If the sliding window size has more space for + orginator messages the range of multi-hop links will be longer and + therefore weaker routes will find their way into the routing table. + And vice versa. + + -p preferred gateway This will set up an IP-Tunnel to the destination IP @@ -186,6 +217,11 @@ IP-address within another network: ifconfig wlan0:0 103.30.30.30 netmask 255.0.0.0 broadcast 103.255.255.255 +The ifconfig command may not be available on your system. To perform the +same operation using the command provided by iproute2: + +ip addr add 103.30.30.30/8 dev wlan0 label wlan0:0 + ./batman -o 2000 wlan0:0 Now you can check out which protocol works better. diff --git a/README b/README index 3f2465a..5d96233 100644 --- a/README +++ b/README @@ -6,18 +6,19 @@ BETTER APPROACH TO MOBILE AD-HOC NETWORKING # 1.) INTRODUCTION # #################### -B.A.T.M.A.N is a new approach to Ad-Hoc-Routing, unlike other -algorithms that we are aware of. Reactive MANET protocols search for -routes when a node initiates communication to a remote node. Proactive -protocols (link-state algorithms) calculate routes proactively from all -nodes to all nodes in the mesh-cloud, whether they are necessary or -not. B.A.T.M.A.N doesn't calculate routes - it continuously detects -the existence of routes by forwarding and receiving broadcast -packets. The algorithm does not try to find out which path packets -follow to a remote node. B.A.T.M.A.N merely checks which single hop -neighbor it has to send a package to in order to push it on the best -way to a node in the mesh. If you want to find out how B.A.T.M.A.N -routes to a certain node, perform a +B.A.T.M.A.N is a new approach to Ad-Hoc-Routing, unlike other algorithms +that we are aware of. Reactive MANET protocols search for routes when a node +initiates communication to a remote node. Proactive protocols (all +link-state algorithms and some distance-vector algorithms) calculate routes +proactively from all nodes to all nodes in the mesh-cloud, whether they are +necessary or not - while reactive protocols search for routes on demand. +B.A.T.M.A.N doesn't calculate or search for routes - it continuously detects +the existence of routes by forwarding and receiving broadcast packets, and +it proactively populates the routing-table with nodes in the mesh. The +algorithm does not try to find out which path packets follow to a remote +node. B.A.T.M.A.N merely checks which single hop neighbor it has to send a +package to in order to push it on the best way to a node in the mesh. If you +want to find out how B.A.T.M.A.N routes to a certain node, perform a ping -R <destination address> -- 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 23ac9bd6b8de78c717f90315d7e6625d41b35e08 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 6 17:33:06 2006 +0100 - fix crash while checking for bidrectional neighbour - flags adjusted diff --git a/batman.c b/batman.c index fe8f9b1..c349842 100644 --- a/batman.c +++ b/batman.c @@ -1324,11 +1324,11 @@ int batman() } else { + orig_neigh_node = update_last_hop( &in, neigh ); + is_duplicate = isDuplicate( in.orig, in.seqno ); is_bidirectional = isBidirectionalNeigh( orig_neigh_node, if_incoming ); - orig_neigh_node = update_last_hop( &in, neigh ); - /* update ranking */ if ( ( is_bidirectional ) && ( !is_duplicate ) ) update_originator( &in, neigh, if_incoming, hna_recv_buff, hna_buff_len ); diff --git a/batman.h b/batman.h index 5e793de..8b6a9e2 100644 --- a/batman.h +++ b/batman.h @@ -27,8 +27,8 @@ #define VERSION "0.1 rc 6b" #define BATMAN_VERSION 1 #define PORT 1966 -#define UNIDIRECTIONAL 0xF0 -#define DIRECTLINK 0x80 +#define UNIDIRECTIONAL 0x80 +#define DIRECTLINK 0x40 #define ADDR_STR_LEN 16 /* -- 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 f4e4bc8adf4eaf16d42da3ffe81c38f6f28c4d17 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 7 16:11:25 2006 +0100 non-primary interfaces do not send hna information diff --git a/batman.c b/batman.c index c349842..047f5cc 100644 --- a/batman.c +++ b/batman.c @@ -900,8 +900,19 @@ void send_outstanding_packets() { if ( debug_level == 4 ) output( "Forwarding packet (originator %s, seqno %d, TTL %d) on interface %s\n", orig_str, ((struct packet *)forw_node->pack_buff)->seqno, ((struct packet *)forw_node->pack_buff)->ttl, batman_if->dev ); - if ( send_packet( forw_node->pack_buff, forw_node->pack_buff_len, &batman_if->broad, batman_if->udp_send_sock ) < 0 ) { - exit( -1 ); + /* non-primary interfaces do not send hna information */ + if ( ( batman_if->if_num > 1 ) && ( forw_node->own ) ) { + + 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 ); + } + } } @@ -943,6 +954,7 @@ void schedule_own_packet() { forw_node_new->when = curr_time + rand_num( JITTER ); forw_node_new->if_outgoing = NULL; + forw_node_new->own++; if ( num_hna > 0 ) { @@ -1205,7 +1217,7 @@ int batman() if ( debug_level == 4 ) { addr_to_string(in.orig, orig_str, sizeof (orig_str)); addr_to_string(neigh, neigh_str, sizeof (neigh_str)); - output("Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, in.seqno, in.ttl); + output( "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d)\n", neigh_str, orig_str, in.seqno, in.ttl ); } is_my_addr = is_my_orig = is_broadcast = is_duplicate = is_bidirectional = forward_duplicate_packet = 0; @@ -1286,17 +1298,17 @@ int batman() if ( debug_level == 4 ) output( "Drop packet: incompatible batman version (%i) \n", in.version ); - } else if ( is_my_addr == 1 ) { + } else if ( is_my_addr ) { if ( debug_level == 4 ) { - addr_to_string(neigh, neigh_str, sizeof (neigh_str)); + addr_to_string( neigh, neigh_str, sizeof (neigh_str) ); output( "Drop packet: received my own broadcast (sender: %s)\n", neigh_str ); } - } else if ( is_broadcast == 1 ) { + } else if ( is_broadcast ) { if ( debug_level == 4 ) { - addr_to_string(neigh, neigh_str, sizeof (neigh)); + addr_to_string( neigh, neigh_str, sizeof (neigh) ); output( "Drop packet: ignoring all packets with broadcast source IP (sender: %s)\n", neigh_str ); } @@ -1363,7 +1375,7 @@ int batman() if ( !is_duplicate ) { - schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, NULL ); + schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: rebroadcast orginator packet \n" ); @@ -1388,7 +1400,7 @@ int batman() /* we are forwarding duplicate o-packets if they come via our best neighbour and ttl is valid */ if ( forward_duplicate_packet ) { - schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, NULL ); + schedule_forward_packet( &in, 0, 0, orig_neigh_node, neigh, hna_recv_buff, hna_buff_len, if_incoming ); if ( debug_level == 4 ) output( "Forward packet: duplicate packet received via best neighbour with best ttl \n" ); diff --git a/batman.h b/batman.h index 8b6a9e2..2e46f73 100644 --- a/batman.h +++ b/batman.h @@ -119,6 +119,7 @@ struct forw_node /* structure for forw_list maintaining packets { struct list_head list; unsigned int when; + int own; unsigned char *pack_buff; int pack_buff_len; struct batman_if *if_outgoing; -- 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 6e4b21fe0c8f7c5ab0974cb2750750c6b41194f2 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 6 12:43:02 2006 +0100 - fix crash in schedule_forward_packet diff --git a/batman.c b/batman.c index f1c1a8c..1853846 100644 --- a/batman.c +++ b/batman.c @@ -804,7 +804,7 @@ void schedule_forward_packet( struct packet *in, int unidirectional, int directl } else { forw_node_new->pack_buff = alloc_memory( sizeof(struct packet) ); - memcpy( &forw_node_new->pack_buff, in, sizeof(struct packet) ); + memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); forw_node_new->pack_buff_len = sizeof(struct packet); } -- 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 a2e9661a48a6b947f4ffe9dacbda0f58eb134cdb Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Dec 6 12:52:21 2006 +0100 - fix another crash in schedule_forward_packet diff --git a/batman.c b/batman.c index 1853846..fe8f9b1 100644 --- a/batman.c +++ b/batman.c @@ -204,7 +204,7 @@ void add_del_hna( struct orig_node *orig_node, int del ) { netmask = ( unsigned int )orig_node->hna_buff[ ( hna_buff_count * 5 ) + 4 ]; if ( ( netmask > 0 ) && ( netmask < 33 ) ) - add_del_route( hna, netmask, orig_node->orig, del, orig_node->batman_if->dev, orig_node->batman_if->udp_send_sock ); + add_del_route( hna, netmask, orig_node->router, del, orig_node->batman_if->dev, orig_node->batman_if->udp_send_sock ); hna_buff_count++; @@ -798,7 +798,7 @@ void schedule_forward_packet( struct packet *in, int unidirectional, int directl forw_node_new->pack_buff = alloc_memory( sizeof(struct packet) + hna_buff_len ); memcpy( forw_node_new->pack_buff, in, sizeof(struct packet) ); - memcpy( forw_node_new->pack_buff + sizeof(struct packet), hna_buff, hna_buff_len ); + 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 { -- batman; test conversation

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010