X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fvpn%2Fgnunet-daemon-vpn-dns.c;h=77d9000469f532cd65be29b49eab4f50f8b84449;hb=83b19539f4d322b43683f5838b72e9ec2c8e6073;hp=b3a9929a1625114d0059b406d36923f3834dbc8e;hpb=6813281cd9f9eac5e6d285fb87725d5d71b76ebb;p=oweals%2Fgnunet.git

diff --git a/src/vpn/gnunet-daemon-vpn-dns.c b/src/vpn/gnunet-daemon-vpn-dns.c
index b3a9929a1..77d900046 100644
--- a/src/vpn/gnunet-daemon-vpn-dns.c
+++ b/src/vpn/gnunet-daemon-vpn-dns.c
@@ -27,7 +27,7 @@
 #include <gnunet_common.h>
 #include <gnunet_client_lib.h>
 #include <gnunet_os_lib.h>
-#include <gnunet_mesh_service_new.h>
+#include <gnunet_mesh_service.h>
 #include <gnunet_protocols.h>
 #include <gnunet_server_lib.h>
 #include <gnunet_container_lib.h>
@@ -57,6 +57,7 @@ size_t
 send_query (void *cls __attribute__ ((unused)), size_t size, void *buf)
 {
   size_t len;
+
   dns_transmit_handle = NULL;
 
   /*
@@ -100,17 +101,20 @@ send_query (void *cls __attribute__ ((unused)), size_t size, void *buf)
    */
   if (head != NULL)
   {
-    dns_transmit_handle = GNUNET_CLIENT_notify_transmit_ready (dns_connection,
-                                         ntohs (head->pkt.hdr.size),
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_YES, &send_query, NULL);
+    dns_transmit_handle =
+        GNUNET_CLIENT_notify_transmit_ready (dns_connection,
+                                             ntohs (head->pkt.hdr.size),
+                                             GNUNET_TIME_UNIT_FOREVER_REL,
+                                             GNUNET_YES, &send_query, NULL);
   }
   else if (restart_hijack == 1)
   {
-    dns_transmit_handle = GNUNET_CLIENT_notify_transmit_ready (dns_connection,
-                                         sizeof (struct GNUNET_MessageHeader),
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_YES, &send_query, NULL);
+    dns_transmit_handle =
+        GNUNET_CLIENT_notify_transmit_ready (dns_connection,
+                                             sizeof (struct
+                                                     GNUNET_MessageHeader),
+                                             GNUNET_TIME_UNIT_FOREVER_REL,
+                                             GNUNET_YES, &send_query, NULL);
   }
 
   return len;
@@ -144,16 +148,19 @@ connect_to_service_dns (void *cls
 
   /* If a packet is already in the list, schedule to send it */
   if (dns_transmit_handle == NULL && head != NULL)
-    dns_transmit_handle = GNUNET_CLIENT_notify_transmit_ready (dns_connection,
-                                         ntohs (head->pkt.hdr.size),
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_YES, &send_query, NULL);
+    dns_transmit_handle =
+        GNUNET_CLIENT_notify_transmit_ready (dns_connection,
+                                             ntohs (head->pkt.hdr.size),
+                                             GNUNET_TIME_UNIT_FOREVER_REL,
+                                             GNUNET_YES, &send_query, NULL);
   else if (dns_transmit_handle == NULL && restart_hijack == 1)
   {
-    dns_transmit_handle = GNUNET_CLIENT_notify_transmit_ready (dns_connection,
-                                         sizeof (struct GNUNET_MessageHeader),
-                                         GNUNET_TIME_UNIT_FOREVER_REL,
-                                         GNUNET_YES, &send_query, NULL);
+    dns_transmit_handle =
+        GNUNET_CLIENT_notify_transmit_ready (dns_connection,
+                                             sizeof (struct
+                                                     GNUNET_MessageHeader),
+                                             GNUNET_TIME_UNIT_FOREVER_REL,
+                                             GNUNET_YES, &send_query, NULL);
   }
 }
 
@@ -170,7 +177,7 @@ dns_answer_handler (void *cls
   if (msg == NULL)
   {
     if (dns_transmit_handle != NULL)
-      GNUNET_CLIENT_notify_transmit_ready_cancel(dns_transmit_handle);
+      GNUNET_CLIENT_notify_transmit_ready_cancel (dns_transmit_handle);
     dns_transmit_handle = NULL;
     GNUNET_CLIENT_disconnect (dns_connection, GNUNET_NO);
     dns_connection = NULL;