add function conv param string

[oweals/gnunet.git] / src / vpn / vpn_api.c

diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index cf493cc52c3bceb204bf6cdb468738ee164cd853..f3068f7c2a03dd3f54072617d73658359b11dae3 100644 (file)
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff
+     Copyright (C) 2012 Christian Grothoff
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -61,7 +61,7 @@ struct GNUNET_VPN_Handle
   /**
    * Identifier of a reconnect task.
    */
-  GNUNET_SCHEDULER_TaskIdentifier rt;
+  struct GNUNET_SCHEDULER_Task * rt;
 
   /**
    * How long do we wait until we try to reconnect?
@@ -120,7 +120,7 @@ struct GNUNET_VPN_RedirectionRequest
   /**
    * For service redirection, service descriptor.
    */
-  struct GNUNET_HashCode serv;         
+  struct GNUNET_HashCode serv;
 
   /**
    * At what time should the created service mapping expire?
@@ -162,7 +162,7 @@ reconnect (struct GNUNET_VPN_Handle *vh);
 /**
  * Function called when we receive a message from the VPN service.
  *
- * @param cls the 'struct GNUNET_VPN_Handle'
+ * @param cls the `struct GNUNET_VPN_Handle`
  * @param msg message received, NULL on timeout or fatal error
  */
 static void
@@ -358,16 +358,14 @@ queue_request (struct GNUNET_VPN_RedirectionRequest *rr)
 /**
  * Connect to the VPN service and start again to transmit our requests.
  *
- * @param cls the 'struct GNUNET_VPN_Handle *'
- * @param tc scheduler context
+ * @param cls the `struct GNUNET_VPN_Handle *`
  */
 static void
-connect_task (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+connect_task (void *cls)
 {
   struct GNUNET_VPN_Handle *vh = cls;
 
-  vh->rt = GNUNET_SCHEDULER_NO_TASK;
+  vh->rt = NULL;
   vh->client = GNUNET_CLIENT_connect ("vpn", vh->cfg);
   GNUNET_assert (NULL != vh->client);
   GNUNET_assert (NULL == vh->th);
@@ -475,7 +473,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
   return rr;
 }
 
-               
+
 /**
  * Tell the VPN that forwarding to the Internet via some exit node is
  * requested.  Note that both UDP and TCP traffic will be forwarded,
@@ -578,10 +576,10 @@ GNUNET_VPN_disconnect (struct GNUNET_VPN_Handle *vh)
     GNUNET_CLIENT_disconnect (vh->client);
     vh->client = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != vh->rt)
+  if (NULL != vh->rt)
   {
     GNUNET_SCHEDULER_cancel (vh->rt);
-    vh->rt = GNUNET_SCHEDULER_NO_TASK;
+    vh->rt = NULL;
   }
   GNUNET_free (vh);
 }