session time out for http client/server

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

diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 4c8dc43c01307098af70a1ada7cda482815d4ad6..a68fdc45b785e64e2e767715c6fd5b46932d230e 100644 (file)
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -122,7 +122,7 @@ do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *                will match 'result_af' from the request
  * @param address IP address (struct in_addr or struct in_addr6, depending on 'af')
  *                that the VPN allocated for the redirection;
- *                traffic to this IP will now be redirected to the 
+ *                traffic to this IP will now be redirected to the
  *                specified target peer; NULL on error
  */
 static void
@@ -167,7 +167,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   int dst_af;
   int req_af;
-  struct GNUNET_PeerIdentity peer; 
+  struct GNUNET_PeerIdentity peer;
   struct GNUNET_HashCode sd;
   const void *addr;
   struct in_addr v4;
@@ -194,7 +194,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   if (ipv6)
     req_af = AF_INET6;
-  
+
   if (NULL == target_ip)
   {
     if (NULL == service_name)
@@ -226,13 +226,14 @@ run (void *cls, char *const *args, const char *cfgfile,
     if (udp)
       protocol = IPPROTO_UDP;
     if (GNUNET_OK !=
-       GNUNET_CRYPTO_hash_from_string (peer_id,
-                                       &peer.hashPubKey))
+       GNUNET_CRYPTO_eddsa_public_key_from_string (peer_id,
+                                                      strlen (peer_id),
+                                                      &peer.public_key))
     {
       FPRINTF (stderr, _("`%s' is not a valid peer identifier.\n"),
                peer_id);
       goto error;
-    }    
+    }
     GNUNET_CRYPTO_hash (service_name,
                        strlen (service_name),
                        &sd);
@@ -264,7 +265,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     {
       dst_af = AF_INET6;
       addr = &v6;
-    }    
+    }
     request = GNUNET_VPN_redirect_to_ip (handle,
                                         req_af,
                                         dst_af,