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

[gnunet]

Author: toelke
Date: 2010-08-03 20:59:20 +0200 (Tue, 03 Aug 2010)
New Revision: 12455

Modified:
   gnunet/src/vpn/gnunet-daemon-vpn.c
   gnunet/src/vpn/gnunet-helper-hijack-dns.c
   gnunet/src/vpn/gnunet-helper-vpn.c
Log:
fixed the #includes

Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c  2010-08-03 18:59:14 UTC (rev 12454)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c  2010-08-03 18:59:20 UTC (rev 12455)
@@ -33,7 +33,6 @@
 #include "gnunet_common.h"
 #include "gnunet_protocols.h"
 #include "gnunet_server_lib.h"
-/* #include "gnunet_template_service.h" */
 
 /**
  * Final status code.

Modified: gnunet/src/vpn/gnunet-helper-hijack-dns.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-hijack-dns.c   2010-08-03 18:59:14 UTC (rev 
12454)
+++ gnunet/src/vpn/gnunet-helper-hijack-dns.c   2010-08-03 18:59:20 UTC (rev 
12455)
@@ -23,20 +23,10 @@
  * @brief
  * @author Philipp Tölke
  */
-#define _GNU_SOURCE
+#include <platform.h>
 
-#include <arpa/inet.h>
+#include "gnunet_common.h"
 
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <gnunet_common.h>
-
 int fork_and_exec(char* file, char* cmd[]) {
        pid_t pid = fork();
        if (pid < 0) {

Modified: gnunet/src/vpn/gnunet-helper-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-vpn.c  2010-08-03 18:59:14 UTC (rev 12454)
+++ gnunet/src/vpn/gnunet-helper-vpn.c  2010-08-03 18:59:20 UTC (rev 12455)
@@ -23,24 +23,8 @@
  * @brief
  * @author Philipp Tölke
  */
-#define _GNU_SOURCE
-#include <arpa/inet.h>
-#include <linux/if.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
+#include <platform.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <string.h>
-
-#include <signal.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
 #include "gnunet-vpn-tun.h"
 #include "gnunet_common.h"
 #include "gnunet_protocols.h"
@@ -53,7 +37,7 @@
 
 struct in6_ifreq {
     struct in6_addr ifr6_addr;
-    __u32 ifr6_prefixlen;
+    uint32_t ifr6_prefixlen;
     unsigned int ifr6_ifindex;
 };