fix mem-leaks and other nasty stuff

diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 32bbb4cdb018790aeb8937df0c8872db5313dcd5..fa5b1058fe34d517b4813f7e78909689aa348ae4 100644 (file)
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -470,8 +470,8 @@ run (void *cls,
     restart_hijack = 0;
     hashmap = GNUNET_CONTAINER_multihashmap_create(65536);
     udp_connections = GNUNET_CONTAINER_multihashmap_create(65536);
-    GNUNET_SCHEDULER_add_now (connect_to_service_dns, NULL);
-    GNUNET_SCHEDULER_add_now (start_helper_and_schedule, NULL);
+    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);
     GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
 }
 

diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 66c072c37a9db25495b2c414acf66e9668546269..ab13f1ef8b837e81910c4e1732f0b43b06d65bf8 100644 (file)
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -102,51 +102,60 @@ struct receive_dht_cls {
  * Hijack all outgoing DNS-Traffic but for traffic leaving "our" port.
  */
 static void
-hijack(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tc) {
-    char port_s[6];
-    char* virt_dns;
-
-    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "vpn", "VIRTDNS", &virt_dns))
-      {
-       GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "No entry 'VIRTDNS' in configuration!\n");
-       exit(1);
-      }
+hijack (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  char port_s[6];
+  char *virt_dns;
+  struct GNUNET_OS_Process *proc;
+
+  if (GNUNET_SYSERR ==
+      GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "VIRTDNS",
+                                             &virt_dns))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "No entry 'VIRTDNS' in configuration!\n");
+      exit (1);
+    }
 
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Hijacking, port is %d\n", dnsoutport);
-    snprintf(port_s, 6, "%d", dnsoutport);
-    GNUNET_OS_process_close (GNUNET_OS_start_process(NULL,
-                                                    NULL,
-                                                    "gnunet-helper-hijack-dns",
-                                                    "gnunet-hijack-dns",
-                                                    port_s,
-                                                     virt_dns,
-                                                    NULL));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hijacking, port is %d\n", dnsoutport);
+  snprintf (port_s, 6, "%d", dnsoutport);
+  if (NULL != (proc = GNUNET_OS_start_process (NULL,
+                                               NULL,
+                                               "gnunet-helper-hijack-dns",
+                                               "gnunet-hijack-dns",
+                                               port_s, virt_dns, NULL)))
+    GNUNET_OS_process_close (proc);
+  GNUNET_free (virt_dns);
 }
 
 /**
  * Delete the hijacking-routes
  */
 static void
-unhijack(unsigned short port) {
-    char port_s[6];
-    char* virt_dns;
-
-    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "vpn", "VIRTDNS", &virt_dns))
-      {
-       GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "No entry 'VIRTDNS' in configuration!\n");
-       exit(1);
-      }
+unhijack (unsigned short port)
+{
+  char port_s[6];
+  char *virt_dns;
+  struct GNUNET_OS_Process *proc;
+
+  if (GNUNET_SYSERR ==
+      GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "VIRTDNS",
+                                             &virt_dns))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "No entry 'VIRTDNS' in configuration!\n");
+      exit (1);
+    }
 
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "unHijacking, port is %d\n", port);
-    snprintf(port_s, 6, "%d", port);
-    GNUNET_OS_start_process(NULL,
-                           NULL,
-                           "gnunet-helper-hijack-dns",
-                           "gnunet-hijack-dns",
-                           "-d",
-                           port_s,
-                            virt_dns,
-                           NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "unHijacking, port is %d\n", port);
+  snprintf (port_s, 6, "%d", port);
+  if (NULL != (proc = GNUNET_OS_start_process (NULL,
+                                               NULL,
+                                               "gnunet-helper-hijack-dns",
+                                               "gnunet-hijack-dns",
+                                               "-d", port_s, virt_dns, NULL)))
+    GNUNET_OS_process_close (proc);
+  GNUNET_free (virt_dns);
 }
 
 /**