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 93e39ae07edba8f582ca34aa2dc8a597d9532819 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Oct 6 00:36:15 2006 +0200 keep alive timeout fix diff --git a/posix.c b/posix.c index a267162..b2b11d9 100644 --- a/posix.c +++ b/posix.c @@ -117,7 +117,7 @@ void *client_to_gw_tun( void *arg ) { /* connect to server (ask permission) */ if ( ( curr_gateway_tcp_sock = socket(PF_INET, SOCK_STREAM, 0) ) < 0 ) { - + perror("socket"); curr_gateway = NULL; return NULL; @@ -134,8 +134,8 @@ void *client_to_gw_tun( void *arg ) { } server_keep_alive_timeout = get_time(); - - + + /* connect to server (establish udp tunnel) */ if ( ( curr_gateway_tun_sock = socket(PF_INET, SOCK_DGRAM, 0) ) < 0 ) { @@ -184,8 +184,8 @@ void *client_to_gw_tun( void *arg ) { while ( ( !is_aborted() ) && ( curr_gateway != NULL ) ) { - if (server_keep_alive_timeout + 30 >= get_time()) { - + if (server_keep_alive_timeout + 30 < get_time()) { + server_keep_alive_timeout = get_time(); strcpy (buff, "ping\0"); if (write (curr_gateway_tcp_sock, buff,5) < 0) { @@ -194,15 +194,15 @@ void *client_to_gw_tun( void *arg ) { } } - - + + tv.tv_sec = 0; tv.tv_usec = 250; tmp_wait_sockets = wait_sockets; res = select(max_sock + 1, &tmp_wait_sockets, NULL, NULL, &tv); - + if ( res > 0 ) { /* tcp message from server */ -- 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 bb1d9076fe9268024211fbf22c434936b60bbeb7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Oct 6 00:40:12 2006 +0200 keep alive timeout fix II diff --git a/posix.c b/posix.c index b2b11d9..18c942c 100644 --- a/posix.c +++ b/posix.c @@ -184,7 +184,7 @@ void *client_to_gw_tun( void *arg ) { while ( ( !is_aborted() ) && ( curr_gateway != NULL ) ) { - if (server_keep_alive_timeout + 30 < get_time()) { + if (server_keep_alive_timeout + 30000 < get_time()) { server_keep_alive_timeout = get_time(); strcpy (buff, "ping\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 8988d0841dcd2c332872c2f4b2ae32d7ed9d1c8a Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Oct 5 15:22:22 2006 +0200 - some cleanup - reduce MTU by 28 diff --git a/linux.c b/linux.c index e25507f..026b8de 100755 --- a/linux.c +++ b/linux.c @@ -255,8 +255,37 @@ int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { } - close( tmp_fd ); + if ( ioctl( tmp_fd, SIOCGIFMTU, &ifr ) < 0 ) { + + perror("SIOCGIFMTU"); + del_dev_tun( *fd ); + close( tmp_fd ); + return -1; + + } + + if ( ifr.ifr_mtu < 500 ) { + + fprintf(stderr, "Warning: MTU smaller than 500 - cannot reduce MTU anymore\n" ); + + } else { + + ifr.ifr_mtu -= 28; + + if ( ioctl( tmp_fd, SIOCSIFMTU, &ifr ) < 0 ) { + + perror("SIOCSIFMTU"); + del_dev_tun( *fd ); + close( tmp_fd ); + return -1; + + } + + } + + strncpy( tun_dev, ifr.ifr_name, IFNAMSIZ - 1 ); + close( tmp_fd ); return 1; diff --git a/posix.c b/posix.c index 95fa7e3..17fd7a5 100644 --- a/posix.c +++ b/posix.c @@ -91,11 +91,10 @@ void *client_to_gw_tun( void *arg ) { struct gw_node *gw_node = (struct gw_node *)arg; struct batman_if *curr_gateway_batman_if; struct sockaddr_in gw_addr, my_addr, sender_addr; - struct in_addr tmp_ip_holder; struct timeval tv; int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd; unsigned int addr_len, curr_gateway_ip; - char curr_gateway_tun_if[IFNAMSIZ], tun_ip[] = "104.255.255.250\0"; + char curr_gateway_tun_if[IFNAMSIZ]; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -116,13 +115,6 @@ void *client_to_gw_tun( void *arg ) { my_addr.sin_addr.s_addr = curr_gateway_batman_if->addr.sin_addr.s_addr; - if ( inet_pton(AF_INET, tun_ip, &tmp_ip_holder) < 1 ) { - - printf( "Invalid tunnel IP specified: %s\n", tun_ip ); - exit(EXIT_FAILURE); - - } - /* connect to server (ask permission) */ if ( ( curr_gateway_tcp_sock = socket(PF_INET, SOCK_STREAM, 0) ) < 0 ) { @@ -475,8 +467,8 @@ void *gw_listen( void *arg ) { struct sockaddr_in addr; 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.251\0"; - int res, status, max_sock_min, max_sock, buff_len, tun_fd, i; + char gw_addr[16], str2[16], tun_dev[IFNAMSIZ], tun_ip[] = "104.255.255.254\0"; + int res, status, max_sock_min, max_sock, buff_len, tun_fd; unsigned int addr_len, client_timeout, buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -567,22 +559,21 @@ void *gw_listen( void *arg ) { /* /dev/tunX activity */ } else if ( FD_ISSET( tun_fd, &tmp_wait_sockets ) ) { - if ( ( buff_len = read( tun_fd, buff, sizeof( buff ) ) ) < 0 ) { + /* not needed - kernel knows client adress and routes traffic directly */ + + fprintf(stderr, "Warning: data coming through tun device %s ?!\n", tun_dev); + + /*if ( ( buff_len = read( tun_fd, buff, sizeof( buff ) ) ) < 0 ) { fprintf(stderr, "Could not read data from %s: %s\n", tun_dev, strerror(errno)); } else { -// if ( sendto(curr_gateway_tun_sock, buff, buff_len, 0, (struct sockaddr *)&gw_addr, sizeof (struct sockaddr_in) ) < 0 ) { -// fprintf(stderr, "Cannot send to gateway: %s\n", strerror(errno)); -// } - - printf( "recv: len= %d\n", buff_len ); - for ( i = 0; i < buff_len; i++) - printf( "%02X", buff[i] ); - printf("\n"); + if ( sendto(curr_gateway_tun_sock, buff, buff_len, 0, (struct sockaddr *)&gw_addr, sizeof (struct sockaddr_in) ) < 0 ) { + fprintf(stderr, "Cannot send to client: %s\n", strerror(errno)); + } - } + }*/ /* client sent keep alive */ } else { -- batman; test conversation

1 0

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

19 Dec '10

The following commit has been merged in the master branch: commit 8cd7fa1ca22919c7b813cc0e8257fad9447c0df1 Author: Corinna 'Elektra' Aichele <onelektra(a)gmx.net> Date: Thu Oct 5 00:47:59 2006 +0200 README updated. diff --git a/INSTALL b/INSTALL index 8414fc0..cf44dc2 100755 --- a/INSTALL +++ b/INSTALL @@ -31,8 +31,8 @@ Features Improved B.A.T.M.A.N-III algorithm Free-BSD support Mac OS-X support -IP-Tunnels -Gateway detection +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. @@ -42,9 +42,6 @@ dimensional or three dimensional topology graphs. Roadmap ------- -So far IP-Tunnels use TCP in TCP - which is known to have bad performance -when links are lossy. We are going to move to UDP for the IP-Tunnels. - Testing, improvements in the documentation. Develop B.A.T.M.A.N-Advanced that routes on Layer 2 and creates a Link-Local-Illusion for higher @@ -88,12 +85,32 @@ it, copy the deamon to a location somewhere in your path, for example Use --- - Make sure you have no firewall running that is blocking UDP port 1966. -Type in the B.A.T.M.A.N source-directory: -./batman -H +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 + + +Typical gateway usage example: + +./batman -g 7 -o 2000 -s <visualisation-server ip> ath0 +NOTE: + +You HAVE to select a routing class to connect to a gateway. The routing +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. + +Here's what you see if you start long help (with some extra comments) + +./batman -H Usage: batman [options] interface [interface interface] @@ -103,7 +120,7 @@ Usage: batman [options] interface [interface interface] -g gateway class Use this feature if you want to offer a internet gateway and tell - clients what kind of gateway you are! + clients how much speed is available. default: 0 -> this is not an internet gateway allowed values: 1 -> modem line @@ -119,8 +136,8 @@ Usage: batman [options] interface [interface interface] 11 -> >6 MBit -h shorter help - -H this help + -H this help -o orginator interval in ms default: 1000, allowed values: >0 @@ -133,7 +150,7 @@ Usage: batman [options] interface [interface interface] -r routing class (only needed if gateway class = 0) - If you are a client, this will select the way you choose an + If you are a gateway-client, this will select the way you choose an internet-gateway default: 0 -> set no default route @@ -141,6 +158,11 @@ Usage: batman [options] interface [interface interface] 2 -> use stable internet connection 3 -> use best statistic internet connection (olsr style) + 1 -> not really usable yet + 2 -> use best connection to gateway, faster gateway class will be + preferred if connection quality is similar + 3 -> use nearest gateway + -s visualisation server The Server-IP that collects the topology information for @@ -152,7 +174,7 @@ Usage: batman [options] interface [interface interface] Switch the output of runtime debugging messages to a low level if you want -to test the software on a slow system. +to test the software on a slow - embedded - system. We would love to see B.A.T.M.A.N in a match against other routing protocols in existing mesh networks. You can set up a virtual interface on an @@ -164,7 +186,7 @@ IP-address within another network: ifconfig wlan0:0 103.30.30.30 netmask 255.0.0.0 broadcast 103.255.255.255 -./batman wlan0:0 +./batman -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 0a3501d7c8e1ba7d05a0a6846f025c22a7ccdaa7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Oct 3 18:35:26 2006 +0200 udp tunnel part VII diff --git a/posix.c b/posix.c index 54b78ee..95fa7e3 100644 --- a/posix.c +++ b/posix.c @@ -589,12 +589,15 @@ void *gw_listen( void *arg ) { list_for_each_safe(client_pos, client_pos_tmp, &batman_if->client_list) { - max_sock =max_sock_min; + max_sock = max_sock_min; gw_client = list_entry(client_pos, struct gw_client, list); if ( FD_ISSET( gw_client->sock, &tmp_wait_sockets ) ) { + if ( debug_level >= 1 ) + addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); + status = read( gw_client->sock, buff, sizeof( buff ) ); if ( status > 0 ) { @@ -614,12 +617,12 @@ void *gw_listen( void *arg ) { if ( status < 0 ) { if ( debug_level >= 1 ) - printf( "Cannot read message from client: %s\n", strerror(errno) ); + printf( "Cannot read message from client %s: %s\n", str2, strerror(errno) ); } else { if ( debug_level >= 1 ) - printf( "Client closed connection ...\n" ); + printf( "Client %s closed connection ...\n", str2 ); } @@ -655,7 +658,7 @@ void *gw_listen( void *arg ) { client_timeout = get_time(); - max_sock =max_sock_min; + max_sock = max_sock_min; list_for_each_safe(client_pos, client_pos_tmp, &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 6ecc6d0f58e00e2386d8a105946808c530009770 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Oct 2 06:28:40 2006 +0200 udp tunnel part IV diff --git a/linux.c b/linux.c index 97da9bc..ceefed7 100755 --- a/linux.c +++ b/linux.c @@ -209,7 +209,8 @@ int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_ /* set ip of this end point of tunnel */ memset( &addr, 0, sizeof(addr) ); - addr.sin_addr.s_addr = batman_if->addr.sin_addr.s_addr; +// addr.sin_addr.s_addr = batman_if->addr.sin_addr.s_addr; + addr.sin_addr.s_addr = dest_addr; addr.sin_family = AF_INET; memcpy( &ifr.ifr_addr, &addr, sizeof(struct sockaddr) ); diff --git a/posix.c b/posix.c index 7901fbe..1cf2113 100644 --- a/posix.c +++ b/posix.c @@ -91,10 +91,11 @@ void *client_to_gw_tun( void *arg ) { struct gw_node *gw_node = (struct gw_node *)arg; struct batman_if *curr_gateway_batman_if; struct sockaddr_in gw_addr, my_addr, sender_addr; + struct in_addr tmp_ip_holder; struct timeval tv; - int res, max_sock, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd; + int res, max_sock, status, buff_len, curr_gateway_tcp_sock, curr_gateway_tun_sock, curr_gateway_tun_fd; unsigned int addr_len, curr_gateway_ip; - char curr_gateway_tun_if[IFNAMSIZ]; + char curr_gateway_tun_if[IFNAMSIZ], tun_ip[] = "104.255.255.250\0"; unsigned char buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -115,6 +116,13 @@ void *client_to_gw_tun( void *arg ) { my_addr.sin_addr.s_addr = curr_gateway_batman_if->addr.sin_addr.s_addr; + if ( inet_pton(AF_INET, tun_ip, &tmp_ip_holder) < 1 ) { + + printf( "Invalid tunnel IP specified: %s\n", tun_ip ); + exit(EXIT_FAILURE); + + } + /* connect to server (ask permission) */ if ( ( curr_gateway_tcp_sock = socket(PF_INET, SOCK_STREAM, 0) ) < 0 ) { @@ -152,8 +160,7 @@ void *client_to_gw_tun( void *arg ) { } - - if ( add_dev_tun( curr_gateway_batman_if, curr_gateway_ip, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { + if ( add_dev_tun( curr_gateway_batman_if, tmp_ip_holder.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { // add_del_route( 0, curr_gateway_ip, 0, curr_gateway_tun_if, curr_gateway_tun_fd ); @@ -193,8 +200,28 @@ void *client_to_gw_tun( void *arg ) { /* tcp message from server */ if ( FD_ISSET( curr_gateway_tcp_sock, &tmp_wait_sockets ) ) { - /* TODO: if server sends a message (e.g. rejects) */ - printf( "server message ?\n" ); + status = read( curr_gateway_tcp_sock, buff, sizeof( buff ) ); + + if ( status > 0 ) { + + if ( debug_level >= 1 ) + printf( "server message ?\n" ); + + } else if ( status == -1 ) { + + if ( debug_level >= 1 ) + printf( "Cannot read message from gateway: %s\n", strerror(errno) ); + + break; + + } else if (status == 0) { + + if ( debug_level >= 1 ) + printf( "Gateway closed connection - timeout ?\n" ); + + break; + + } /* udp message (tunnel data) */ } else if ( FD_ISSET( curr_gateway_tun_sock, &tmp_wait_sockets ) ) { @@ -446,8 +473,9 @@ void *gw_listen( void *arg ) { struct list_head *client_pos, *client_pos_tmp; struct timeval tv; struct sockaddr_in addr; + struct in_addr tmp_ip_holder; socklen_t sin_size = sizeof(struct sockaddr_in); - char gw_addr[16], str2[16], tun_dev[IFNAMSIZ]; + char gw_addr[16], str2[16], tun_dev[IFNAMSIZ], tun_ip[] = "104.255.255.251\0"; int res, max_sock, buff_len, tun_fd, i; unsigned int addr_len, client_timeout, buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -457,7 +485,14 @@ void *gw_listen( void *arg ) { addr_len = sizeof (struct sockaddr_in); client_timeout = get_time(); - if ( add_dev_tun( batman_if, 0, tun_dev, &tun_fd ) < 0 ) { + if ( inet_pton(AF_INET, tun_ip, &tmp_ip_holder) < 1 ) { + + printf( "Invalid tunnel IP specified: %s\n", tun_ip ); + exit(EXIT_FAILURE); + + } + + if ( add_dev_tun( batman_if, tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { printf( "Could not open tun device on interface: %s\n", gw_addr ); return 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 dbfac193599992722e107daa7c3abc27e06a39ed Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Oct 2 09:20:58 2006 +0200 udp tunnel part V diff --git a/posix.c b/posix.c index 1cf2113..ff72f3f 100644 --- a/posix.c +++ b/posix.c @@ -207,7 +207,7 @@ void *client_to_gw_tun( void *arg ) { if ( debug_level >= 1 ) printf( "server message ?\n" ); - } else if ( status == -1 ) { + } else if ( status < 0 ) { if ( debug_level >= 1 ) printf( "Cannot read message from gateway: %s\n", strerror(errno) ); @@ -476,7 +476,7 @@ 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.251\0"; - int res, max_sock, buff_len, tun_fd, i; + int res, status, max_sock_min, max_sock, buff_len, tun_fd, i; unsigned int addr_len, client_timeout, buff[1500]; fd_set wait_sockets, tmp_wait_sockets; @@ -503,11 +503,13 @@ void *gw_listen( void *arg ) { FD_SET(batman_if->tunnel_sock, &wait_sockets); FD_SET(tun_fd, &wait_sockets); - max_sock = batman_if->tcp_gw_sock; - if ( batman_if->tunnel_sock > max_sock ) - max_sock = batman_if->tunnel_sock; - if ( tun_fd > max_sock ) - max_sock = tun_fd; + max_sock_min = batman_if->tcp_gw_sock; + if ( batman_if->tunnel_sock > max_sock_min ) + max_sock_min = batman_if->tunnel_sock; + if ( tun_fd > max_sock_min ) + max_sock_min = tun_fd; + + max_sock = max_sock_min; while (!is_aborted()) { @@ -585,20 +587,54 @@ void *gw_listen( void *arg ) { /* client sent keep alive */ } else { - list_for_each(client_pos, &batman_if->client_list) { + list_for_each_safe(client_pos, client_pos_tmp, &batman_if->client_list) { + + max_sock =max_sock_min; gw_client = list_entry(client_pos, struct gw_client, list); if ( FD_ISSET( gw_client->sock, &tmp_wait_sockets ) ) { - gw_client->last_keep_alive = get_time(); + status = read( gw_client->sock, buff, sizeof( buff ) ); + + if ( status > 0 ) { + + gw_client->last_keep_alive = get_time(); + + if ( gw_client->sock > max_sock ) + max_sock = gw_client->sock; + + if ( debug_level >= 1 ) { + addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); + printf( "gateway: client %s sent keep alive on interface %s\n", str2, batman_if->dev ); + } + + } else { + + if ( status < 0 ) { + + if ( debug_level >= 1 ) + printf( "Cannot read message from client: %s\n", strerror(errno) ); + + } else { + + if ( debug_level >= 1 ) + printf( "Client closed connection ...\n" ); + + } + + FD_CLR(gw_client->sock, &wait_sockets); + close( gw_client->sock ); + + list_del(client_pos); + free_memory(client_pos); - if ( debug_level >= 1 ) { - addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); - printf( "gateway: client %s sent keep alive on interface %s\n", str2, batman_if->dev ); } - break; + } else { + + if ( gw_client->sock > max_sock ) + max_sock = gw_client->sock; } @@ -619,11 +655,7 @@ void *gw_listen( void *arg ) { client_timeout = get_time(); - max_sock = batman_if->tcp_gw_sock; - if ( batman_if->tunnel_sock > max_sock ) - max_sock = batman_if->tunnel_sock; - if ( tun_fd > max_sock ) - max_sock = tun_fd; + max_sock =max_sock_min; list_for_each_safe(client_pos, client_pos_tmp, &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 7d676210e5fd4282f5be7094336455aede86174f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Oct 2 14:37:07 2006 +0200 udp tunnel part VI diff --git a/batman.c b/batman.c index d82e8e5..9ac431f 100755 --- a/batman.c +++ b/batman.c @@ -71,13 +71,6 @@ int orginator_interval = 1000; /* orginator message interval in miliseconds */ struct gw_node *curr_gateway = NULL; pthread_t curr_gateway_thread_id = 0; -/*struct batman_if *curr_gateway_batman_if = NULL; -unsigned int curr_gateway_ip = 0; -char *curr_gateway_tun_if = NULL; -int curr_gateway_tcp_sock = 0; -int curr_gateway_tun_sock = 0; -int curr_gateway_tun_fd = 0;*/ - unsigned int pref_gateway = 0; int found_ifs = 0; @@ -260,19 +253,17 @@ static void choose_gw() curr_gateway = tmp_curr_gw; /* may be the last gateway is now gone */ - if ( curr_gateway != NULL ) { + if ( ( curr_gateway != NULL ) && ( !is_aborted() ) ) { if (debug_level >= 1) { addr_to_string( curr_gateway->orig_node->orig, orig_str, ADDR_STR_LEN ); output( "Adding default route to %s (%i,%i,%i)\n", orig_str, max_gw_class, max_packets, max_gw_factor ); } - /*curr_gateway_ip = curr_gateway->orig_node->orig; - curr_gateway_batman_if = curr_gateway->orig_node->batman_if;*/ - } - add_default_route(); + if ( !is_aborted() ) + add_default_route(); } diff --git a/batman.h b/batman.h index 272ce00..b9b9826 100755 --- a/batman.h +++ b/batman.h @@ -52,13 +52,6 @@ extern unsigned int pref_gateway; extern struct gw_node *curr_gateway; pthread_t curr_gateway_thread_id; -/*extern struct batman_if *curr_gateway_batman_if; -extern unsigned int curr_gateway_ip; -extern char *curr_gateway_tun_if; -extern int curr_gateway_tcp_sock; -extern int curr_gateway_tun_sock; -extern int curr_gateway_tun_fd;*/ - extern int found_ifs; extern struct list_head if_list; diff --git a/linux.c b/linux.c index ceefed7..e25507f 100755 --- a/linux.c +++ b/linux.c @@ -102,25 +102,35 @@ void add_del_route(unsigned int dest, unsigned int router, int del, char *dev, i addr = (struct sockaddr_in *)&route.rt_genmask; addr->sin_family = AF_INET; - addr->sin_addr.s_addr = 0xffffffff; + addr->sin_addr.s_addr = ( ( ( dest == 0 ) && ( router == 0 ) ) ? 0x00000000 : 0xffffffff ); route.rt_flags = RTF_HOST | RTF_UP; + route.rt_metric = 1; - if (dest != router) + if ( (dest != router) || ( ( dest == 0 ) && ( router == 0 ) ) ) { addr = (struct sockaddr_in *)&route.rt_gateway; addr->sin_family = AF_INET; addr->sin_addr.s_addr = router; - route.rt_flags |= RTF_GATEWAY; + if ( ( dest == 0 ) && ( router == 0 ) ) { + + route.rt_metric = 0; + route.rt_flags = RTF_UP; + output("%s default route via %s\n", del ? "Deleting" : "Adding", dev); + + } else { + + route.rt_flags |= RTF_GATEWAY; + output("route to %s via %s (%s)\n", del ? "Deleting" : "Adding", str1, str2, dev); + + } - output("%s route to %s via %s (%s)\n", del ? "Deleting" : "Adding", str1, str2, dev); } else { output("%s route to %s via 0.0.0.0 (%s)\n", del ? "Deleting" : "Adding", str1, dev); } - route.rt_metric = 1; route.rt_dev = dev; @@ -164,7 +174,7 @@ int del_dev_tun( int fd ) { } -int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ) { +int add_dev_tun( unsigned int tun_addr, char *tun_dev, int *fd ) { int tmp_fd; struct ifreq ifr; @@ -209,8 +219,7 @@ int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_ /* set ip of this end point of tunnel */ memset( &addr, 0, sizeof(addr) ); -// addr.sin_addr.s_addr = batman_if->addr.sin_addr.s_addr; - addr.sin_addr.s_addr = dest_addr; + addr.sin_addr.s_addr = tun_addr; addr.sin_family = AF_INET; memcpy( &ifr.ifr_addr, &addr, sizeof(struct sockaddr) ); @@ -224,21 +233,6 @@ int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_ } - /* TODO: remove dest_addr from function call */ - /* set ip of this remote point of tunnel */ - /*memset( &addr, 0, sizeof(addr) ); - addr.sin_addr.s_addr = dest_addr; - addr.sin_family = AF_INET; - memcpy( &ifr.ifr_addr, &addr, sizeof(struct sockaddr) ); - - if ( ioctl( tmp_fd, SIOCSIFDSTADDR, &ifr) < 0 ) { - - perror("SIOCSIFDSTADDR"); - del_dev_tun( *fd ); - close( tmp_fd ); - return -1; - - }*/ if ( ioctl( tmp_fd, SIOCGIFFLAGS, &ifr) < 0 ) { diff --git a/os.h b/os.h index 0197869..092602a 100755 --- a/os.h +++ b/os.h @@ -38,6 +38,6 @@ int rand_num(int limit); int bind_to_iface( int udp_recv_sock, char *dev ); int probe_tun(); int del_dev_tun( int fd ); -int add_dev_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ); +int add_dev_tun( unsigned int dest_addr, char *tun_dev, int *fd ); #endif diff --git a/posix.c b/posix.c index ff72f3f..54b78ee 100644 --- a/posix.c +++ b/posix.c @@ -160,9 +160,9 @@ void *client_to_gw_tun( void *arg ) { } - if ( add_dev_tun( curr_gateway_batman_if, tmp_ip_holder.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { + if ( add_dev_tun( curr_gateway_batman_if->addr.sin_addr.s_addr, curr_gateway_tun_if, &curr_gateway_tun_fd ) > 0 ) { -// add_del_route( 0, curr_gateway_ip, 0, curr_gateway_tun_if, curr_gateway_tun_fd ); + add_del_route( 0, 0, 0, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); } else { @@ -267,7 +267,7 @@ void *client_to_gw_tun( void *arg ) { } /* cleanup */ -// add_del_route( 0, curr_gateway_ip, 1, curr_gateway_tun_if, curr_gateway_tun_fd ); + add_del_route( 0, 0, 1, curr_gateway_tun_if, curr_gateway_batman_if->udp_send_sock ); curr_gateway = NULL; @@ -492,7 +492,7 @@ void *gw_listen( void *arg ) { } - if ( add_dev_tun( batman_if, tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { + if ( add_dev_tun( tmp_ip_holder.s_addr, tun_dev, &tun_fd ) < 0 ) { printf( "Could not open tun device on interface: %s\n", gw_addr ); return 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 818a20cc93191191221d78c9d199bdb87bcd6d76 Author: Axel Neumann <neumann(a)cgws.de> Date: Sun Oct 1 15:20:11 2006 +0200 commit message missing diff --git a/README b/README index 9f5b7de..3f2465a 100755 --- a/README +++ b/README @@ -6,24 +6,25 @@ 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 (linkstate -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 neighbour 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 (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 ping -R <destination address> -Note that this command does not work with busybox (a multicall binary, the -'swiss knife' for embedded linux systems, used for example in OpenWRT and -Freifunk firmware), since 'ping' doesn't have the -R option in busybox. You -can do +Note that this command does not work with busy box (a multi-call binary, +the 'swiss knife' for embedded Linux systems, used for example in +OpenWRT and Freifunk firmware), since 'ping' doesn't have the -R +option in busybox. You can do traceroute -n <destination address> @@ -33,32 +34,35 @@ instead. # 2.) EVOLUTION # ################# -B.A.T.M.A.N-III is the third stage in the evolution of the B.A.T.M.A.N. -algorithm - hence the numbering scheme. B.A.T.M.A.N-I didn't check for -bidirectional link conditions when forwarding packets. This was an obvious -design flaw. We didn't bother to add bidirectional link checks in the first -experimental implementation that was meant to merely test the algorithm. The -results of B.A.T.M.A.N-I were however promising, so B.A.T.M.A.N-II was -implemented introducing a simple mechanism to check for bidirectional links -to perform further tests in real-live scenarios. +B.A.T.M.A.N-III is the third stage in the evolution of the +B.A.T.M.A.N. algorithm - hence the numbering scheme. B.A.T.M.A.N-I +didn't check for bidirectional link conditions when forwarding +packets. This was an obvious design flaw. We didn't bother to add +bidirectional link checks in the first experimental implementation +that was meant to merely test the algorithm. The results of +B.A.T.M.A.N-I were however promising, so B.A.T.M.A.N-II was +implemented introducing a simple mechanism to check for bidirectional +links to perform further tests in real-live scenarios. B.A.T.M.A.N-II implemented the bare algorithm with bi-directional link -checks for meshnodes with one interface only and was tested in the Freifunk -meshclouds of Berlin and Weimar. Thank you very much, you are really brave -guys! It was working quite nice on PCs, but the quick and dirty -implementation was causing high CPU-Loads on embedded systems and even -broadcast packet storms! - -Axel Neumann proved theoretically that the algorithm of B.A.T.M.A.N-II still -had its flaws. He has simulated conditions where B.A.T.M.A.N-II would choose -routes far from optimal and even could cause routing loops. - -Hence B.A.T.M.A.N-III implements changes in the algorithm. Internet gateway -detection and auto-negotiation of IP-Tunnels has been added, too. Last but -not least support for multiple interfaces per node has been implemented as -well. And we have a feature to collect link state information in a -centralized server so people can download data from this server to display -those fancy three-dimensional meshclouds with s3d or two-dimensional with +checks for meshnodes with one interface only and was tested in the +Freifunk meshclouds of Berlin and Weimar. Thank you very much, you are +really brave guys! It was working quite nice on PCs, but the quick and +dirty implementation was causing high CPU-Loads on embedded systems +and even broadcast packet storms! + +We found out that the algorithm of B.A.T.M.A.N-II still had its +flaws. We identified conditions where B.A.T.M.A.N-II would choose +routes far from optimal and even could cause routing loops. Hence +B.A.T.M.A.N-III implements changes in the algorithm to cope with these +scenarios. + +Some new features, namely Internet gateway detection and +auto-negotiation of IP-Tunnels, have been added. Support for multiple +interfaces per node has been implemented. And last but not least we +have a mechanism to collect link state information in a centralized +server so people can download data from this server to display those +fancy three-dimensional meshclouds with s3d or two-dimensional with dot-draw. Now B.A.T.M.A.N-III has - in theory - everything to replace other MANET @@ -68,10 +72,10 @@ further testing to improve maturity, of course. We'll have a party at c-base in Berlin soon, to celebrate when this milestone will finally be released as B.A.T.M.A.N-III-0.10! -B.A.T.M.A.N. will have a hard time to gain the same popolarity like olsrd +B.A.T.M.A.N. will have a hard time to gain the same popularity like olsrd from olsr.org. OLSR is now the same for community mesh networks in Europe and elsewhere what 'Tempo' is for handkerchiefs in Germany. Tempo is a -german brand that produces handkerchiefs. Germans with a cold rather ask for +German brand that produces handkerchiefs. Germans with a cold rather ask for a 'Tempo' than for a 'Taschentuch' (= handkerchief). The formula: @@ -90,9 +94,9 @@ the way that B.A.T.M.A.N. goes :) A node in a B.A.T.M.A.N-MANET is only interested to learn about the existence of all nodes that it can communicate with, either in single or -multihop range, and which single hop neighbour it has to choose as a router -to a certain destination. To communicate with a node in multihop range a -B.A.T.M.A.N node only needs to know which single hop neighbour is the best +multi-hop range, and which single hop neighbor it has to choose as a router +to a certain destination. To communicate with a node in multi-hop range a +B.A.T.M.A.N node only needs to know which single hop neighbor is the best to send its packets to, so that the packets takes the best way to the node in the distance. To explain the advantage of this approach it may be best to compare it with other ideas about mesh routing - namely source routing and @@ -127,7 +131,7 @@ calculate routes valid for the whole mesh from every single node to every other. Fortunately this does not mean source routing, because the view about the topology in the distance is hazy, too. In fact every node maintains a individual huge database and computes paths that packets should follow and -hands payload packets confidingly to the next neighbour on the path that it +hands payload packets confidingly to the next neighbor on the path that it has calculated. While one node may believe that it knows the path that the packages are actually going to travel, each node maintains its own database and calculates its own paths. So every node autonomously computes its own @@ -135,7 +139,7 @@ decisions when initiating or forwarding traffic. There are two flies in the ointment that come with this approach. First tradeoff is the calculation of huge databases, while all a node can decide -is select the next single hop neighbour that it hands a packet to. Second +is select the next single hop neighbor that it hands a packet to. Second the databases in nodes in a mesh with a considerable number of nodes are never really consistent - so routing loops can occur if the route calculations of two nodes involved in forwarding traffic are not in sync and @@ -154,7 +158,7 @@ effect, that it too often switches between internet gateways which causes problems (connections break down, timeouts). OLSR lacks an IP-Tunnel-Plugin that would users allow to select their gateways. -In conclusion the algoritm of OLSR is too complicated for its own good and +In conclusion the algorithm of OLSR is too complicated for its own good and draws too much CPU-Power. So it is time for something more simple and more effective. @@ -182,7 +186,7 @@ packets on Port 1966 UDP. This port must be open for incoming and outgoing UDP traffic. -B.A.T.M.A.N detects neighbours and distant nodes by transmitting, receiving +B.A.T.M.A.N detects neighbors and distant nodes by transmitting, receiving and repeating broadcasts according to the rules of the B.A.T.M.A.N. algorithm. These broadcasts travel through the mesh-cloud until they are lost or nobody has to rebroadcast them any more. Once a node receives a @@ -192,27 +196,28 @@ of the node. ORIGINATOR MESSAGES -A broadcast (we will call it originator message from now on) contains at -least the originator address, a sequence number and a TTL. TTL or -Time-To-Live is a counter that is decremented by 1 every time before the -packet is forwarded. If the TTL value reaches 0 the packet is dropped. The -TTL is used in TCP to avoid packets endlessly roaming around. This is a -common mechanism. The TTL does also tell how often a originator message has -been forwarded if the initial TTL-Value is known. +A broadcast (we will call it originator message from now on) contains +at least the originator address, a sequence number and a TTL. TTL or +Time-To-Live is a counter that is decremented by 1 every time before +the packet is rebroadcasted. If the TTL value reaches 0 the packet is +dropped. The TTL is used in IP packets to avoid packets endlessly +travelling around. This is a common mechanism. If the initial +TTL-Value is known, the TTL does also tell the receiver how often a originator +message has been rebroadcasted. Particular important for B.A.T.M.A.N. is the sequence number. Originators -number their broadcasts so other nodes can deceide whether they receive a +number their broadcasts so other nodes can decide whether they receive a originator message the first time or repeatedly. Originator messages are initiated from every node at a given interval and forwarded by all other nodes according to the rules of the algorithm. If a broadcast gets lost it is not resend. -Imagine we have a chain of mesh nodes: +Imagine we have a chain of mesh nodes (A,B,C,D): -Node A <--> Node B <--> Node C <--> Node D + A <--> B <--> C <--> D -Imagine further that every node can only see its direct neighbours. Now node A +Imagine further that every node can only see its direct neighbors. Now node A broadcasts a originator-message. Node B receives the message and rebroadcasts it. Thereby node C receives the information: Message from node A, forwarded from @@ -231,11 +236,11 @@ The first example was of course very simple. So what happens if the network looks like this: - * ---- Node B ---- Node C ---- * - | | -Node A + ------------ Node D -------- + Node F - | | - * ------------ Node E -------- * + *------- B --------- C ------* + | | + A --+-------------- D -----------+-- F + | | + *-------------- E -----------* What does B.A.T.M.A.N do now? @@ -243,45 +248,52 @@ Node A broadcasts an originator-message with sequence number 0. B, C, D and E all forward this message. Node F receives the originator-message sequence number 0 from node A -forwarded by node D first and memorises that it has seen A over D. Node F -ignores the originator-message with sequence number 0 from A, that he +forwarded by node D first and memorizes that it has seen A over D. Node F +ignores the originator-message with sequence number 0 from A, that it receives from node C because it receives the same message again. The message forwarded by node E may get lost or come too late to be the first, too. -Using the best path between node A and F the packets travel more reliable -and/or quicker. All node F has to do is memorise where it gets most originator messages -from. Speed is decisive, because node F is only memorising who is forwarding -the packet first. If node F wants to communicate with node A it simply sends -its packets to the node with the best statistic. +Using the best path between node A and F the packets travel more +reliable and/or quicker. B.A.T.M.A.N. nodes consider the best path to +a destination only as far as to the best next hop (or neighbor) +towards the destination. The best next hop is simply identified by +gathering statistics about how often and via which neighbor a certain +originator and sequence number has been received first. -If the statistic is equal amongst two or more neighbours the biggest TTL is -decisive. If TTL is equal the last received orginator packet from -destination host is decisive. +For the above given scenario, all node F has to do is memorize where it +gets most originator messages from. Speed is decisive, because node F +is only memorizing who is forwarding the packet first. If node F wants +to communicate with node A it simply sends its packets to the node +with the best statistic. +If the statistic is equal amongst two or more neighbors the biggest +TTL is decisive. If also the TTL is equal the last received originator +packet is decisive. -TABLES AND LISTS MAINTAINED BY B.A.T.M.A.N. -1.) List of symmetric single hop neighbours +TABLES MAINTAINED BY B.A.T.M.A.N. -Each node maintains a list of direct neighbours that contains all nodes that +1.) Table of symmetric single hop neighbors + +Each node maintains a list of direct neighbors that contains all nodes that it has a direct bidirectional (symmetric) communication link to. Bidirectional links are detected when a originator receives its self-initiated originator messages getting directly repeated by its -neighbours. +neighbors. 2.) Table of Originators and Ranking This table contains all nodes that are detected by receiving their -originator messages and the number of originator pakets received via each -bidirectional neighbour. The best neighbour for each originator is added to -the kernel routing table of the underlying operating system as router to the -originator. +originator messages and the number of originator-sequence-number +packets received first via the particular neighbor. The best neighbor +for each originator is added to the kernel routing table of the +underlying operating system as router to the originator. Example: Ranking table in Node Q -List of Originatorpackets received from -Originators Neighbour A Neighbour B Neighbour C Neighbour D +List of Originator packets received from +Originators Neighbor A Neighbor B Neighbor C Neighbor D A 12 9 7 3 @@ -308,42 +320,40 @@ Y via C ORIGINATOR MESSAGE RANKING POLICY -(Sorry if this sounds like programm code :) - If a originator message with a unknown sequence number is received first via -the best ranking neighbour the packet count is increased for the best -neighbour. - -If a originator message with a unknown sequence number is not received via -the best ranking neighbour but from another bidirectional neighbour the -packet count is increased for that neighbour. +a bidirectional neighbor the packet count is increased for this neighbor. -If a originator message with a unknown sequence number is received via the -best ranking neighbour but received first from another bidirectional -neighbour the packet count is increased for the best ranking neighbour as -long as the TTL of the originator message from the best neighbour and... -Uff - if you want to read further check out the programm code ;) +ORIGINATOR MESSAGE FORWARDING POLICY +(Sorry if this sounds like program code :) -ORIGINATOR MESSAGE FORWARDING POLICY +Only originator packets that are received via the best ranking +neighbor are rebroadcasted. This must also be +done if the originator-sequence-number tuple has already been seen via +another (non-best) neighbor as long as the TTL does not differ to the +last originator-sequence-number tuple that has been seen from the best +neighbor first. -Only originator packets that are received via the best ranking neighbour are -forwarded - that means rebroadcasted. -That was easy... +BIDIRECTIONAL NEIGHBOR DETECTION AND UNIDIRECTIONAL FLAG +Originator messages initiated from single hop neighbors are always +re-broadcasted. If we don't receive our own self-initiated originator +messages getting rebroadcasted by a neighbor we add a unidirectional +flag before rebroadcasting the originator message of this neighbor. -BIDIRECTIONAL NEIGHBOUR DETECTION AND UNIDIRECTIONAL FLAG +There is one exception where the unidirectional flag is used in +response to originator packets from bidirectional single-hop +neighbors: -Originator messages originated from single hop neighbours are repeated -always, but if we don't receive our own self-initiated originator messages -getting rebroadcasted by a neighbour we add a unidirectional flag in -response to his self-initiated broadcasts. +If a bidirectional neighbor is not the best ranking neighbor to itself +(ah, you're getting confused now, eh?!) we rebroadcast the originator +packet containing the unidirectional flag. Originator messages with unidirectional flag that were not initiated by us -are always ignored. If we see a neighbour directly repeat our self-initiated -originator messages then there is obviously a bidirectional link between +are always ignored. If we see a neighbor directly repeat our self-initiated +originator messages there is obviously a bidirectional link between us. Happy testing! -- 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 07f23f2f5719906e07f897faaaf13c39485f0dbf Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 1 20:40:22 2006 +0200 bind to interface implemented diff --git a/bsd.c b/bsd.c index 730434c..18c1db0 100644 --- a/bsd.c +++ b/bsd.c @@ -78,6 +78,12 @@ int get_forwarding(void) return state; } +int bind_to_iface( int udp_recv_sock, char *dev ) { + + return 1; + +} + /* Message structure used to interface the kernel routing table. * See route(4) for details on the message passing interface for * manipulating the kernel routing table. diff --git a/linux.c b/linux.c index dd96969..e5fa92e 100755 --- a/linux.c +++ b/linux.c @@ -67,6 +67,22 @@ int get_forwarding(void) return state; } +int bind_to_iface( int udp_recv_sock, char *dev ) { + + if ( setsockopt( udp_recv_sock, SOL_SOCKET, SO_BINDTODEVICE, dev, strlen ( dev ) + 1 ) < 0 ) + { + if ( errno == 19 ) { + fprintf( stderr, "Warning: Cannot bind socket to alias device %s\n", dev ); + } else { + fprintf( stderr, "Cannot bind socket to device %s : %s \n", dev, strerror(errno) ); + return -1; + } + } + + return 1; + +} + void add_del_route(unsigned int dest, unsigned int router, int del, char *dev, int sock) { struct rtentry route; diff --git a/os.h b/os.h index 95ecdf7..dce6861 100755 --- a/os.h +++ b/os.h @@ -35,6 +35,7 @@ void addr_to_string(unsigned int addr, char *str, int len); int receive_packet(unsigned char *buff, int 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 ); int probe_tun(); int del_ipip_tun( int fd ); int add_ipip_tun( struct batman_if *batman_if, unsigned int dest_addr, char *tun_dev, int *fd ); diff --git a/posix.c b/posix.c index d9ce121..f7d6ba4 100644 --- a/posix.c +++ b/posix.c @@ -432,7 +432,7 @@ void *gw_listen( void *arg ) { gw_client->last_keep_alive = get_time(); - if ( debug_level >= 2 ) { + if ( debug_level >= 1 ) { addr_to_string(gw_client->addr.sin_addr.s_addr, str2, sizeof (str2)); printf( "gateway: client %s sent keep alive on interface %s\n", str2, batman_if->dev ); } @@ -712,6 +712,13 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } + if ( bind_to_iface( batman_if->udp_recv_sock, batman_if->dev ) < 0 ) { + + close_all_sockets(); + exit(EXIT_FAILURE); + + } + if (bind(batman_if->udp_recv_sock, (struct sockaddr *)&batman_if->broad, sizeof (struct sockaddr_in)) < 0) { fprintf(stderr, "Cannot bind receive socket: %s\n", strerror(errno)); -- batman; test conversation

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2010