[GNUnet-SVN] r15634 - gnunet/src/vpn

[gnunet]

Author: grothoff
Date: 2011-06-15 09:56:14 +0200 (Wed, 15 Jun 2011)
New Revision: 15634

Modified:
   gnunet/src/vpn/gnunet-daemon-vpn-dns.c
   gnunet/src/vpn/gnunet-daemon-vpn-dns.h
   gnunet/src/vpn/gnunet-daemon-vpn-helper.c
   gnunet/src/vpn/gnunet-daemon-vpn-helper.h
   gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
cleanup

Modified: gnunet/src/vpn/gnunet-daemon-vpn-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-dns.c      2011-06-15 07:48:33 UTC (rev 
15633)
+++ gnunet/src/vpn/gnunet-daemon-vpn-dns.c      2011-06-15 07:56:14 UTC (rev 
15634)
@@ -111,6 +111,7 @@
 void
 connect_to_service_dns (void *cls __attribute__((unused)),
                        const struct GNUNET_SCHEDULER_TaskContext *tc) {
+    conn_task = GNUNET_SCHEDULER_NO_TASK;
     if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
       return;
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connecting to service-dns\n");
@@ -135,6 +136,7 @@
       {
        GNUNET_CLIENT_notify_transmit_ready(dns_connection, sizeof(struct 
GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, 
NULL);
       }
+    conn_task = GNUNET_SCHEDULER_add_now (start_helper_and_schedule, NULL);
 }
 
 /**
@@ -148,9 +150,9 @@
       {
        GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
        dns_connection = NULL;
-       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                     &connect_to_service_dns,
-                                     NULL);
+       conn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                                 &connect_to_service_dns,
+                                                 NULL);
        return;
       }
 
@@ -160,8 +162,8 @@
        GNUNET_break (0);
        GNUNET_CLIENT_disconnect(dns_connection, GNUNET_NO);
        dns_connection = NULL;
-       GNUNET_SCHEDULER_add_now (&connect_to_service_dns,
-                                 NULL);
+       conn_task = GNUNET_SCHEDULER_add_now (&connect_to_service_dns,
+                                             NULL);
        return;
       }
     void *pkt = GNUNET_malloc(ntohs(msg->size));

Modified: gnunet/src/vpn/gnunet-daemon-vpn-dns.h
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-dns.h      2011-06-15 07:48:33 UTC (rev 
15633)
+++ gnunet/src/vpn/gnunet-daemon-vpn-dns.h      2011-06-15 07:56:14 UTC (rev 
15634)
@@ -80,4 +80,6 @@
  */
 extern struct answer_packet_list *answer_proc_tail;
 
+extern GNUNET_SCHEDULER_TaskIdentifier conn_task;
+
 #endif /* end of include guard: GNUNET-DAEMON-VPN-DNS_H */

Modified: gnunet/src/vpn/gnunet-daemon-vpn-helper.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-06-15 07:48:33 UTC (rev 
15633)
+++ gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-06-15 07:56:14 UTC (rev 
15634)
@@ -55,6 +55,7 @@
 void
 start_helper_and_schedule(void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext *tc) {
+  shs_task = GNUNET_SCHEDULER_NO_TASK;
     if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
       return;
 

Modified: gnunet/src/vpn/gnunet-daemon-vpn-helper.h
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-helper.h   2011-06-15 07:48:33 UTC (rev 
15633)
+++ gnunet/src/vpn/gnunet-daemon-vpn-helper.h   2011-06-15 07:56:14 UTC (rev 
15634)
@@ -33,6 +33,8 @@
  */
 extern struct GNUNET_VPN_HELPER_Handle *helper_handle;
 
+extern GNUNET_SCHEDULER_TaskIdentifier shs_task;
+
 /**
  * Start the helper-process
  */

Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c  2011-06-15 07:48:33 UTC (rev 15633)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c  2011-06-15 07:56:14 UTC (rev 15634)
@@ -61,6 +61,10 @@
  */
 static struct GNUNET_CONTAINER_MultiHashMap *udp_connections;
 
+GNUNET_SCHEDULER_TaskIdentifier conn_task;
+
+GNUNET_SCHEDULER_TaskIdentifier shs_task;
+
 /**
  * Function scheduled as very last function, cleans up after us
  *{{{
@@ -84,6 +88,16 @@
        GNUNET_MESH_disconnect(mesh_handle);
        mesh_handle = NULL;
       }
+    if (GNUNET_SCHEDULER_NO_TASK != shs_task)
+      {
+       GNUNET_SCHEDULER_cancel (shs_task);
+       shs_task = GNUNET_SCHEDULER_NO_TASK;
+      }
+    if (GNUNET_SCHEDULER_NO_TASK != conn_task)
+      {
+       GNUNET_SCHEDULER_cancel (conn_task);
+       conn_task = GNUNET_SCHEDULER_NO_TASK;
+      }
 }
 /*}}}*/
 
@@ -733,8 +747,8 @@
     GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_MAPPINGg",
                                            &max_mappings);
     udp_connections = GNUNET_CONTAINER_multihashmap_create(65536);
-    GNUNET_SCHEDULER_TaskIdentifier conn_task = GNUNET_SCHEDULER_add_now 
(connect_to_service_dns, NULL);
-    GNUNET_SCHEDULER_add_after (conn_task, start_helper_and_schedule, NULL);
+    conn_task = GNUNET_SCHEDULER_add_now (connect_to_service_dns, NULL);
+    shs_task = GNUNET_SCHEDULER_add_after (conn_task, 
start_helper_and_schedule, NULL);
     GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
 }