- remove d^Cug

diff --git a/src/mesh/gnunet-service-mesh_new.c b/src/mesh/gnunet-service-mesh_new.c
index 23d462e22797469134a85e4f127cb5bea0ab81e2..2668d480435dd6f47bbec43e594f42be37fcae2f 100644 (file)
--- a/src/mesh/gnunet-service-mesh_new.c
+++ b/src/mesh/gnunet-service-mesh_new.c
@@ -3049,7 +3049,6 @@ queue_send (void *cls, size_t size, void *buf)
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* Queue send\n");
 
-
     /* If queue is empty, send should have been cancelled */
     if (NULL == queue)
     {
@@ -4226,8 +4225,6 @@ dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp,
   size_t len;
 
   // FIXME: does proof have to be NULL terminated?
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "*******************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "DHT GET STRING RETURNED RESULTS\n");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -5020,8 +5017,6 @@ handle_local_connect_by_string (void *cls, struct GNUNET_SERVER_Client *client,
   const char *string;
   size_t size;
   size_t len;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Connect by string started\n");
   msg = (struct GNUNET_MESH_ConnectPeerByString *) message;
@@ -5076,8 +5071,6 @@ handle_local_connect_by_string (void *cls, struct GNUNET_SERVER_Client *client,
 
   /* Initialize context */
   size = GNUNET_REGEX_get_first_key(string, len, &key);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "  consumed %u bits out of %u\n", size, len);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

diff --git a/src/mesh/test_mesh_regex.c b/src/mesh/test_mesh_regex.c
index 183514ecd7b8b7fe0ab0cd708caec6b8357cff83..716a1a5dca7a893522dfd0c0bece0da3da071d6f 100644 (file)
--- a/src/mesh/test_mesh_regex.c
+++ b/src/mesh/test_mesh_regex.c
@@ -156,8 +156,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 disconnect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "************************************************\n");
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: disconnecting peers\n");
 
   GNUNET_MESH_tunnel_destroy (t);
@@ -221,8 +219,6 @@ ch (void *cls, const struct GNUNET_PeerIdentity *peer,
 {
   long i = (long) cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Peer connected: %s\n",
               GNUNET_i2s (peer));
@@ -319,17 +315,15 @@ peergroup_ready (void *cls, const char *emsg)
 
   if (emsg != NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "test: Peergroup callback called with error, aborting test!\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Error from testing: `%s'\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: Error from testing: `%s'\n",
                 emsg);
     ok = GNUNET_NO;
     GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
     return;
   }
 #if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "test: Peer Group started successfully!\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test: Have %u connections\n",
@@ -351,8 +345,6 @@ peergroup_ready (void *cls, const char *emsg)
   d2 = GNUNET_TESTING_daemon_get (pg, 10);
   app = (GNUNET_MESH_ApplicationType) 0;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Connect to mesh\n");
   h1 = GNUNET_MESH_connect (d1->cfg, 5, (void *) 1L,
@@ -365,22 +357,16 @@ peergroup_ready (void *cls, const char *emsg)
                             &tunnel_cleaner,
                             handlers,
                             &app);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Announce REGEX\n");
-  GNUNET_MESH_announce_regex (h2, "abc");
+  GNUNET_MESH_announce_regex (h2, "0123456789ABC");
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Create tunnel\n");
   t = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) 1L);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "************************************************************\n");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Connect by string\n");
-  GNUNET_MESH_peer_request_connect_by_string (t, "abc");
+  GNUNET_MESH_peer_request_connect_by_string (t, "01234567890ABC");
   /* connect handler = success, timeout = error */
   
 }