indentation, comment and style fixes, no semantic changes

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

diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index adba0a6662b339aa98e0d5f8eea404474b47bbfd..bc77865a89d0e17799ab2f52079d94a8f494646f 100644 (file)
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -278,9 +278,9 @@ send_request (struct GNUNET_VPN_RedirectionRequest *rr)
     rip->result_af = htonl (rr->result_af);
     rip->addr_af = htonl (rr->addr_af);
     rip->request_id = rr->request_id = ++vh->request_id_gen;
-    memcpy (&rip[1],
-            rr->addr,
-            alen);
+    GNUNET_memcpy (&rip[1],
+                   rr->addr,
+                   alen);
   }
   GNUNET_MQ_send (vh->mq,
                   env);
@@ -314,17 +314,17 @@ static void
 connect_task (void *cls)
 {
   struct GNUNET_VPN_Handle *vh = cls;
-  GNUNET_MQ_hd_var_size (use_ip,
-                         GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP,
-                         struct RedirectToIpResponseMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_use_ip_handler (cls),
+    GNUNET_MQ_hd_var_size (use_ip,
+                           GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP,
+                           struct RedirectToIpResponseMessage,
+                           cls),
     GNUNET_MQ_handler_end ()
   };
   struct GNUNET_VPN_RedirectionRequest *rr;
 
   vh->rt = NULL;
-  vh->mq = GNUNET_CLIENT_connecT (vh->cfg,
+  vh->mq = GNUNET_CLIENT_connect (vh->cfg,
                                   "vpn",
                                   handlers,
                                   &mq_error_handler,
@@ -352,7 +352,7 @@ reconnect (struct GNUNET_VPN_Handle *vh)
   for (rr = vh->rr_head; NULL != rr; rr = rr->next)
     rr->request_id = 0;
   vh->backoff = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS,
-                                         GNUNET_TIME_relative_min (GNUNET_TIME_relative_multiply (vh->backoff, 2),
+                                         GNUNET_TIME_relative_min (GNUNET_TIME_relative_saturating_multiply (vh->backoff, 2),
                                                                    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)));
   vh->rt = GNUNET_SCHEDULER_add_delayed (vh->backoff,
                                         &connect_task,
@@ -483,7 +483,7 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
   rr->expiration_time = expiration_time;
   rr->result_af = result_af;
   rr->addr_af = addr_af;
-  memcpy (&rr[1],
+  GNUNET_memcpy (&rr[1],
           addr,
           alen);
   GNUNET_CONTAINER_DLL_insert_tail (vh->rr_head,