fixed the #includes

diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 983335a10d5853fe2232884036d473a1e9a99356..aefdad6ca4bfbcc7a987d03b313453b726ec77b5 100644 (file)
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -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.

diff --git a/src/vpn/gnunet-helper-hijack-dns.c b/src/vpn/gnunet-helper-hijack-dns.c
index 7add2cc3e4c4a577482c6f967654f0c3fc35330f..671223851f4cfe53a48138394b0e6257d046d269 100644 (file)
--- a/src/vpn/gnunet-helper-hijack-dns.c
+++ b/src/vpn/gnunet-helper-hijack-dns.c
@@ -23,19 +23,9 @@
  * @brief
  * @author Philipp Tölke
  */
-#define _GNU_SOURCE
+#include <platform.h>
 
-#include <arpa/inet.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>
+#include "gnunet_common.h"
 
 int fork_and_exec(char* file, char* cmd[]) {
        pid_t pid = fork();

diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index 6a6aaf9dc5bbaf1b82151ddc26704bd2c300965f..00ac1b0eccc363523b942bdd522261fdcc51e392 100644 (file)
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -23,23 +23,7 @@
  * @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 <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <string.h>
-
-#include <signal.h>
-
-#include <stdio.h>
-#include <unistd.h>
+#include <platform.h>
 
 #include "gnunet-vpn-tun.h"
 #include "gnunet_common.h"
@@ -53,7 +37,7 @@
 
 struct in6_ifreq {
     struct in6_addr ifr6_addr;
-    __u32 ifr6_prefixlen;
+    uint32_t ifr6_prefixlen;
     unsigned int ifr6_ifindex;
 };