-logging

diff --git a/src/regex/regex_api.c b/src/regex/regex_api.c
index 09b3fd68d6691376b7d3097b87b5469b5c8bde85..fb20bb20971e9409c2e5e404cf079833801aa371 100644 (file)
--- a/src/regex/regex_api.c
+++ b/src/regex/regex_api.c
@@ -279,6 +279,9 @@ handle_search_response (void *cls,
                   pid,
                   &pid[1], gpl,
                   &pid[1 + gpl], ppl);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Returned from regex CB\n",
+           GNUNET_i2s (pid));
       return;
     }
   }

diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 21fab6086a738d0cd8de3493de40d75dc179d69e..304ecb33c05ebbc948d31f86d4c7c9e2ac2fe1f7 100644 (file)
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -743,12 +743,12 @@ handle_regex_result (void *cls,
   struct ChannelState *ts = cls;
   unsigned int apptype;
 
-  GNUNET_REGEX_search_cancel (ts->search);
-  ts->search = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Exit %s found for destination %s!\n",
               GNUNET_i2s (id),
               print_channel_destination (&ts->destination));
+  GNUNET_REGEX_search_cancel (ts->search);
+  ts->search = NULL;
   switch (ts->af)
   {
   case AF_INET:
@@ -761,6 +761,10 @@ handle_regex_result (void *cls,
     GNUNET_break (0);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Creating tunnel to %s for destination %s!\n",
+              GNUNET_i2s (id),
+              print_channel_destination (&ts->destination));
   ts->channel = GNUNET_CADET_channel_create (cadet_handle,
                                              ts,
                                              id,
@@ -2830,8 +2834,8 @@ service_redirect_to_service (void *cls,
  */
 static void
 channel_cleaner (void *cls,
-               const struct GNUNET_CADET_Channel *channel,
-               void *channel_ctx)
+                 const struct GNUNET_CADET_Channel *channel,
+                 void *channel_ctx)
 {
   struct ChannelState *ts = channel_ctx;