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 3786437e29f1103a40163316137d0338efdd98c5 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Mar 9 13:36:00 2007 +0100 debugMalloc / debugFree renumbering diff --git a/batman.c b/batman.c index ed6a7eb..c853253 100644 --- a/batman.c +++ b/batman.c @@ -194,7 +194,7 @@ struct orig_node *get_orig_node( uint32_t addr ) { debug_output( 4, "Creating new originator\n" ); - orig_node = debugMalloc( sizeof(struct orig_node), 1 ); + 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); @@ -202,7 +202,7 @@ 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(uint32_t), 2 ); + 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 ); @@ -233,7 +233,7 @@ void add_del_hna( struct orig_node *orig_node, int8_t del ) { if ( del ) { - debugFree( orig_node->hna_buff, 101 ); + debugFree( orig_node->hna_buff, 1101 ); orig_node->hna_buff_len = 0; } @@ -403,7 +403,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, 3 ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 103 ); orig_node->hna_buff_len = hna_buff_len; memmove( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -426,7 +426,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, 4 ); + orig_node->hna_buff = debugMalloc( hna_buff_len, 104 ); orig_node->hna_buff_len = hna_buff_len; memcpy( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); @@ -481,7 +481,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), 5 ); + gw_node = debugMalloc( sizeof(struct gw_node), 105 ); memset( gw_node, 0, sizeof(struct gw_node) ); INIT_LIST_HEAD( &gw_node->list ); @@ -685,7 +685,7 @@ void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t debug_output( 4, "Creating new last-hop neighbour of originator\n" ); - neigh_node = debugMalloc( sizeof (struct neigh_node), 6 ); + neigh_node = debugMalloc( sizeof (struct neigh_node), 106 ); memset( neigh_node, 0, sizeof(struct neigh_node) ); INIT_LIST_HEAD( &neigh_node->list ); @@ -741,7 +741,7 @@ void schedule_own_packet( struct batman_if *batman_if ) { struct list_head *list_pos; - forw_node_new = debugMalloc( sizeof(struct forw_node), 11 ); + forw_node_new = debugMalloc( sizeof(struct forw_node), 107 ); INIT_LIST_HEAD( &forw_node_new->list ); @@ -751,14 +751,14 @@ void schedule_own_packet( struct batman_if *batman_if ) { if ( num_hna > 0 ) { - forw_node_new->pack_buff = debugMalloc( sizeof(struct packet) + num_hna * 5 * sizeof(unsigned char), 12 ); + 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), 13 ); + 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); @@ -798,20 +798,20 @@ void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t } else { - forw_node_new = debugMalloc( sizeof(struct forw_node), 8 ); + 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, 9 ); + 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), 10 ); + 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); @@ -950,8 +950,8 @@ void send_outstanding_packets() { if ( forw_node->own ) schedule_own_packet( forw_node->if_outgoing ); - debugFree( forw_node->pack_buff, 103 ); - debugFree( forw_node, 104 ); + debugFree( forw_node->pack_buff, 1102 ); + debugFree( forw_node, 1103 ); } else { @@ -992,7 +992,7 @@ void purge( uint32_t curr_time ) { neigh_node = list_entry(neigh_pos, struct neigh_node, list); list_del( neigh_pos ); - debugFree( neigh_node, 107 ); + debugFree( neigh_node, 1104 ); } @@ -1022,8 +1022,8 @@ void purge( uint32_t curr_time ) { update_routes( orig_node, NULL, NULL, 0 ); - debugFree( orig_node->bidirect_link, 109 ); - debugFree( orig_node, 110 ); + debugFree( orig_node->bidirect_link, 1105 ); + debugFree( orig_node, 1106 ); } else { @@ -1035,7 +1035,7 @@ void purge( uint32_t curr_time ) { if ( (int)( ( neigh_node->last_aware + ( 2 * TIMEOUT ) ) < curr_time ) ) { list_del( neigh_pos ); - debugFree( neigh_node, 108 ); + debugFree( neigh_node, 1107 ); } @@ -1052,7 +1052,7 @@ void purge( uint32_t curr_time ) { if ( ( gw_node->deleted ) && ( (int)((gw_node->deleted + 3 * TIMEOUT) < curr_time) ) ) { list_del( gw_pos ); - debugFree( gw_pos, 107 ); + debugFree( gw_pos, 1108 ); } @@ -1090,7 +1090,7 @@ void send_vis_packet() if(packet != NULL) { send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); - debugFree( packet, 111 ); + debugFree( packet, 1109 ); } } @@ -1414,12 +1414,12 @@ int8_t batman() { hna_node = list_entry(hna_pos, struct hna_node, list); - debugFree( hna_node, 114 ); + debugFree( hna_node, 1110 ); } if ( hna_buff != NULL ) - debugFree( hna_buff, 115 ); + debugFree( hna_buff, 1111 ); list_for_each_safe( forw_pos, forw_pos_tmp, &forw_list ) { @@ -1427,8 +1427,8 @@ int8_t batman() { list_del( forw_pos ); - debugFree( forw_node->pack_buff, 112 ); - debugFree( forw_node, 113 ); + debugFree( forw_node->pack_buff, 1112 ); + debugFree( forw_node, 1113 ); } diff --git a/posix-specific.c b/posix-specific.c index e6eb129..f8d4695 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -144,7 +144,7 @@ void *unix_listen( void *arg ) { /* new client */ if ( FD_ISSET( unix_if.unix_sock, &tmp_wait_sockets ) ) { - unix_client = debugMalloc( sizeof(struct unix_client), 133 ); + unix_client = debugMalloc( sizeof(struct unix_client), 201 ); memset( unix_client, 0, sizeof(struct unix_client) ); if ( ( unix_client->sock = accept( unix_if.unix_sock, (struct sockaddr *)&unix_client->addr, &sun_size) ) == -1 ) { @@ -195,7 +195,7 @@ void *unix_listen( void *arg ) { list_del( debug_pos ); debug_clients.clients_num[(int)unix_client->debug_level - '1']--; - debugFree( debug_pos, 263 ); + debugFree( debug_pos, 1201 ); break; @@ -207,7 +207,7 @@ void *unix_listen( void *arg ) { if ( unix_client->debug_level != buff[2] ) { - debug_level_info = debugMalloc( sizeof(struct debug_level_info), 57 ); + debug_level_info = debugMalloc( sizeof(struct debug_level_info), 202 ); INIT_LIST_HEAD( &debug_level_info->list ); debug_level_info->fd = unix_client->sock; list_add( &debug_level_info->list, (struct list_head *)debug_clients.fd_list[(int)buff[2] - '1'] ); @@ -242,7 +242,7 @@ void *unix_listen( void *arg ) { list_del( debug_pos ); debug_clients.clients_num[(int)unix_client->debug_level - '1']--; - debugFree( debug_pos, 264 ); + debugFree( debug_pos, 1202 ); break; @@ -260,7 +260,7 @@ void *unix_listen( void *arg ) { close( unix_client->sock ); list_del( unix_pos ); - debugFree( unix_pos, 231 ); + debugFree( unix_pos, 1203 ); } @@ -299,7 +299,7 @@ void *unix_listen( void *arg ) { list_del( debug_pos ); debug_clients.clients_num[(int)unix_client->debug_level - '1']--; - debugFree( debug_pos, 265 ); + debugFree( debug_pos, 1204 ); break; @@ -310,7 +310,7 @@ void *unix_listen( void *arg ) { } list_del( unix_pos ); - debugFree( unix_pos, 241 ); + debugFree( unix_pos, 1205 ); } @@ -380,7 +380,7 @@ void apply_init_args( int argc, char *argv[] ) { } - hna_node = debugMalloc( sizeof(struct hna_node), 16 ); + hna_node = debugMalloc( sizeof(struct hna_node), 203 ); memset( hna_node, 0, sizeof(struct hna_node) ); INIT_LIST_HEAD( &hna_node->list ); @@ -558,7 +558,7 @@ void apply_init_args( int argc, char *argv[] ) { for ( res = 0; res < 4; res++ ) { - debug_clients.fd_list[res] = debugMalloc( sizeof(struct list_head), 97 ); + debug_clients.fd_list[res] = debugMalloc( sizeof(struct list_head), 204 ); INIT_LIST_HEAD( (struct list_head *)debug_clients.fd_list[res] ); } @@ -583,7 +583,7 @@ void apply_init_args( int argc, char *argv[] ) { printf( "B.A.T.M.A.N.-III v%s (compability version %i)\n", SOURCE_VERSION, COMPAT_VERSION ); debug_clients.clients_num[ debug_level - 1 ]++; - debug_level_info = debugMalloc( sizeof(struct debug_level_info), 39 ); + debug_level_info = debugMalloc( sizeof(struct debug_level_info), 205 ); INIT_LIST_HEAD( &debug_level_info->list ); debug_level_info->fd = 1; list_add( &debug_level_info->list, (struct list_head *)debug_clients.fd_list[debug_level - 1] ); @@ -594,7 +594,7 @@ void apply_init_args( int argc, char *argv[] ) { while ( argc > found_args ) { - batman_if = debugMalloc( sizeof(struct batman_if), 17 ); + batman_if = debugMalloc( sizeof(struct batman_if), 206 ); memset( batman_if, 0, sizeof(struct batman_if) ); INIT_LIST_HEAD( &batman_if->list ); INIT_LIST_HEAD( &batman_if->client_list ); @@ -1028,7 +1028,7 @@ void *client_to_gw_tun( void *arg ) { debug_output( 0, "Error - can't create tcp socket: %s\n", strerror(errno) ); curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1206 ); return NULL; } @@ -1042,7 +1042,7 @@ void *client_to_gw_tun( void *arg ) { curr_gw_data->gw_node->unavail_factor++; curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1207 ); return NULL; } @@ -1056,7 +1056,7 @@ void *client_to_gw_tun( void *arg ) { debug_output( 0, "Error - can't create udp socket: %s\n", strerror(errno) ); close( curr_gateway_tcp_sock ); curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1208 ); return NULL; } @@ -1067,7 +1067,7 @@ void *client_to_gw_tun( void *arg ) { close( curr_gateway_tcp_sock ); close( curr_gateway_tun_sock ); curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1209 ); return NULL; } @@ -1082,7 +1082,7 @@ void *client_to_gw_tun( void *arg ) { close( curr_gateway_tcp_sock ); close( curr_gateway_tun_sock ); curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1210 ); return NULL; } @@ -1206,7 +1206,7 @@ void *client_to_gw_tun( void *arg ) { del_dev_tun( curr_gateway_tun_fd ); curr_gateway = NULL; - debugFree( arg, 248 ); + debugFree( arg, 1211 ); return NULL; @@ -1229,7 +1229,7 @@ int8_t add_default_route() { struct curr_gw_data *curr_gw_data; - curr_gw_data = debugMalloc( sizeof(struct curr_gw_data), 47 ); + curr_gw_data = debugMalloc( sizeof(struct curr_gw_data), 207 ); curr_gw_data->orig = curr_gateway->orig_node->orig; curr_gw_data->gw_node = curr_gateway; curr_gw_data->batman_if = curr_gateway->orig_node->batman_if; @@ -1238,7 +1238,7 @@ int8_t add_default_route() { if ( pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gw_data ) != 0 ) { debug_output( 0, "Error - couldn't spawn thread: %s\n", strerror(errno) ); - debugFree( curr_gw_data, 247 ); + debugFree( curr_gw_data, 1212 ); curr_gateway = NULL; } @@ -1269,7 +1269,7 @@ void close_all_sockets() { close( batman_if->udp_send_sock ); list_del( if_pos ); - debugFree( if_pos, 203 ); + debugFree( if_pos, 1213 ); } @@ -1444,7 +1444,7 @@ void *gw_listen( void *arg ) { /* new client */ if ( FD_ISSET( batman_if->tcp_gw_sock, &tmp_wait_sockets ) ) { - gw_client = debugMalloc( sizeof(struct gw_client), 18 ); + gw_client = debugMalloc( sizeof(struct gw_client), 208 ); 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 ) { @@ -1541,7 +1541,7 @@ void *gw_listen( void *arg ) { close( gw_client->sock ); list_del( client_pos ); - debugFree( client_pos, 201 ); + debugFree( client_pos, 1214 ); } @@ -1584,7 +1584,7 @@ void *gw_listen( void *arg ) { debug_output( 3, "gateway: client %s timeout on interface %s\n", str2, batman_if->dev ); list_del( client_pos ); - debugFree( client_pos, 202 ); + debugFree( client_pos, 1215 ); } else { @@ -1607,7 +1607,7 @@ void *gw_listen( void *arg ) { gw_client = list_entry(client_pos, struct gw_client, list); list_del( client_pos ); - debugFree( client_pos, 297 ); + debugFree( client_pos, 1216 ); } @@ -1633,13 +1633,13 @@ void cleanup() { debug_level_info = list_entry(debug_pos, struct debug_level_info, list); list_del( debug_pos ); - debugFree( debug_pos, 277 ); + debugFree( debug_pos, 1217 ); } } - debugFree( debug_clients.fd_list[i], 258 ); + debugFree( debug_clients.fd_list[i], 1218 ); } -- 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 05c89b422a24ccd58f26dd5c7288c8a1ca2d31bc Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Mar 7 00:41:55 2007 +0100 initial batman advanced upload - nothing beautiful yet diff --git a/posix-specific.c b/posix-specific.c index f3f069a..e6eb129 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -544,9 +544,8 @@ void apply_init_args( int argc, char *argv[] ) { exit(EXIT_FAILURE); } - if ( ( ( routing_class != 0 ) || ( gateway_class != 0 ) ) && ( !probe_tun() ) ) { - exit( 1 ); - } + if ( ( ( routing_class != 0 ) || ( gateway_class != 0 ) ) && ( !probe_tun() ) ) + exit(EXIT_FAILURE); if ( ! unix_client ) { @@ -852,7 +851,7 @@ void apply_init_args( int argc, char *argv[] ) { void init_interface ( struct batman_if *batman_if ) { struct ifreq int_req; - short on = 1; + int16_t on = 1; if ( strlen( batman_if->dev ) > IFNAMSIZ - 1 ) { debug_output( 0, "Error - interface name too long: %s\n", batman_if->dev ); -- 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 f3a2a92e6a2e793fa16f5ca021e0bdaa5a05451c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 8 14:23:23 2007 +0100 add missing header file diff --git a/allocate.h b/bitarray.h similarity index 53% copy from allocate.h copy to bitarray.h index 6f610ec..3a02bd9 100644 --- a/allocate.h +++ b/bitarray.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 B.A.T.M.A.N. contributors: - * Thomas Lopatic, Corinna 'Elektra' Aichele, Axel Neumann, Marek Lindner + * Simon Wunderlich, Axel Neumann, 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. @@ -19,12 +19,16 @@ -#include <stdint.h> +#define TYPE_OF_WORD unsigned long /* you should choose something big, if you don't want to waste cpu */ +#define WORD_BIT_SIZE ( sizeof(TYPE_OF_WORD) * 8 ) -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); +void bit_init( TYPE_OF_WORD *seq_bits ); +uint8_t get_bit_status( TYPE_OF_WORD *seq_bits, uint16_t last_seqno, uint16_t curr_seqno ); +char *bit_print( TYPE_OF_WORD *seq_bits ); +void bit_mark( TYPE_OF_WORD *seq_bits, int32_t n ); +void bit_shift( TYPE_OF_WORD *seq_bits, int32_t n ); +char bit_get_packet( TYPE_OF_WORD *seq_bits, int32_t seq_num_diff, int8_t set_mark ); +int bit_packet_count( TYPE_OF_WORD *seq_bits ); + -- 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 d77ec273951621397f0bec49b365658784074ab3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 20 20:06:42 2007 +0100 0.2 alpha release diff --git a/batman.h b/batman.h index 5a03e31..6116481 100644 --- a/batman.h +++ b/batman.h @@ -27,7 +27,7 @@ #include "list.h" -#define SOURCE_VERSION "0.2 early alpha" +#define SOURCE_VERSION "0.2 alpha" #define COMPAT_VERSION 2 #define PORT 1966 #define UNIDIRECTIONAL 0x80 -- 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 e6f9b9dd04f1c35c443a70c51c83ed868c3609c8 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Mar 6 19:45:56 2007 +0100 code cleanup variable bitarray size removed diff --git a/Makefile b/Makefile index 6d85cd1..fa0a8e4 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ OS_OBJ= posix-specific.o posix.o bsd.o allocate.o bitarray.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 +LINUX_SRC_H= batman.h batman-specific.h list.h os.h allocate.h bitarray.h all: batmand diff --git a/batman.h b/batman.h index 6116481..3801b74 100644 --- a/batman.h +++ b/batman.h @@ -25,6 +25,7 @@ #include <sys/un.h> #include <stdint.h> #include "list.h" +#include "bitarray.h" #define SOURCE_VERSION "0.2 alpha" @@ -47,16 +48,11 @@ #define JITTER 100 #define TTL 50 /* Time To Live of broadcast messages */ #define TIMEOUT 60000 /* sliding window size of received orginator messages in ms */ -#define SEQ_RANGE 60 /* sliding packet range of received orginator messages in squence numbers (should be a multiple of our word size) */ +#define SEQ_RANGE 64 /* sliding packet range of received orginator messages in squence numbers (should be a multiple of our word size) */ -#define TYPE_OF_WORD unsigned long /* you should choose something big, if you don't want to waste cpu */ - -#define MIN_NUM_WORDS ( SEQ_RANGE / ( sizeof(TYPE_OF_WORD) * 8 ) ) -#define RST_NUM_WORDS ( SEQ_RANGE % ( sizeof(TYPE_OF_WORD) * 8 ) ) -#define NUM_WORDS ( RST_NUM_WORDS ? ( MIN_NUM_WORDS + 1) : MIN_NUM_WORDS ) -#define WORD_BIT_SIZE ( sizeof(TYPE_OF_WORD) * 8 ) +#define NUM_WORDS ( SEQ_RANGE / WORD_BIT_SIZE ) @@ -213,12 +209,4 @@ void verbose_usage( void ); void del_default_route(); int8_t add_default_route(); -void bit_init( TYPE_OF_WORD *seq_bits ); -uint8_t get_bit_status( TYPE_OF_WORD *seq_bits, uint16_t last_seqno, uint16_t curr_seqno ); -char *bit_print( TYPE_OF_WORD *seq_bits ); -void bit_mark( TYPE_OF_WORD *seq_bits, int32_t n ); -void bit_shift( TYPE_OF_WORD *seq_bits, int32_t n ); -char bit_get_packet( TYPE_OF_WORD *seq_bits, int32_t seq_num_diff, int8_t set_mark ); -int bit_packet_count( TYPE_OF_WORD *seq_bits ); - #endif diff --git a/bitarray.c b/bitarray.c index dccd5fd..0ed6b8a 100644 --- a/bitarray.c +++ b/bitarray.c @@ -186,11 +186,11 @@ char bit_get_packet( TYPE_OF_WORD *seq_bits, int32_t seq_num_diff, int8_t set_ma int bit_packet_count( TYPE_OF_WORD *seq_bits ) { int i, hamming = 0; - TYPE_OF_WORD word, pattern=~0; + TYPE_OF_WORD word; for (i=0; i<NUM_WORDS; i++) { - word= ( ( i < NUM_WORDS - 1 ) ? seq_bits[i] : seq_bits[i] & pattern >> ( WORD_BIT_SIZE - RST_NUM_WORDS ) ); + word = seq_bits[i]; while (word) { diff --git a/linux-specific.c b/linux-specific.c index d15769e..9af8385 100644 --- a/linux-specific.c +++ b/linux-specific.c @@ -237,7 +237,7 @@ int8_t add_dev_tun( struct batman_if *batman_if, uint32_t tun_addr, char *tun_de /* set MTU of tun interface: real MTU - 28 */ if ( ifr_if.ifr_mtu < 100 ) { - debug_output( 0, "Warning - MTU smaller than 100 -> can't reduce MTU anymore\n", strerror(errno) ); + debug_output( 0, "Warning - MTU smaller than 100 -> can't reduce MTU anymore\n" ); } else { diff --git a/posix-specific.c b/posix-specific.c index 2e3ec56..f3f069a 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -131,7 +131,7 @@ void *unix_listen( void *arg ) { max_sock = unix_if.unix_sock; - while (!is_aborted()) { + while ( !is_aborted() ) { tv.tv_sec = 1; tv.tv_usec = 0; diff --git a/posix.c b/posix.c index 22772e9..ca145f2 100644 --- a/posix.c +++ b/posix.c @@ -249,13 +249,11 @@ int main( int argc, char *argv[] ) { int8_t res; stop = 0; -// memset( &device_node_array[0], 0, sizeof( device_node_array ) ); -// printf("B.A.T.M.A.N-experimental %s\n", VERSION); /* check if user is root */ if ( ( getuid() ) || ( getgid() ) ) { - fprintf( stderr, "Error - you must be root to run batmand !\n" ); + fprintf( stderr, "Error - you must be root to run %s !\n", argv[0] ); exit(EXIT_FAILURE); } @@ -263,19 +261,15 @@ int main( int argc, char *argv[] ) { apply_init_args( argc, argv ); - signal(SIGINT, handler); - signal(SIGTERM, handler); + signal( SIGINT, handler ); + signal( SIGTERM, handler ); - gettimeofday(&start_time, NULL); - srand(getpid()); + gettimeofday( &start_time, NULL ); + srand( getpid() ); -// forward_old = get_forwarding(); -// set_forwarding(1); res = batman(); -// delAllRoutes(); -// set_forwarding(forward_old); close_all_sockets(); cleanup(); -- 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 e565a771aa7241d91dab2a6b103970614629e007 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Feb 11 21:48:38 2007 +0100 memory usage overview added diff --git a/allocate.c b/allocate.c index 707313b..46e4164 100644 --- a/allocate.c +++ b/allocate.c @@ -26,6 +26,7 @@ #include "allocate.h" #define DEBUG_MALLOC +/*#define MEMORY_USAGE*/ #define MAGIC_NUMBER 0x12345678 @@ -36,22 +37,123 @@ struct chunkHeader *chunkList = NULL; struct chunkHeader { struct chunkHeader *next; - unsigned int length; - int tag; - unsigned int magicNumber; + uint32_t length; + int32_t tag; + uint32_t magicNumber; }; struct chunkTrailer { - unsigned int magicNumber; + uint32_t magicNumber; }; + + +#if defined MEMORY_USAGE + +struct memoryUsage *memoryList = NULL; + + +struct memoryUsage +{ + struct memoryUsage *next; + uint32_t length; + uint32_t counter; + int32_t tag; +}; + + +void addMemory( uint32_t length, int32_t tag ) { + + struct memoryUsage *walker; + + + for ( walker = memoryList; walker != NULL; walker = walker->next ) { + + if ( walker->tag == tag ) { + + walker->counter++; + break; + + } + + } + + if ( walker == NULL ) { + + walker = malloc( sizeof(struct memoryUsage) ); + + walker->length = length; + walker->tag = tag; + walker->counter = 1; + + walker->next = memoryList; + memoryList = walker; + + } + +} + + +void removeMemory( int32_t tag, int32_t freetag ) { + + struct memoryUsage *walker; + + + for ( walker = memoryList; walker != NULL; walker = walker->next ) { + + if ( walker->tag == tag ) { + + if ( walker->counter == 0 ) { + + fprintf( stderr, "Freeing more memory than was allocated: malloc tag = %d, free tag = %d\n", tag, freetag ); + exit(1); + + } + + walker->counter--; + break; + + } + + } + + if ( walker == NULL ) { + + fprintf( stderr, "Freeing memory that was never allocated: malloc tag = %d, free tag = %d\n", tag, freetag ); + exit(1); + + } + +} + +#endif + + + void checkIntegrity(void) { struct chunkHeader *walker; struct chunkTrailer *chunkTrailer; unsigned char *memory; + +#if defined MEMORY_USAGE + + struct memoryUsage *memoryWalker; + + fprintf( stderr, "Memory usage information:\n" ); + + 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 ); + + } + +#endif + + for (walker = chunkList; walker != NULL; walker = walker->next) { if (walker->magicNumber != MAGIC_NUMBER) @@ -80,7 +182,7 @@ void checkLeak(void) fprintf(stderr, "Memory leak detected, malloc tag = %d\n", walker->tag); } -void *debugMalloc(unsigned int length, int tag) +void *debugMalloc(uint32_t length, int32_t tag) { unsigned char *memory; struct chunkHeader *chunkHeader; @@ -110,16 +212,22 @@ void *debugMalloc(unsigned int length, int tag) chunkHeader->next = chunkList; chunkList = chunkHeader; +#if defined MEMORY_USAGE + + addMemory( length, tag ); + +#endif + return chunk; } -void *debugRealloc(void *memoryParameter, unsigned int length, int tag) +void *debugRealloc(void *memoryParameter, uint32_t length, int32_t tag) { unsigned char *memory; struct chunkHeader *chunkHeader; struct chunkTrailer *chunkTrailer; unsigned char *result; - unsigned int copyLength; + uint32_t copyLength; if (memoryParameter) { /* if memoryParameter==NULL, realloc() should work like malloc() !! */ memory = memoryParameter; @@ -203,7 +311,14 @@ void debugFree(void *memoryParameter, int tag) exit(1); } +#if defined MEMORY_USAGE + + removeMemory( chunkHeader->tag, tag ); + +#endif + free(chunkHeader); + } #else @@ -216,7 +331,7 @@ void checkLeak(void) { } -void *debugMalloc(unsigned int length, int tag) +void *debugMalloc(uint32_t length, int32_t tag) { void *result; @@ -231,7 +346,7 @@ void *debugMalloc(unsigned int length, int tag) return result; } -void *debugRealloc(void *memory, unsigned int length, int tag) +void *debugRealloc(void *memory, uint32_t length, int32_t tag) { void *result; @@ -246,7 +361,7 @@ void *debugRealloc(void *memory, unsigned int length, int tag) return result; } -void debugFree(void *memory, int tag) +void debugFree(void *memory, int32_t tag) { free(memory); } diff --git a/allocate.h b/allocate.h index 4c15bfc..6f610ec 100644 --- a/allocate.h +++ b/allocate.h @@ -19,8 +19,12 @@ +#include <stdint.h> + + + 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, int tag); +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); diff --git a/posix-specific.c b/posix-specific.c index 149bcfc..2e3ec56 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -336,7 +336,7 @@ void apply_init_args( int argc, char *argv[] ) { uint32_t vis_server = 0; // fd_set wait_sockets, tmp_wait_sockets; - memset(&tmp_ip_holder, 0, sizeof (struct in_addr)); + memset( &tmp_ip_holder, 0, sizeof (struct in_addr) ); printf( "WARNING: You are using the unstable batman branch. If you are interested in *using* batman get the latest stable release !\n" ); @@ -1003,8 +1003,8 @@ void *client_to_gw_tun( void *arg ) { struct curr_gw_data *curr_gw_data = (struct curr_gw_data *)arg; struct sockaddr_in gw_addr, my_addr, sender_addr; struct timeval tv; - int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd, server_keep_alive_timeout; - unsigned int addr_len; + int32_t res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd, server_keep_alive_timeout; + uint32_t addr_len; char curr_gateway_tun_if[IFNAMSIZ], keep_alive_string[] = "ping\0"; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -1239,6 +1239,7 @@ int8_t add_default_route() { if ( pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gw_data ) != 0 ) { debug_output( 0, "Error - couldn't spawn thread: %s\n", strerror(errno) ); + debugFree( curr_gw_data, 247 ); curr_gateway = NULL; } @@ -1396,8 +1397,8 @@ void *gw_listen( void *arg ) { struct in_addr tmp_ip_holder; socklen_t sin_size = sizeof(struct sockaddr_in); char gw_addr[16], str2[16], tun_dev[IFNAMSIZ], tun_ip[] = "104.255.255.254\0"; - int res, status, max_sock_min, max_sock, buff_len, tun_fd; - unsigned int addr_len, client_timeout; + int32_t res, status, max_sock_min, max_sock, buff_len, tun_fd; + uint32_t addr_len, client_timeout; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; diff --git a/posix.c b/posix.c index f14090e..22772e9 100644 --- a/posix.c +++ b/posix.c @@ -51,26 +51,26 @@ extern struct vis_if vis_if; static struct timeval start_time; -static short stop; +static int8_t stop; -static void get_time_internal(struct timeval *tv) -{ - int sec; - int usec; - gettimeofday(tv, NULL); +static void get_time_internal( struct timeval *tv ) { + + int32_t sec, usec; + + gettimeofday( tv, NULL ); sec = tv->tv_sec - start_time.tv_sec; usec = tv->tv_usec - start_time.tv_usec; - if (usec < 0) - { + if ( usec < 0 ) { sec--; usec += 1000000; } tv->tv_sec = sec; tv->tv_usec = usec; + } uint32_t get_time( void ) { @@ -124,14 +124,14 @@ void sym_print( char x, char y, char *z ) { -void bat_wait( int T, int t ) { +void bat_wait( int32_t T, int32_t t ) { struct timeval time; time.tv_sec = T; time.tv_usec = ( t * 10000 ); - select(0, NULL, NULL, NULL, &time); + select( 0, NULL, NULL, NULL, &time ); return; @@ -219,12 +219,16 @@ int8_t is_aborted() { } + + void addr_to_string( uint32_t addr, char *str, int32_t len ) { - inet_ntop(AF_INET, &addr, str, len); + inet_ntop( AF_INET, &addr, str, len ); } + + int32_t rand_num( int32_t limit ) { return ( limit == 0 ? 0 : rand() % limit ); @@ -232,6 +236,7 @@ int32_t rand_num( int32_t limit ) { } + static void handler( int32_t sig ) { stop = 1; -- 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 17ee27713c0a81d1583293cc55432dda2b6791d7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 6 11:45:16 2007 +0100 code is clean now ;-) diff --git a/batman.c b/batman.c index 11f3f04..fe8ac35 100644 --- a/batman.c +++ b/batman.c @@ -404,8 +404,7 @@ static void update_routes( struct orig_node *orig_node, struct neigh_node *neigh orig_node->hna_buff = debugMalloc( hna_buff_len, 3 ); orig_node->hna_buff_len = hna_buff_len; - if ( ( orig_node->hna_buff_len == 0 ) || ( memcmp( orig_node->hna_buff, hna_recv_buff, hna_buff_len ) != 0 ) ) - memmove( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); + memmove( orig_node->hna_buff, hna_recv_buff, hna_buff_len ); add_del_hna( orig_node, 0 ); -- batman; test conversation

1 0

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

19 Dec '10

The following commit has been merged in the master branch: commit 78032b482a179cbe07b28b96533488816a6057b7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Feb 9 16:07:19 2007 +0100 fix network host order bug in send_outstanding_packets() scheduler for sending packets improved diff --git a/batman.c b/batman.c index fe8ac35..0fe1a8a 100644 --- a/batman.c +++ b/batman.c @@ -105,7 +105,6 @@ static LIST_HEAD(forw_list); static LIST_HEAD(gw_list); LIST_HEAD(if_list); LIST_HEAD(hna_list); -static unsigned int last_own_packet; struct vis_if vis_if; struct unix_if unix_if; @@ -546,7 +545,7 @@ void debug() { 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->when ); + debug_output( 4, " %s at %u\n", str, forw_node->send_time ); } debug_output( 4, "Originator list\n" ); @@ -726,6 +725,57 @@ void update_originator( struct orig_node *orig_node, struct packet *in, uint32_t +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), 11 ); + + 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), 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 = 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); + + } + + 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; @@ -759,17 +809,11 @@ void schedule_forward_packet( struct packet *in, uint8_t unidirectional, uint8_t ((struct packet *)forw_node_new->pack_buff)->ttl--; - forw_node_new->when = get_time(); + forw_node_new->send_time = get_time(); forw_node_new->own = 0; forw_node_new->if_outgoing = if_outgoing; - /* list_for_each(forw_pos, &forw_list) { - forw_node = list_entry(forw_pos, struct forw_node, list); - if ((int)(forw_node->when - forw_node_new->when) > 0) - break; - } */ - if ( unidirectional ) { ((struct packet *)forw_node_new->pack_buff)->flags = ( UNIDIRECTIONAL | DIRECTLINK ); @@ -799,25 +843,31 @@ void send_outstanding_packets() { 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->when <= get_time() ) { + 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, ((struct packet *)forw_node->pack_buff)->seqno, ((struct packet *)forw_node->pack_buff)->ttl, forw_node->if_outgoing->dev ); + 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 ); @@ -862,9 +912,7 @@ void send_outstanding_packets() { ((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, ((struct packet *)forw_node->pack_buff)->seqno, ((struct packet *)forw_node->pack_buff)->ttl, batman_if->dev ); - - ((struct packet *)forw_node->pack_buff)->seqno = htons( ((struct packet *)forw_node->pack_buff)->seqno ); /* change sequence number to network order */ + 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 ) ) { @@ -889,64 +937,18 @@ void send_outstanding_packets() { list_del( forw_pos ); + if ( forw_node->own ) + schedule_own_packet( forw_node->if_outgoing ); + debugFree( forw_node->pack_buff, 103 ); debugFree( forw_node, 104 ); - } - - } - -} - - - -void schedule_own_packet() { - - struct forw_node *forw_node_new; - struct list_head *if_pos; - struct batman_if *batman_if; - uint32_t curr_time; - - - curr_time = get_time(); - - if ( ( last_own_packet + orginator_interval ) <= curr_time ) { - - list_for_each(if_pos, &if_list) { - - batman_if = list_entry(if_pos, struct batman_if, list); - - forw_node_new = debugMalloc( sizeof(struct forw_node), 11 ); - - INIT_LIST_HEAD(&forw_node_new->list); - - forw_node_new->when = curr_time + rand_num( JITTER ); - forw_node_new->if_outgoing = NULL; - forw_node_new->own = 1; - - if ( num_hna > 0 ) { - - 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 = 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); - - } - - list_add( &forw_node_new->list, &forw_list ); + } else { - batman_if->out.seqno++; + break; } - last_own_packet = curr_time; - } } @@ -1084,7 +1086,7 @@ int8_t batman() { int8_t res; uint32_t time_count = 0, curr_time; - last_own_packet = debug_timeout = get_time(); + debug_timeout = get_time(); bidirectional_timeout = orginator_interval * 3; if ( !( list_empty( &hna_list ) ) ) { @@ -1106,17 +1108,19 @@ int8_t batman() { list_for_each( if_pos, &if_list ) { - batman_if = list_entry(if_pos, struct batman_if, list); + batman_if = list_entry( if_pos, struct batman_if, list ); batman_if->out.orig = batman_if->addr.sin_addr.s_addr; batman_if->out.flags = 0x00; batman_if->out.ttl = ( batman_if->if_num == 0 ? TTL : 2 ); - batman_if->out.seqno = 0; + batman_if->out.seqno = 1; batman_if->out.gwflags = gateway_class; batman_if->out.version = COMPAT_VERSION; batman_if->if_rp_filter_old = get_rp_filter( batman_if->dev ); set_rp_filter( 0 , batman_if->dev ); + schedule_own_packet( batman_if ); + } if_rp_filter_all_old = get_rp_filter( "all" ); @@ -1140,7 +1144,7 @@ int8_t batman() { /* 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 ); + select_timeout = ( curr_time < ((struct forw_node *)forw_list.next)->send_time ? ((struct forw_node *)forw_list.next)->send_time - curr_time : 10 ); res = receive_packet( ( unsigned char *)&in, sizeof(in), &hna_buff_len, &neigh, select_timeout, &if_incoming ); @@ -1354,8 +1358,6 @@ int8_t batman() { } - schedule_own_packet(); - send_outstanding_packets(); purge( get_time() ); diff --git a/batman.h b/batman.h index f313510..ea4cf83 100644 --- a/batman.h +++ b/batman.h @@ -44,7 +44,7 @@ * Here is the stuff you may want to play with: */ -#define JITTER 50 +#define JITTER 100 #define TTL 50 /* Time To Live of broadcast messages */ #define TIMEOUT 60000 /* sliding window size of received orginator messages in ms */ #define SEQ_RANGE 60 /* sliding packet range of received orginator messages in squence numbers (should be a multiple of our word size) */ @@ -129,7 +129,7 @@ struct hna_node struct forw_node /* structure for forw_list maintaining packets to be send/forwarded */ { struct list_head list; - uint32_t when; + uint32_t send_time; uint8_t own; unsigned char *pack_buff; int32_t pack_buff_len; diff --git a/list.h b/list.h index a0d785b..87c53de 100644 --- a/list.h +++ b/list.h @@ -1,7 +1,7 @@ #ifndef _LINUX_LIST_H #define _LINUX_LIST_H -/* +/* * XXX: Resolve conflict between this file and <sys/queue.h> on BSD systems. */ #ifdef LIST_HEAD @@ -32,7 +32,7 @@ struct list_head { } while (0) /* - * Insert a new entry between two known consecutive entries. + * Insert a new entry between two known consecutive entries. * * This is only for internal list manipulation where we know * the prev/next entries already! @@ -98,6 +98,20 @@ static inline void list_del(struct list_head *entry) entry->prev = (void *) 0; } +static inline void list_add_before( struct list_head *list, struct list_head *pos_node, struct list_head *new_node ) { + + if ( pos_node->prev != NULL ) + pos_node->prev->next = new_node; + else + list->next = new_node; + + new_node->prev = pos_node->prev; + new_node->next = pos_node; + + pos_node->prev = new_node; + +} + /** * list_del_init - deletes entry from list and reinitialize it. * @entry: the element to delete from the list. @@ -105,7 +119,7 @@ static inline void list_del(struct list_head *entry) static inline void list_del_init(struct list_head *entry) { __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); + INIT_LIST_HEAD(entry); } /** @@ -206,7 +220,7 @@ static inline void list_splice_init(struct list_head *list, #define list_for_each_prev(pos, head) \ for (pos = (head)->prev; pos != (head); \ pos = pos->prev) - + /** * list_for_each_safe - iterate over a list safe against removal of list entry * @pos: the &struct list_head to use as a loop counter. diff --git a/posix-specific.c b/posix-specific.c index 09e29cd..f69788b 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -1335,7 +1335,6 @@ int8_t receive_packet( unsigned char *packet_buff, int32_t packet_buff_len, int1 ((struct packet *)packet_buff)->seqno = ntohs( ((struct packet *)packet_buff)->seqno ); /* network to host order for our 16bit seqno.*/ - (*if_incoming) = batman_if; break; -- 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 4f08b9f896164ddb622fbfc0508ad3616cc1a3ad Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Feb 9 16:43:33 2007 +0100 fix race condition in client_to_gw_tun() - code merge from branch-0.1.x diff --git a/batman.c b/batman.c index 0fe1a8a..b873903 100644 --- a/batman.c +++ b/batman.c @@ -279,6 +279,9 @@ static void choose_gw() { if ( gw_node->orig_node->router == NULL ) continue; + if ( gw_node->deleted ) + continue; + switch ( routing_class ) { case 1: /* fast connection */ @@ -457,13 +460,13 @@ static void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ) { if ( new_gwflags == 0 ) { - list_del( gw_pos ); - debugFree( gw_pos, 102 ); + gw_node->deleted = get_time(); debug_output( 3, "Gateway %s removed from gateway list\n", orig_str ); } else { + gw_node->deleted = 0; gw_node->orig_node->gwflags = new_gwflags; } @@ -515,8 +518,12 @@ void debug() { } else { - list_for_each(orig_pos, &gw_list) { - gw_node = list_entry(orig_pos, struct gw_node, list); + 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) ); @@ -529,6 +536,9 @@ void debug() { } + if ( batman_count == 0 ) + debug_output( 2, "No gateways in range ...\n" ); + } } @@ -986,17 +996,19 @@ void purge( uint32_t curr_time ) { } - list_for_each_safe(gw_pos, gw_pos_tmp, &gw_list) { + list_for_each_safe( gw_pos, gw_pos_tmp, &gw_list ) { + + gw_node = list_entry( gw_pos, struct gw_node, 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 ); - list_del( gw_pos ); - debugFree( gw_pos, 107 ); + gw_node->deleted = get_time(); gw_purged = 1; @@ -1033,6 +1045,19 @@ void purge( uint32_t curr_time ) { } + 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, 107 ); + + } + + } + if ( gw_purged ) choose_gw(); @@ -1382,7 +1407,7 @@ int8_t batman() { if ( debug_level > 0 ) printf( "Deleting all BATMAN routes\n" ); - purge( get_time() + ( 2 * TIMEOUT ) + orginator_interval ); + purge( get_time() + ( 5 * TIMEOUT ) + orginator_interval ); list_for_each_safe( hna_pos, hna_pos_tmp, &hna_list ) { diff --git a/batman.h b/batman.h index ea4cf83..5a03e31 100644 --- a/batman.h +++ b/batman.h @@ -142,6 +142,7 @@ struct gw_node struct orig_node *orig_node; uint16_t unavail_factor; uint32_t last_failure; + uint32_t deleted; }; struct batman_if @@ -199,6 +200,12 @@ struct debug_level_info { int32_t fd; }; +struct curr_gw_data { + unsigned int orig; + struct gw_node *gw_node; + struct batman_if *batman_if; +}; + int8_t batman( void ); void usage( void ); diff --git a/posix-specific.c b/posix-specific.c index f69788b..149bcfc 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -1000,19 +1000,16 @@ void init_interface_gw ( struct batman_if *batman_if ) void *client_to_gw_tun( void *arg ) { - struct gw_node *gw_node = (struct gw_node *)arg; - struct batman_if *curr_gateway_batman_if; + struct curr_gw_data *curr_gw_data = (struct curr_gw_data *)arg; struct sockaddr_in gw_addr, my_addr, sender_addr; struct timeval tv; int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd, server_keep_alive_timeout; - unsigned int addr_len, curr_gateway_ip; + unsigned int addr_len; char curr_gateway_tun_if[IFNAMSIZ], keep_alive_string[] = "ping\0"; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; - curr_gateway_ip = gw_node->orig_node->orig; - curr_gateway_batman_if = gw_node->orig_node->batman_if; addr_len = sizeof (struct sockaddr_in); memset( &gw_addr, 0, sizeof(struct sockaddr_in) ); @@ -1020,11 +1017,11 @@ void *client_to_gw_tun( void *arg ) { gw_addr.sin_family = AF_INET; gw_addr.sin_port = htons(PORT + 1); - gw_addr.sin_addr.s_addr = curr_gateway_ip; + gw_addr.sin_addr.s_addr = curr_gw_data->orig; my_addr.sin_family = AF_INET; my_addr.sin_port = htons(PORT + 1); - my_addr.sin_addr.s_addr = curr_gateway_batman_if->addr.sin_addr.s_addr; + my_addr.sin_addr.s_addr = curr_gw_data->batman_if->addr.sin_addr.s_addr; /* connect to server (ask permission) */ @@ -1032,6 +1029,7 @@ void *client_to_gw_tun( void *arg ) { debug_output( 0, "Error - can't create tcp socket: %s\n", strerror(errno) ); curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; } @@ -1041,10 +1039,11 @@ void *client_to_gw_tun( void *arg ) { debug_output( 0, "Error - can't connect to gateway: %s\n", strerror(errno) ); close( curr_gateway_tcp_sock ); - gw_node->last_failure = get_time(); - gw_node->unavail_factor++; + curr_gw_data->gw_node->last_failure = get_time(); + curr_gw_data->gw_node->unavail_factor++; curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; } @@ -1058,6 +1057,7 @@ void *client_to_gw_tun( void *arg ) { debug_output( 0, "Error - can't create udp socket: %s\n", strerror(errno) ); close( curr_gateway_tcp_sock ); curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; } @@ -1068,20 +1068,22 @@ void *client_to_gw_tun( void *arg ) { close( curr_gateway_tcp_sock ); close( curr_gateway_tun_sock ); curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; } - if ( add_dev_tun( curr_gateway_batman_if, curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, sizeof(curr_gateway_tun_if), &curr_gateway_tun_fd ) > 0 ) { + if ( add_dev_tun( curr_gw_data->batman_if, curr_gw_data->batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, sizeof(curr_gateway_tun_if), &curr_gateway_tun_fd ) > 0 ) { - add_del_route( 0, 0, 0, 0, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); + add_del_route( 0, 0, 0, 0, curr_gateway_tun_if, curr_gw_data->batman_if->udp_send_sock ); } else { close( curr_gateway_tcp_sock ); close( curr_gateway_tun_sock ); curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; } @@ -1098,7 +1100,7 @@ void *client_to_gw_tun( void *arg ) { if ( curr_gateway_tun_fd > max_sock ) max_sock = curr_gateway_tun_fd; - while ( ( !is_aborted() ) && ( curr_gateway != NULL ) ) { + while ( ( !is_aborted() ) && ( curr_gateway != NULL ) && ( ! curr_gw_data->gw_node->deleted ) ) { if ( server_keep_alive_timeout + 30000 < get_time() ) { @@ -1109,8 +1111,8 @@ void *client_to_gw_tun( void *arg ) { debug_output( 3, "server_keepalive failed: %s\n", strerror(errno) ); - gw_node->last_failure = get_time(); - gw_node->unavail_factor++; + curr_gw_data->gw_node->last_failure = get_time(); + curr_gw_data->gw_node->unavail_factor++; break; @@ -1147,8 +1149,8 @@ void *client_to_gw_tun( void *arg ) { debug_output( 3, "Gateway closed connection - timeout ?\n" ); - gw_node->last_failure = get_time(); - gw_node->unavail_factor++; + curr_gw_data->gw_node->last_failure = get_time(); + curr_gw_data->gw_node->unavail_factor++; break; @@ -1197,7 +1199,7 @@ void *client_to_gw_tun( void *arg ) { } /* cleanup */ - add_del_route( 0, 0, 0, 1, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); + add_del_route( 0, 0, 0, 1, curr_gateway_tun_if, curr_gw_data->batman_if->udp_send_sock ); close( curr_gateway_tcp_sock ); close( curr_gateway_tun_sock ); @@ -1205,6 +1207,7 @@ void *client_to_gw_tun( void *arg ) { del_dev_tun( curr_gateway_tun_fd ); curr_gateway = NULL; + debugFree( arg, 248 ); return NULL; @@ -1224,7 +1227,16 @@ void del_default_route() { int8_t add_default_route() { - if ( pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gateway ) != 0 ) { + struct curr_gw_data *curr_gw_data; + + + curr_gw_data = debugMalloc( sizeof(struct curr_gw_data), 47 ); + curr_gw_data->orig = curr_gateway->orig_node->orig; + curr_gw_data->gw_node = curr_gateway; + curr_gw_data->batman_if = curr_gateway->orig_node->batman_if; + + + if ( pthread_create( &curr_gateway_thread_id, NULL, &client_to_gw_tun, curr_gw_data ) != 0 ) { debug_output( 0, "Error - couldn't spawn thread: %s\n", strerror(errno) ); curr_gateway = NULL; -- 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 596faa964d5066b7f0e696f36224f1b352330c62 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Feb 5 23:22:42 2007 +0100 more code cleanup diff --git a/batman.c b/batman.c index 96685ae..11f3f04 100644 --- a/batman.c +++ b/batman.c @@ -1359,9 +1359,6 @@ int8_t batman() { send_outstanding_packets(); - if ( ( routing_class != 0 ) && ( curr_gateway == NULL ) ) - choose_gw(); - purge( get_time() ); if ( debug_timeout + 1000 < get_time() ) { @@ -1372,6 +1369,9 @@ int8_t batman() { checkIntegrity(); + if ( ( routing_class != 0 ) && ( curr_gateway == NULL ) ) + choose_gw(); + } time_count++; -- batman; test conversation

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010