From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 16 May 2013 15:04:15 +0000 (+0000)
Subject: - debug
X-Git-Tag: initial-import-from-subversion-38251~9008
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=72dabf2eb55013193206d1fe0c1b0e805a5f4997;p=oweals%2Fgnunet.git

- debug
---

diff --git a/src/mesh/gnunet-service-mesh-new.c b/src/mesh/gnunet-service-mesh-new.c
index 806b61764..611f86179 100644
--- a/src/mesh/gnunet-service-mesh-new.c
+++ b/src/mesh/gnunet-service-mesh-new.c
@@ -3970,7 +3970,7 @@ handle_local_tunnel_create (void *cls, struct GNUNET_SERVER_Client *client,
     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);
diff --git a/src/mesh/test_mesh2.conf b/src/mesh/test_mesh2.conf
index 2f0f525da..35fecc32a 100644
--- a/src/mesh/test_mesh2.conf
+++ b/src/mesh/test_mesh2.conf
@@ -6,12 +6,12 @@ AUTOSTART = NO
 
 [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 @@ WAN_QUOTA_IN = 3932160
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core mesh
 PORT = 12366
 
 [transport-tcp]
diff --git a/src/mesh/test_mesh2_local.c b/src/mesh/test_mesh2_local.c
index 1e06d12ab..5167de2a4 100644
--- a/src/mesh/test_mesh2_local.c
+++ b/src/mesh/test_mesh2_local.c
@@ -197,7 +197,7 @@ do_find (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   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 @@ run (void *cls,
   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 */