for w32 port

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

diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 354e090d85ff58cee60b6382f85c5402bcfe9b6f..8790ff7f34d8ec244c800f59867d7b28beb4f900 100644 (file)
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -68,10 +68,14 @@ struct vpn_cls {
 static struct vpn_cls mycls;
 
 static void cleanup(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tskctx) {
-       if (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) {
-               PLIBC_KILL(mycls.helper_pid, SIGTERM);
-               GNUNET_OS_process_wait(mycls.helper_pid);
-       }
+  GNUNET_assert (0 != (tskctx->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN));
+  PLIBC_KILL(mycls.helper_pid, SIGTERM);
+  GNUNET_OS_process_wait(mycls.helper_pid);
+  if (mycls.dns_connection != NULL)
+    {
+      GNUNET_CLIENT_disconnect (mycls.dns_connection, GNUNET_NO);
+      mycls.dns_connection = NULL;
+    }
 }
 
 static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tsdkctx);
@@ -152,6 +156,7 @@ static void helper_write(void* cls, const struct GNUNET_SCHEDULER_TaskContext* t
        size_t pkt_len = sizeof(struct GNUNET_MessageHeader) + sizeof(struct pkt_tun) + net_len;
 
        struct ip_udp_dns* pkt = alloca(pkt_len);
+       memset(pkt, 0, pkt_len);
 
        pkt->shdr.size = htons(pkt_len);
        pkt->shdr.type = htons(GNUNET_MESSAGE_TYPE_VPN_HELPER);
@@ -250,35 +255,59 @@ static void message_token(void *cls, void *client, const struct GNUNET_MessageHe
 
                        GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, query);
 
-                       /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
+                       if (mycls.dns_connection != NULL)
+                         /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
                }
        }
 
 }
 
-void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg);
-
-void reconnect_to_service_dns() {
-  mycls.dns_connection = GNUNET_CLIENT_connect (mycls.sched, "dns", mycls.cfg);
-
+static void 
+dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg);
+
+static void 
+reconnect_to_service_dns (void *cls,
+                         const struct GNUNET_SCHEDULER_TaskContext *tc) {
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connecting\n");
+  GNUNET_assert (mycls.dns_connection == NULL);
+  mycls.dns_connection = GNUNET_CLIENT_connect (mycls.sched, "dns", mycls.cfg); 
   GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
+  if (mycls.head != NULL)
+    /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, ntohs(mycls.head->pkt.hdr.size), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL);
 }
 
-void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) {
-       if (msg == NULL) reconnect_to_service_dns();
-
-       if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS)) goto out;
-
-       struct answer_packet_list* pkt = GNUNET_malloc(ntohs(msg->size) + 2*sizeof(struct answer_packet_list*));
-
-       memcpy(&pkt->pkt, msg, ntohs(msg->size));
-
-       GNUNET_CONTAINER_DLL_insert_after(mycls.answer_head, mycls.answer_tail, mycls.answer_tail, pkt);
-
-       GNUNET_SCHEDULER_add_write_file (mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.fh_to_helper, &helper_write, NULL);
-
-out:
-       GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
+static void 
+dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) 
+{
+  if (msg == NULL) 
+    {
+      GNUNET_CLIENT_disconnect(mycls.dns_connection, GNUNET_NO);
+      mycls.dns_connection = NULL;
+      GNUNET_SCHEDULER_add_delayed (mycls.sched,
+                                   GNUNET_TIME_UNIT_SECONDS,
+                                   &reconnect_to_service_dns,
+                                   NULL);
+      return;
+    }
+
+  if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS)) 
+    {
+      GNUNET_break (0);
+      GNUNET_CLIENT_disconnect(mycls.dns_connection, GNUNET_NO);
+      mycls.dns_connection = NULL;
+      GNUNET_SCHEDULER_add_now (mycls.sched,
+                               &reconnect_to_service_dns,
+                               NULL);
+      return;
+    }  
+  struct answer_packet_list* pkt = GNUNET_malloc(ntohs(msg->size) + 2*sizeof(struct answer_packet_list*));
+  
+  memcpy(&pkt->pkt, msg, ntohs(msg->size));
+  GNUNET_CONTAINER_DLL_insert_after(mycls.answer_head, mycls.answer_tail, mycls.answer_tail, pkt);  
+  GNUNET_SCHEDULER_add_write_file (mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.fh_to_helper, &helper_write, NULL);
+  GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 /**
@@ -299,11 +328,8 @@ run (void *cls,
 {
   mycls.sched = sched;
   mycls.mst = GNUNET_SERVER_mst_create(&message_token, NULL);
-
   mycls.cfg = cfg;
-
-  reconnect_to_service_dns();
-
+  GNUNET_SCHEDULER_add_now (sched, &reconnect_to_service_dns, NULL);
   GNUNET_SCHEDULER_add_delayed(sched, GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls); 
   start_helper_and_schedule(mycls);
 }