In Windows, pipes, files and the console have to be accessed

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

diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 81282960ece83000b5a8d90c0097eec8942881f3..e4da5fae00daed53ca5b15ae14e919a9a8b6f823 100644 (file)
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -120,7 +120,7 @@ struct GNUNET_VPN_RedirectionRequest
   /**
    * For service redirection, service descriptor.
    */
-  GNUNET_HashCode serv;                     
+  struct GNUNET_HashCode serv;              
 
   /**
    * At what time should the created service mapping expire?
@@ -219,6 +219,9 @@ receive_response (void *cls,
     reconnect (vh);
     return;
   }  
+  GNUNET_CLIENT_receive (vh->client,
+                        &receive_response, vh,
+                        GNUNET_TIME_UNIT_FOREVER_REL);      
   for (rr = vh->rr_head; NULL != rr; rr = rr->next)
   {
     if (rr->request_id == rm->request_id)
@@ -233,9 +236,6 @@ receive_response (void *cls,
       break;
     }
   }
-  GNUNET_CLIENT_receive (vh->client,
-                        &receive_response, vh,
-                        GNUNET_TIME_UNIT_FOREVER_REL);      
 }
 
 
@@ -402,7 +402,7 @@ reconnect (struct GNUNET_VPN_Handle *vh)
     GNUNET_CLIENT_notify_transmit_ready_cancel (vh->th);
     vh->th = NULL;
   }  
-  GNUNET_CLIENT_disconnect (vh->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (vh->client);
   vh->client = NULL;
   vh->request_id_gen = 0;
   for (rr = vh->rr_head; NULL != rr; rr = rr->next)
@@ -464,7 +464,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh,
                             int result_af,
                             uint8_t protocol,
                             const struct GNUNET_PeerIdentity *peer,
-                            const GNUNET_HashCode *serv,
+                            const struct GNUNET_HashCode *serv,
                             int nac,
                             struct GNUNET_TIME_Absolute expiration_time,
                             GNUNET_VPN_AllocationCallback cb,
@@ -591,7 +591,7 @@ GNUNET_VPN_disconnect (struct GNUNET_VPN_Handle *vh)
   }
   if (NULL != vh->client)
   {
-    GNUNET_CLIENT_disconnect (vh->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (vh->client);
     vh->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != vh->rt)