[GNUnet-SVN] r27181 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-05-16 17:04:15 +0200 (Thu, 16 May 2013)
New Revision: 27181

Modified:
   gnunet/src/mesh/gnunet-service-mesh-new.c
   gnunet/src/mesh/test_mesh2.conf
   gnunet/src/mesh/test_mesh2_local.c
Log:
- debug

Modified: gnunet/src/mesh/gnunet-service-mesh-new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-new.c   2013-05-16 14:54:36 UTC (rev 
27180)
+++ gnunet/src/mesh/gnunet-service-mesh-new.c   2013-05-16 15:04:15 UTC (rev 
27181)
@@ -3970,7 +3970,7 @@
     return;
   }
   t->port = ntohl (t->port);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s [%x] (%x)\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CREATED TUNNEL %s[%x] (%x)\n",
               GNUNET_i2s (&my_full_id), t->id.tid, t->local_tid);
 
   peer_info = peer_get (&t_msg->peer);

Modified: gnunet/src/mesh/test_mesh2.conf
===================================================================
--- gnunet/src/mesh/test_mesh2.conf     2013-05-16 14:54:36 UTC (rev 27180)
+++ gnunet/src/mesh/test_mesh2.conf     2013-05-16 15:04:15 UTC (rev 27181)
@@ -6,12 +6,12 @@
 
 [mesh]
 BINARY = gnunet-service-mesh-new
-AUTOSTART = YES
+AUTOSTART = NO
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 PORT = 10511
 # PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 REFRESH_PATH_TIME = 3 s
 APP_ANNOUNCE_TIME = 5 s
 ID_ANNOUNCE_TIME = 5 s
@@ -54,7 +54,7 @@
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core mesh
 PORT = 12366
 
 [transport-tcp]

Modified: gnunet/src/mesh/test_mesh2_local.c
===================================================================
--- gnunet/src/mesh/test_mesh2_local.c  2013-05-16 14:54:36 UTC (rev 27180)
+++ gnunet/src/mesh/test_mesh2_local.c  2013-05-16 15:04:15 UTC (rev 27181)
@@ -197,7 +197,7 @@
   struct GNUNET_PeerIdentity id;
 
   GNUNET_TESTING_peer_get_identity (me, &id);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: CONNECT BY TYPE\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: CONNECT BY PORT\n");
   t = GNUNET_MESH_tunnel_create (mesh_peer_1, NULL, &id, 1);
 }
 
@@ -215,7 +215,7 @@
   me = peer;
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
+                                    (GNUNET_TIME_UNIT_SECONDS, 120), &do_abort,
                                     NULL);
   mesh_peer_1 = GNUNET_MESH_connect (cfg,       /* configuration */
                                      (void *) 1L,     /* cls */