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

[gnunet]

Author: bartpolot
Date: 2012-07-05 17:13:05 +0200 (Thu, 05 Jul 2012)
New Revision: 22501

Modified:
   gnunet/src/mesh/gnunet-service-mesh_new.c
   gnunet/src/mesh/test_mesh_regex.c
Log:
- remove d^Cug

Modified: gnunet/src/mesh/gnunet-service-mesh_new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_new.c   2012-07-05 14:29:32 UTC (rev 
22500)
+++ gnunet/src/mesh/gnunet-service-mesh_new.c   2012-07-05 15:13:05 UTC (rev 
22501)
@@ -3049,7 +3049,6 @@
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* Queue send\n");
 
-
     /* If queue is empty, send should have been cancelled */
     if (NULL == queue)
     {
@@ -4227,8 +4226,6 @@
 
   // 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,
               "  key: %s\n", GNUNET_h2s (key));
@@ -5021,8 +5018,6 @@
   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;
   size = htons (message->size);
@@ -5077,8 +5072,6 @@
   /* 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,
               "  looking for %s\n", GNUNET_h2s (&key));

Modified: gnunet/src/mesh/test_mesh_regex.c
===================================================================
--- gnunet/src/mesh/test_mesh_regex.c   2012-07-05 14:29:32 UTC (rev 22500)
+++ gnunet/src/mesh/test_mesh_regex.c   2012-07-05 15:13:05 UTC (rev 22501)
@@ -156,8 +156,6 @@
 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);
@@ -222,8 +220,6 @@
   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,9 +315,9 @@
 
   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);
@@ -329,8 +325,6 @@
   }
 #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",
               total_connections);
@@ -352,8 +346,6 @@
   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,
                             NULL,
@@ -366,21 +358,15 @@
                             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 */
   
 }