[GNUnet-SVN] r35800 - in gnunet/src: regex vpn

[gnunet]

Author: grothoff
Date: 2015-05-25 15:02:31 +0200 (Mon, 25 May 2015)
New Revision: 35800

Modified:
   gnunet/src/regex/regex_api.c
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
-logging

Modified: gnunet/src/regex/regex_api.c
===================================================================
--- gnunet/src/regex/regex_api.c        2015-05-23 23:34:23 UTC (rev 35799)
+++ gnunet/src/regex/regex_api.c        2015-05-25 13:02:31 UTC (rev 35800)
@@ -279,6 +279,9 @@
                   pid,
                   &pid[1], gpl,
                   &pid[1 + gpl], ppl);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Returned from regex CB\n",
+           GNUNET_i2s (pid));
       return;
     }
   }

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2015-05-23 23:34:23 UTC (rev 35799)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2015-05-25 13:02:31 UTC (rev 35800)
@@ -743,12 +743,12 @@
   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 @@
     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 @@
  */
 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;