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 f6f34167708d4add75d5aedb3d2a3044c2e8cc2d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 24 09:58:52 2007 +0200 use sequence numbers instead of timeout for bidirectional neighbour detection diff --git a/batman.c b/batman.c index aaaf64f..fe1c59a 100644 --- a/batman.c +++ b/batman.c @@ -87,8 +87,6 @@ uint8_t routing_class = 0; int16_t orginator_interval = 1000; /* orginator message interval in miliseconds */ -uint32_t bidirectional_timeout = 0; /* bidirectional neighbour reply timeout in ms */ - struct gw_node *curr_gateway = NULL; pthread_t curr_gateway_thread_id = 0; pthread_mutex_t curr_gw_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -519,16 +517,20 @@ int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { } int isBntog( uint32_t neigh, struct orig_node *orig_tog_node ) { - if ( ( orig_tog_node->router != NULL ) && ( orig_tog_node->router->addr == neigh ) ) return 1; - else return 0; + + if ( ( orig_tog_node->router != NULL ) && ( orig_tog_node->router->addr == neigh ) ) + return 1; + + return 0; + } int isBidirectionalNeigh( struct orig_node *orig_neigh_node, struct batman_if *if_incoming ) { - if ( orig_neigh_node->bidirect_link[if_incoming->if_num] > 0 && ( orig_neigh_node->bidirect_link[if_incoming->if_num] + (bidirectional_timeout) ) >= get_time() ) + if ( ( orig_neigh_node->bidirect_link[if_incoming->if_num] + BIDIRECT_TIMEOUT ) >= if_incoming->out.seqno ) return 1; - else - return 0; + + return 0; } @@ -588,7 +590,6 @@ int8_t batman() { debug_timeout = get_time(); - bidirectional_timeout = orginator_interval * 2; if ( NULL == ( orig_hash = hash_new( 128, compare_orig, choose_orig ) ) ) return(-1); @@ -735,9 +736,9 @@ int8_t batman() { /* neighbour has to indicate direct link and it has to come via the corresponding interface */ if ( ( ((struct packet *)&in)->flags & DIRECTLINK ) && ( if_incoming->addr.sin_addr.s_addr == ((struct packet *)&in)->orig ) ) { - orig_neigh_node->bidirect_link[if_incoming->if_num] = get_time(); + orig_neigh_node->bidirect_link[if_incoming->if_num] = ((struct packet *)&in)->seqno; - debug_output( 4, "received my own packet from neighbour indicating bidirectional link, updating bidirect_link timestamp \n"); + debug_output( 4, "received my own packet from neighbour indicating bidirectional link, updating bidirect_link seqno \n"); } diff --git a/batman.h b/batman.h index aabddb9..73f6bc0 100644 --- a/batman.h +++ b/batman.h @@ -56,6 +56,7 @@ #define JITTER 100 #define TTL 50 /* Time To Live of broadcast messages */ +#define BIDIRECT_TIMEOUT 2 #define TIMEOUT 60000 /* sliding window size of received orginator messages in ms */ #define SEQ_RANGE 64 /* sliding packet range of received orginator messages in squence numbers (should be a multiple of our word size) */ @@ -112,7 +113,7 @@ struct orig_node /* structure for orig_list maintaining nodes of uint32_t orig; struct neigh_node *router; struct batman_if *batman_if; - uint32_t *bidirect_link; /* if node is a bidrectional neighbour, when my originator packet was broadcasted (replied) by this node and received by me */ + uint16_t *bidirect_link; /* if node is a bidrectional neighbour, when my originator packet was broadcasted (replied) by this node and received by me */ uint32_t last_aware; /* when last packet from this node was received */ uint8_t gwflags; /* flags related to gateway functions: gateway class */ unsigned char *hna_buff; diff --git a/originator.c b/originator.c index 4285e8a..9ac52e7 100644 --- a/originator.c +++ b/originator.c @@ -90,8 +90,8 @@ struct orig_node *get_orig_node( uint32_t addr ) { orig_node->router = NULL; orig_node->batman_if = NULL; - orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint32_t), 402 ); - memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint32_t) ); + orig_node->bidirect_link = debugMalloc( found_ifs * sizeof(uint16_t), 402 ); + memset( orig_node->bidirect_link, 0, found_ifs * sizeof(uint16_t) ); hash_add( orig_hash, orig_node ); -- 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 c4b0e955f9b0df9b3fd23c4a109448d202ef05d0 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 28 19:53:28 2007 +0200 - fix hash.h comment diff --git a/hash.h b/hash.h index af18ada..1f7ccc5 100644 --- a/hash.h +++ b/hash.h @@ -74,7 +74,7 @@ int hash_add(struct hashtable_t *hash, void *data); * we just need the key for comparing. */ void *hash_remove(struct hashtable_t *hash, void *data); -/* adds data to the hashtable. returns 0 on success, -1 on error */ +/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ void *hash_find(struct hashtable_t *hash, void *keydata); /* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success */ -- 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 0998bd7e5228b6a8a3fc0c7168a1e2a242eb7f38 Author: Axel Neumann <neumann(a)cgws.de> Date: Mon Apr 9 10:56:07 2007 +0200 implemented BNTOG check ( Rule 5.2 from http://open-mesh.net/batman/documentation/BwSpecification ) diff --git a/batman.c b/batman.c index 3f34c89..aaaf64f 100644 --- a/batman.c +++ b/batman.c @@ -518,7 +518,10 @@ int isDuplicate( struct orig_node *orig_node, uint16_t seqno ) { } - +int isBntog( uint32_t neigh, struct orig_node *orig_tog_node ) { + if ( ( orig_tog_node->router != NULL ) && ( orig_tog_node->router->addr == neigh ) ) return 1; + else return 0; +} int isBidirectionalNeigh( struct orig_node *orig_neigh_node, struct batman_if *if_incoming ) { @@ -580,7 +583,7 @@ int8_t batman() { static char orig_str[ADDR_STR_LEN], neigh_str[ADDR_STR_LEN]; int16_t hna_buff_count, hna_buff_len; uint8_t forward_old, if_rp_filter_all_old, if_rp_filter_default_old; - uint8_t is_my_addr, is_my_orig, is_broadcast, is_duplicate, is_bidirectional, forward_duplicate_packet; + uint8_t is_my_addr, is_my_orig, is_broadcast, is_duplicate, is_bidirectional, is_bntog, forward_duplicate_packet; int8_t res; @@ -663,7 +666,7 @@ int8_t batman() { addr_to_string( neigh, neigh_str, sizeof(neigh_str) ); debug_output( 4, "Received BATMAN packet from %s (originator %s, seqno %d, TTL %d) \n", neigh_str, orig_str, ((struct packet *)&in)->seqno, ((struct packet *)&in)->ttl ); - is_my_addr = is_my_orig = is_broadcast = is_duplicate = is_bidirectional = forward_duplicate_packet = 0; + is_my_addr = is_my_orig = is_broadcast = is_duplicate = is_bidirectional = is_bntog = forward_duplicate_packet = 0; hna_buff_len -= sizeof(struct packet); hna_recv_buff = ( hna_buff_len > 4 ? in + sizeof(struct packet) : NULL ); @@ -753,6 +756,7 @@ int8_t batman() { is_duplicate = isDuplicate( orig_node, ((struct packet *)&in)->seqno ); is_bidirectional = isBidirectionalNeigh( orig_neigh_node, if_incoming ); + is_bntog = isBntog(neigh, orig_node ); /* update ranking */ if ( ( is_bidirectional ) && ( !is_duplicate ) ) @@ -762,7 +766,7 @@ int8_t batman() { if ( ((struct packet *)&in)->orig == neigh ) { /* it is our best route towards him */ - if ( ( is_bidirectional ) && ( orig_node->router != NULL ) && ( orig_node->router->addr == neigh ) ) { + if ( is_bidirectional && is_bntog ) { /* mark direct link on incoming interface */ schedule_forward_packet( (struct packet *)&in, 0, 1, hna_recv_buff, hna_buff_len, if_incoming ); @@ -771,7 +775,7 @@ int8_t batman() { /* if an unidirectional neighbour sends us a packet - retransmit it with unidirectional flag to tell him that we get its packets */ /* 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_node->router == NULL ) || ( orig_node->router->addr != neigh ) ) ) || ( !is_bidirectional ) ) { + } else if ( ( is_bidirectional && !is_bntog ) || ( !is_bidirectional ) ) { schedule_forward_packet( (struct packet *)&in, 1, 1, hna_recv_buff, hna_buff_len, if_incoming ); @@ -782,7 +786,7 @@ int8_t batman() { /* multihop orginator */ } else { - if ( is_bidirectional ) { + if ( is_bidirectional && is_bntog ) { if ( !is_duplicate ) { -- 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 816fc71bb74989527c1e36e8cbdb6afbb5090878 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Apr 16 18:20:03 2007 +0200 fix os.h confusion diff --git a/batman.h b/batman.h index f5952eb..aabddb9 100644 --- a/batman.h +++ b/batman.h @@ -226,7 +226,6 @@ void verbose_usage( void ); void update_routes( struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_recv_buff, int16_t hna_buff_len ); void update_gw_list( struct orig_node *orig_node, uint8_t new_gwflags ); void choose_gw(); -void del_default_route(); -int8_t add_default_route(); + #endif diff --git a/os.h b/os.h index ec02f30..9ce987d 100644 --- a/os.h +++ b/os.h @@ -44,6 +44,8 @@ int8_t send_packet( unsigned char *packet_buff, int packet_buff_len, struct sock int8_t probe_tun(); int8_t del_dev_tun( int32_t fd ); int8_t add_dev_tun( struct batman_if *batman_if, uint32_t dest_addr, char *tun_dev, size_t tun_dev_size, int32_t *fd ); +void del_default_route(); +int8_t add_default_route(); void apply_init_args( int argc, char *argv[] ); void init_interface ( struct batman_if *batman_if ); -- 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 9fa26c444ba9dc86b49c6002ff63b96d74c7dd62 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Apr 7 19:43:55 2007 +0200 set bidirectional timeout to orginator_interval * 2 increase compability version release 0.2 beta diff --git a/batman.c b/batman.c index 6922d52..3f34c89 100644 --- a/batman.c +++ b/batman.c @@ -585,7 +585,7 @@ int8_t batman() { debug_timeout = get_time(); - bidirectional_timeout = orginator_interval * 3; + bidirectional_timeout = orginator_interval * 2; if ( NULL == ( orig_hash = hash_new( 128, compare_orig, choose_orig ) ) ) return(-1); diff --git a/batman.h b/batman.h index 35d6605..f5952eb 100644 --- a/batman.h +++ b/batman.h @@ -35,8 +35,8 @@ -#define SOURCE_VERSION "0.2 alpha (debug)" -#define COMPAT_VERSION 2 +#define SOURCE_VERSION "0.2 beta" +#define COMPAT_VERSION 3 #define PORT 1966 #define UNIDIRECTIONAL 0x80 #define DIRECTLINK 0x40 -- 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 4c71c1defe50126e74d988bab32963310635f007 Author: Axel Neumann <neumann(a)cgws.de> Date: Sun Apr 8 17:25:23 2007 +0200 added kamikaze targets in Makefile diff --git a/Makefile b/Makefile index d5d2ee0..99169a5 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,14 @@ # 02110-1301, USA # -CC_MIPS_PATH = /usr/src/openWrt/build/buildroot-ng/openwrt/staging_dir_mipsel/bin -CC_MIPS = $(CC_MIPS_PATH)/mipsel-linux-uclibc-gcc -STRIP_MIPS = $(CC_MIPS_PATH)/sstrip +CC_MIPS_KK_PATH = /usr/src/openWrt/build/buildroot-ng/openwrt/staging_dir_mipsel/bin +CC_MIPS_KK = $(CC_MIPS_KK_PATH)/mipsel-linux-uclibc-gcc +STRIP_MIPS_KK = $(CC_MIPS_KK_PATH)/sstrip + +CC_MIPS_WR_PATH = /usr/src/openWrt/build/whiterussian/openwrt/staging_dir_mipsel/bin +CC_MIPS_WR = $(CC_MIPS_WR_PATH)/mipsel-linux-uclibc-gcc +STRIP_MIPS_WR = $(CC_MIPS_WR_PATH)/sstrip + CFLAGS_MIPS = -Wall -O0 -g3 LDFLAGS_MIPS = -lpthread @@ -51,19 +56,30 @@ LINUX_SRC_H= batman.h originator.h schedule.h batman-specific.h list.h os.h allo all: batmand -mips: batmand-mips-static batmand-mips-dynamic - batmand: batman.o $(OS_OBJ) Makefile batman.h $(CC) -o $@ batman.o $(OS_OBJ) $(LDFLAGS) -batmand-mips-static: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile - $(CC_MIPS) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) -static - $(STRIP_MIPS) $@ -batmand-mips-dynamic: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile - $(CC_MIPS) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) - $(STRIP_MIPS) $@ +mips-kk: batmand-mips-kk-static batmand-mips-kk-dynamic + +batmand-mips-kk-static: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile + $(CC_MIPS_KK) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) -static + $(STRIP_MIPS_KK) $@ + +batmand-mips-kk-dynamic: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile + $(CC_MIPS_KK) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) + $(STRIP_MIPS_KK) $@ + +mips-wr: batmand-mips-wr-static batmand-mips-wr-dynamic + + +batmand-mips-wr-static: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile + $(CC_MIPS_WR) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) -static + $(STRIP_MIPS_WR) $@ +batmand-mips-wr-dynamic: $(LINUX_SRC_C) $(LINUX_SRC_H) Makefile + $(CC_MIPS_WR) $(CFLAGS_MIPS) -o $@ $(LINUX_SRC_C) $(LDFLAGS_MIPS) + $(STRIP_MIPS_WR) $@ clean: rm -f batmand batmand-mips* *.o *~ -- 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 4dd4a9d4daf9dd3b5398415f0726bf1dbd298053 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Apr 7 12:52:02 2007 +0200 send gateway class with vis packet - fix buffer overwrite diff --git a/batman.c b/batman.c index eb7462a..63a43f0 100644 --- a/batman.c +++ b/batman.c @@ -544,9 +544,10 @@ void send_vis_packet() { } if(packet != NULL) { - packet = debugRealloc(packet, ( size * sizeof(unsigned char) ) + 1, 114); - *(packet + size + 1) = gateway_class; - send_packet(packet, ( size * sizeof(unsigned char) ) + 1, &vis_if.addr, vis_if.sock); + size++; + packet = debugRealloc(packet, size * sizeof(unsigned char), 114); + *(packet + size - 1) = gateway_class; + send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); debugFree( packet, 1102 ); } } -- 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 9226ff433d1a56cb40894638d3c21252b3b7a0e6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Apr 7 19:19:26 2007 +0200 add mutex to avoid tcp timeout deadlock (nothing beautiful) diff --git a/batman.c b/batman.c index 63a43f0..6922d52 100644 --- a/batman.c +++ b/batman.c @@ -29,6 +29,7 @@ #include "originator.h" #include "schedule.h" +#include <errno.h> /* should be removed together with tcp control channel */ /* "-d" is the command line switch for the debug level, @@ -90,6 +91,7 @@ uint32_t bidirectional_timeout = 0; /* bidirectional neighbour reply timeout i struct gw_node *curr_gateway = NULL; pthread_t curr_gateway_thread_id = 0; +pthread_mutex_t curr_gw_mutex = PTHREAD_MUTEX_INITIALIZER; uint32_t pref_gateway = 0; @@ -301,23 +303,34 @@ void choose_gw() { if ( curr_gateway != tmp_curr_gw ) { - if ( curr_gateway != NULL ) { + if ( pthread_mutex_trylock( &curr_gw_mutex ) == 0 ) { - debug_output( 3, "Removing default route - better gateway found\n" ); + if ( curr_gateway != NULL ) { - del_default_route(); + debug_output( 3, "Removing default route - better gateway found\n" ); - } + del_default_route(); + + } - curr_gateway = tmp_curr_gw; + curr_gateway = tmp_curr_gw; + + /* may be the last gateway is now gone */ + if ( ( curr_gateway != NULL ) && ( !is_aborted() ) ) { + + addr_to_string( curr_gateway->orig_node->orig, orig_str, ADDR_STR_LEN ); + debug_output( 3, "Adding default route to %s (%i,%i,%i)\n", orig_str, max_gw_class, max_packets, max_gw_factor ); + + add_default_route(); + + } - /* may be the last gateway is now gone */ - if ( ( curr_gateway != NULL ) && ( !is_aborted() ) ) { + if ( pthread_mutex_unlock( &curr_gw_mutex ) < 0 ) + debug_output( 0, "Error - could not unlock mutex (choose_gw): %s \n", strerror( errno ) ); - addr_to_string( curr_gateway->orig_node->orig, orig_str, ADDR_STR_LEN ); - debug_output( 3, "Adding default route to %s (%i,%i,%i)\n", orig_str, max_gw_class, max_packets, max_gw_factor ); + } else { - add_default_route(); + debug_output( 0, "Warning - could not change default route (mutex locked): %s \n", strerror( EBUSY ) ); } diff --git a/batman.h b/batman.h index a1d1544..35d6605 100644 --- a/batman.h +++ b/batman.h @@ -76,7 +76,8 @@ extern uint32_t pref_gateway; extern unsigned char *hna_buff; extern struct gw_node *curr_gateway; -pthread_t curr_gateway_thread_id; +extern pthread_t curr_gateway_thread_id; +extern pthread_mutex_t curr_gw_mutex; extern uint8_t found_ifs; extern int32_t receive_max_sock; diff --git a/posix-specific.c b/posix-specific.c index a5ce1a9..c3f5a2a 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -1041,13 +1041,33 @@ void *client_to_gw_tun( void *arg ) { } - if ( connect ( curr_gateway_tcp_sock, (struct sockaddr *)&gw_addr, sizeof(struct sockaddr) ) < 0 ) { + if ( pthread_mutex_lock( &curr_gw_mutex ) == 0 ) { - debug_output( 0, "Error - can't connect to gateway: %s\n", strerror(errno) ); - close( curr_gateway_tcp_sock ); + if ( connect ( curr_gateway_tcp_sock, (struct sockaddr *)&gw_addr, sizeof(struct sockaddr) ) < 0 ) { + + debug_output( 0, "Error - can't connect to gateway: %s\n", strerror(errno) ); + close( curr_gateway_tcp_sock ); + + curr_gw_data->gw_node->last_failure = get_time(); + curr_gw_data->gw_node->unavail_factor++; + + curr_gateway = NULL; + debugFree( arg, 1207 ); + + if ( pthread_mutex_unlock( &curr_gw_mutex ) != 0 ) + debug_output( 0, "Error - could not unlock mutex (client_to_gw_tun => 1): %s \n", strerror( errno ) ); + + return NULL; - curr_gw_data->gw_node->last_failure = get_time(); - curr_gw_data->gw_node->unavail_factor++; + } + + if ( pthread_mutex_unlock( &curr_gw_mutex ) != 0 ) + debug_output( 0, "Error - could not unlock mutex (client_to_gw_tun => 2): %s \n", strerror( errno ) ); + + } else { + + debug_output( 0, "Error - could not lock mutex (client_to_gw_tun => 1): %s \n", strerror( errno ) ); + close( curr_gateway_tcp_sock ); curr_gateway = NULL; debugFree( arg, 1207 ); @@ -1114,12 +1134,28 @@ void *client_to_gw_tun( void *arg ) { server_keep_alive_timeout = get_time(); - if ( write( curr_gateway_tcp_sock, keep_alive_string, sizeof( keep_alive_string ) ) < 0 ) { + if ( pthread_mutex_lock( &curr_gw_mutex ) == 0 ) { - debug_output( 3, "server_keepalive failed: %s\n", strerror(errno) ); + if ( write( curr_gateway_tcp_sock, keep_alive_string, sizeof( keep_alive_string ) ) < 0 ) { + + debug_output( 3, "server_keepalive failed: %s\n", strerror(errno) ); + + curr_gw_data->gw_node->last_failure = get_time(); + curr_gw_data->gw_node->unavail_factor++; + + if ( pthread_mutex_unlock( &curr_gw_mutex ) != 0 ) + debug_output( 0, "Error - could not unlock mutex (client_to_gw_tun => 3): %s \n", strerror( errno ) ); + + break; + + } + + if ( pthread_mutex_unlock( &curr_gw_mutex ) != 0 ) + debug_output( 0, "Error - could not unlock mutex (client_to_gw_tun => 4): %s \n", strerror( errno ) ); + + } else { - curr_gw_data->gw_node->last_failure = get_time(); - curr_gw_data->gw_node->unavail_factor++; + debug_output( 0, "Error - could not lock mutex (client_to_gw_tun => 2): %s \n", strerror( errno ) ); 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 7c84d50621f5bd06aaf3f81ff420e1aa9b552279 Author: Stefan Sperling <stsp(a)stsp.in-berlin.de> Date: Wed Apr 4 23:13:11 2007 +0200 Make this compile on OpenBSD. I have not tested if this code does even run. It likely won't. Among the items that still need fixing on *BSD are: * Is adding/removing routes really working? * Multiple interface support (via berkeley packet filter?) * IP-IP tunnels diff --git a/batman.h b/batman.h index cc5dd51..a1d1544 100644 --- a/batman.h +++ b/batman.h @@ -22,6 +22,7 @@ #ifndef _BATMAN_BATMAN_H #define _BATMAN_BATMAN_H +#include <sys/types.h> #include <netinet/in.h> #include <pthread.h> #include <sys/un.h> diff --git a/bsd.c b/bsd.c index 9410828..1409299 100644 --- a/bsd.c +++ b/bsd.c @@ -17,6 +17,8 @@ * */ +#warning BSD support is known broken - if you compile this on BSD you are expected to fix it :-P + #include <sys/types.h> #include <sys/param.h> #include <sys/sysctl.h> @@ -36,10 +38,34 @@ #include <unistd.h> #include <stdlib.h> #include <err.h> +#include <stdarg.h> #include "os.h" #include "batman-specific.h" +/* Adapted from busybox */ +int vdprintf(int d, const char *format, va_list ap) +{ + char buf[1024]; + int len; + + len = vsnprintf(buf, sizeof(buf), format, ap); + return write(d, buf, len); +} + +/* From glibc */ +int dprintf(int d, const char *format, ...) +{ + va_list arg; + int done; + + va_start (arg, format); + done = vdprintf (d, format, arg); + va_end (arg); + + return done; +} + void set_forwarding(int state) { int mib[4]; @@ -81,10 +107,11 @@ int get_forwarding(void) return state; } -int bind_to_iface( int udp_recv_sock, char *dev ) +int8_t bind_to_iface( int32_t udp_recv_sock, char *dev ) { /* XXX: Is binding a socket to a specific - * interface possible in *BSD? */ + * interface possible in *BSD? + * Possibly via bpf... */ return 1; } @@ -101,7 +128,8 @@ struct rt_msg struct sockaddr_in gateway; }; -void add_del_route( unsigned int dest, unsigned int netmask, unsigned int router, int del, char *dev, int sock ) +void add_del_route( uint32_t dest, uint16_t netmask, uint32_t router, + int8_t del, char *dev, int32_t sock ) { char str1[16], str2[16]; int rt_sock; @@ -252,7 +280,7 @@ int open_tun_any(char *dev_name, size_t dev_name_size) #endif /* Probe for tun interface availability */ -int probe_tun() +int8_t probe_tun() { /* FIXME tun-supprt broken int fd; @@ -266,12 +294,12 @@ int probe_tun() return 0; } -int del_dev_tun(int fd) +int8_t del_dev_tun(int32_t fd) { return close(fd); } -int add_dev_tun(struct batman_if *batman_if, unsigned int tun_addr, char *tun_dev, size_t tun_dev_size, int *fd) +int8_t add_dev_tun(struct batman_if *batman_if, uint32_t tun_addr, char *tun_dev, size_t tun_dev_size, int32_t *fd) { /* FIXME tun-support broken int so; -- 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 2496b0a2407ecc32d0ac5c3875482a1e4e723acb Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Apr 7 12:18:03 2007 +0200 send gateway class with vis packet diff --git a/batman.c b/batman.c index 83b6a90..eb7462a 100644 --- a/batman.c +++ b/batman.c @@ -544,8 +544,10 @@ void send_vis_packet() { } if(packet != NULL) { - send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); - debugFree( packet, 1102 ); + packet = debugRealloc(packet, ( size * sizeof(unsigned char) ) + 1, 114); + *(packet + size + 1) = gateway_class; + send_packet(packet, ( size * sizeof(unsigned char) ) + 1, &vis_if.addr, vis_if.sock); + debugFree( packet, 1102 ); } } diff --git a/posix-specific.c b/posix-specific.c index bad7e05..a5ce1a9 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -133,7 +133,7 @@ void debug_output( int8_t debug_prio, char *format, ... ) { } else { - debug_output( 0, "Error - could not trylock mutex (debug_output): %s \n", strerror( errno ) ); + debug_output( 0, "Warning - could not trylock mutex (debug_output): %s \n", strerror( EBUSY ) ); } @@ -611,7 +611,7 @@ void apply_init_args( int argc, char *argv[] ) { signal( SIGINT, handler ); signal( SIGTERM, handler ); -// signal( SIGSEGV, segmentation_fault ); + signal( SIGSEGV, segmentation_fault ); for ( res = 0; res < 4; res++ ) { -- batman; test conversation

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010