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

[gnunet]

Author: toelke
Date: 2010-08-24 10:26:20 +0200 (Tue, 24 Aug 2010)
New Revision: 12725

Modified:
   gnunet/src/vpn/gnunet-service-dns.c
Log:
Hijacking the DNS should work now.

Modified: gnunet/src/vpn/gnunet-service-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-service-dns.c 2010-08-24 08:11:29 UTC (rev 12724)
+++ gnunet/src/vpn/gnunet-service-dns.c 2010-08-24 08:26:20 UTC (rev 12725)
@@ -37,14 +37,14 @@
 };
 
 void hijack(unsigned short port) {
-       char* port_s = "12345";
+       char port_s[5];
 
        snprintf(port_s, 6, "%d", port);
        GNUNET_OS_start_process(NULL, NULL, "gnunet-helper-hijack-dns", 
"gnunet-hijack-dns", port_s, NULL);
 }
 
 void unhijack(unsigned short port) {
-       char* port_s = "12345";
+       char port_s[5];
 
        snprintf(port_s, 6, "%d", port);
        GNUNET_OS_start_process(NULL, NULL, "gnunet-helper-hijack-dns", 
"gnunet-hijack-dns", "-d", port_s, NULL);
@@ -79,8 +79,6 @@
     {NULL, NULL, 0, 0}
   };
 
-       fprintf(stderr, "%x\n", cls);
-
   struct dns_cls* mycls = (struct dns_cls*)cls;
 
   mycls->sched = sched;
@@ -90,7 +88,7 @@
   struct sockaddr_in * addr = alloca(sizeof(struct sockaddr_in));
   memset(addr, 0, sizeof(struct sockaddr_in));
 
-  int err = GNUNET_NETWORK_socket_bind (mycls->dnsout, addr, sizeof(struct 
sockaddr_in));
+  int err = GNUNET_NETWORK_socket_bind (mycls->dnsout, (struct sockaddr*)addr, 
sizeof(struct sockaddr_in));
   err = getsockname(GNUNET_NETWORK_get_fd(mycls->dnsout), addr, (unsigned 
int[]){sizeof(struct sockaddr_in)});
 
   mycls->dnsoutport = htons(addr->sin_port);
@@ -101,7 +99,7 @@
   GNUNET_SCHEDULER_add_delayed (sched,
                  GNUNET_TIME_UNIT_FOREVER_REL,
                  &cleanup_task,
-                 NULL);
+                 cls);
 }
 
 /**
@@ -116,8 +114,6 @@
 {
   struct dns_cls* cls = GNUNET_malloc(sizeof(struct dns_cls));
 
-  fprintf(stderr, "%x\n", cls);
-
   return (GNUNET_OK ==
           GNUNET_SERVICE_run (argc,
                               argv,