diff options
author | Philipp Tölke <toelke@in.tum.de> | 2010-08-03 18:59:20 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2010-08-03 18:59:20 +0000 |
commit | 4fbc8730101e3e49c09bba7acdac3a46ebd59632 (patch) | |
tree | 0e7ca54fb4a19efcddc869cf2554fe2bf43f7688 /src | |
parent | 1da6888188fb9f1db06151240c2aa4b2a6c4c18b (diff) | |
download | gnunet-4fbc8730101e3e49c09bba7acdac3a46ebd59632.tar.gz gnunet-4fbc8730101e3e49c09bba7acdac3a46ebd59632.zip |
fixed the #includes
Diffstat (limited to 'src')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn.c | 1 | ||||
-rw-r--r-- | src/vpn/gnunet-helper-hijack-dns.c | 14 | ||||
-rw-r--r-- | src/vpn/gnunet-helper-vpn.c | 20 |
3 files changed, 4 insertions, 31 deletions
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 983335a10..aefdad6ca 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include "gnunet_common.h" | 33 | #include "gnunet_common.h" |
34 | #include "gnunet_protocols.h" | 34 | #include "gnunet_protocols.h" |
35 | #include "gnunet_server_lib.h" | 35 | #include "gnunet_server_lib.h" |
36 | /* #include "gnunet_template_service.h" */ | ||
37 | 36 | ||
38 | /** | 37 | /** |
39 | * Final status code. | 38 | * Final status code. |
diff --git a/src/vpn/gnunet-helper-hijack-dns.c b/src/vpn/gnunet-helper-hijack-dns.c index 7add2cc3e..671223851 100644 --- a/src/vpn/gnunet-helper-hijack-dns.c +++ b/src/vpn/gnunet-helper-hijack-dns.c | |||
@@ -23,19 +23,9 @@ | |||
23 | * @brief | 23 | * @brief |
24 | * @author Philipp Tölke | 24 | * @author Philipp Tölke |
25 | */ | 25 | */ |
26 | #define _GNU_SOURCE | 26 | #include <platform.h> |
27 | 27 | ||
28 | #include <arpa/inet.h> | 28 | #include "gnunet_common.h" |
29 | |||
30 | #include <string.h> | ||
31 | #include <sys/types.h> | ||
32 | #include <sys/wait.h> | ||
33 | #include <sys/stat.h> | ||
34 | |||
35 | #include <stdlib.h> | ||
36 | #include <stdio.h> | ||
37 | #include <unistd.h> | ||
38 | #include <gnunet_common.h> | ||
39 | 29 | ||
40 | int fork_and_exec(char* file, char* cmd[]) { | 30 | int fork_and_exec(char* file, char* cmd[]) { |
41 | pid_t pid = fork(); | 31 | pid_t pid = fork(); |
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index 6a6aaf9dc..00ac1b0ec 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c | |||
@@ -23,23 +23,7 @@ | |||
23 | * @brief | 23 | * @brief |
24 | * @author Philipp Tölke | 24 | * @author Philipp Tölke |
25 | */ | 25 | */ |
26 | #define _GNU_SOURCE | 26 | #include <platform.h> |
27 | #include <arpa/inet.h> | ||
28 | #include <linux/if.h> | ||
29 | #include <unistd.h> | ||
30 | #include <stdlib.h> | ||
31 | #include <fcntl.h> | ||
32 | |||
33 | #include <sys/types.h> | ||
34 | #include <sys/socket.h> | ||
35 | #include <sys/ioctl.h> | ||
36 | |||
37 | #include <string.h> | ||
38 | |||
39 | #include <signal.h> | ||
40 | |||
41 | #include <stdio.h> | ||
42 | #include <unistd.h> | ||
43 | 27 | ||
44 | #include "gnunet-vpn-tun.h" | 28 | #include "gnunet-vpn-tun.h" |
45 | #include "gnunet_common.h" | 29 | #include "gnunet_common.h" |
@@ -53,7 +37,7 @@ | |||
53 | 37 | ||
54 | struct in6_ifreq { | 38 | struct in6_ifreq { |
55 | struct in6_addr ifr6_addr; | 39 | struct in6_addr ifr6_addr; |
56 | __u32 ifr6_prefixlen; | 40 | uint32_t ifr6_prefixlen; |
57 | unsigned int ifr6_ifindex; | 41 | unsigned int ifr6_ifindex; |
58 | }; | 42 | }; |
59 | 43 | ||