r1694 - trunk/batman-experimental/posix - commits - lists.open-mesh.org

8 Jun 2010

Author: axel
Date: 2010-06-08 19:57:12 +0200 (Tue, 08 Jun 2010)
New Revision: 1694
Modified:
   trunk/batman-experimental/posix/tunnel.c
Log:
tunnel.c fix routing_class=[1..2]
Modified: trunk/batman-experimental/posix/tunnel.c
===================================================================

--- trunk/batman-experimental/posix/tunnel.c	2010-06-08 17:53:36 UTC (rev 1693)
+++ trunk/batman-experimental/posix/tunnel.c	2010-06-08 17:57:12 UTC (rev 1694)
@@ -1846,7 +1846,7 @@
if ( routing_class == 0  ||  curr_gateway ||
         ((routing_class == 1 || routing_class == 2 ) && 
-	      ( batman_time_sec < COMMON_OBSERVATION_WINDOW  )) ) {
+	      ( batman_time_sec < (COMMON_OBSERVATION_WINDOW/1000)  )) ) {
return;
    }
@@ -1993,7 +1993,7 @@
    		get_gw_speeds( tuno->tun_array[0].EXT_GW_FIELD_GWFLAGS, &download_speed, &upload_speed );
    		
    		dbg_printf( cn, "%s %-15s %15s %3i, gw_class %2i - %i%s/%i%s, reliability: %i, supported tunnel types %s, %s \n",
-				curr_gateway == gw_node ? "=>" : "  ",
+				(gwc_args && curr_gateway == gw_node) ? "=>" : "  ",
    			ipStr(on->orig) , ipStr(on->router->nnkey_addr),
    		        gw_node->orig_node->router->longtm_sqr.wa_val/PROBE_TO100,
    			tuno->tun_array[0].EXT_GW_FIELD_GWFLAGS,

    