diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-dns.c | 7 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-dns.h | 12 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-helper.c | 2 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-helper.h | 2 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn.c | 4 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn.h | 6 |
6 files changed, 23 insertions, 10 deletions
diff --git a/src/vpn/gnunet-daemon-vpn-dns.c b/src/vpn/gnunet-daemon-vpn-dns.c index 0149f3323..7d0b38d8c 100644 --- a/src/vpn/gnunet-daemon-vpn-dns.c +++ b/src/vpn/gnunet-daemon-vpn-dns.c | |||
@@ -39,6 +39,13 @@ | |||
39 | #include "gnunet-service-dns-p.h" | 39 | #include "gnunet-service-dns-p.h" |
40 | #include "gnunet-vpn-packet.h" | 40 | #include "gnunet-vpn-packet.h" |
41 | 41 | ||
42 | struct query_packet_list *head; | ||
43 | struct query_packet_list *tail; | ||
44 | struct GNUNET_CLIENT_Connection *dns_connection; | ||
45 | unsigned char restart_hijack; | ||
46 | struct answer_packet_list *answer_proc_head; | ||
47 | struct answer_packet_list *answer_proc_tail; | ||
48 | |||
42 | /** | 49 | /** |
43 | * Callback called by notify_transmit_ready; sends dns-queries or rehijack-messages | 50 | * Callback called by notify_transmit_ready; sends dns-queries or rehijack-messages |
44 | * to the service-dns | 51 | * to the service-dns |
diff --git a/src/vpn/gnunet-daemon-vpn-dns.h b/src/vpn/gnunet-daemon-vpn-dns.h index f72a29ad1..d27599e48 100644 --- a/src/vpn/gnunet-daemon-vpn-dns.h +++ b/src/vpn/gnunet-daemon-vpn-dns.h | |||
@@ -29,12 +29,12 @@ | |||
29 | /** | 29 | /** |
30 | * a list of outgoing dns-query-packets | 30 | * a list of outgoing dns-query-packets |
31 | */ | 31 | */ |
32 | struct query_packet_list *head; | 32 | extern struct query_packet_list *head; |
33 | 33 | ||
34 | /** | 34 | /** |
35 | * The last element of the list of outgoing dns-query-packets | 35 | * The last element of the list of outgoing dns-query-packets |
36 | */ | 36 | */ |
37 | struct query_packet_list *tail; | 37 | extern struct query_packet_list *tail; |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * Callback called by notify_transmit_ready; sends dns-queries or rehijack-messages | 40 | * Callback called by notify_transmit_ready; sends dns-queries or rehijack-messages |
@@ -57,7 +57,7 @@ void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg); | |||
57 | /** | 57 | /** |
58 | * The connection to the service-dns | 58 | * The connection to the service-dns |
59 | */ | 59 | */ |
60 | struct GNUNET_CLIENT_Connection *dns_connection; | 60 | extern struct GNUNET_CLIENT_Connection *dns_connection; |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * A flag to show that the service-dns has to rehijack the outbound dns-packets | 63 | * A flag to show that the service-dns has to rehijack the outbound dns-packets |
@@ -65,7 +65,7 @@ struct GNUNET_CLIENT_Connection *dns_connection; | |||
65 | * This gets set when the helper restarts as the routing-tables are flushed when | 65 | * This gets set when the helper restarts as the routing-tables are flushed when |
66 | * the interface vanishes. | 66 | * the interface vanishes. |
67 | */ | 67 | */ |
68 | unsigned char restart_hijack; | 68 | extern unsigned char restart_hijack; |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * A list of processed dns-responses. | 71 | * A list of processed dns-responses. |
@@ -73,11 +73,11 @@ unsigned char restart_hijack; | |||
73 | * "processed" means that the packet is complete and can be sent out via udp | 73 | * "processed" means that the packet is complete and can be sent out via udp |
74 | * directly | 74 | * directly |
75 | */ | 75 | */ |
76 | struct answer_packet_list *answer_proc_head; | 76 | extern struct answer_packet_list *answer_proc_head; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * The last element of the list of processed dns-responses. | 79 | * The last element of the list of processed dns-responses. |
80 | */ | 80 | */ |
81 | struct answer_packet_list *answer_proc_tail; | 81 | extern struct answer_packet_list *answer_proc_tail; |
82 | 82 | ||
83 | #endif /* end of include guard: GNUNET-DAEMON-VPN-DNS_H */ | 83 | #endif /* end of include guard: GNUNET-DAEMON-VPN-DNS_H */ |
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c index 4af04e6cd..a27060014 100644 --- a/src/vpn/gnunet-daemon-vpn-helper.c +++ b/src/vpn/gnunet-daemon-vpn-helper.c | |||
@@ -40,6 +40,8 @@ | |||
40 | #include "gnunet-service-dns-p.h" | 40 | #include "gnunet-service-dns-p.h" |
41 | #include "gnunet-vpn-packet.h" | 41 | #include "gnunet-vpn-packet.h" |
42 | 42 | ||
43 | struct GNUNET_VPN_HELPER_Handle *helper_handle; | ||
44 | |||
43 | /** | 45 | /** |
44 | * Start the helper-process | 46 | * Start the helper-process |
45 | * | 47 | * |
diff --git a/src/vpn/gnunet-daemon-vpn-helper.h b/src/vpn/gnunet-daemon-vpn-helper.h index 17d775b86..093343742 100644 --- a/src/vpn/gnunet-daemon-vpn-helper.h +++ b/src/vpn/gnunet-daemon-vpn-helper.h | |||
@@ -31,7 +31,7 @@ | |||
31 | /** | 31 | /** |
32 | * Handle to the helper. contains filedescriptors and such | 32 | * Handle to the helper. contains filedescriptors and such |
33 | */ | 33 | */ |
34 | struct GNUNET_VPN_HELPER_Handle *helper_handle; | 34 | extern struct GNUNET_VPN_HELPER_Handle *helper_handle; |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * Start the helper-process | 37 | * Start the helper-process |
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 0c3c137fa..32660047d 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c | |||
@@ -40,6 +40,10 @@ | |||
40 | 40 | ||
41 | #include "gnunet-daemon-vpn.h" | 41 | #include "gnunet-daemon-vpn.h" |
42 | 42 | ||
43 | const struct GNUNET_CONFIGURATION_Handle *cfg; | ||
44 | struct GNUNET_MESH_Handle *mesh_handle; | ||
45 | struct GNUNET_CONTAINER_MultiHashMap* hashmap; | ||
46 | |||
43 | /** | 47 | /** |
44 | * Final status code. | 48 | * Final status code. |
45 | */ | 49 | */ |
diff --git a/src/vpn/gnunet-daemon-vpn.h b/src/vpn/gnunet-daemon-vpn.h index 382ac9a72..b9d6a65ed 100644 --- a/src/vpn/gnunet-daemon-vpn.h +++ b/src/vpn/gnunet-daemon-vpn.h | |||
@@ -62,17 +62,17 @@ send_udp_to_peer (void *cls, | |||
62 | /** | 62 | /** |
63 | * The configuration to use | 63 | * The configuration to use |
64 | */ | 64 | */ |
65 | const struct GNUNET_CONFIGURATION_Handle *cfg; | 65 | extern const struct GNUNET_CONFIGURATION_Handle *cfg; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * The handle to mesh | 68 | * The handle to mesh |
69 | */ | 69 | */ |
70 | struct GNUNET_MESH_Handle *mesh_handle; | 70 | extern struct GNUNET_MESH_Handle *mesh_handle; |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * The hashmap containing the mappings from ipv6-addresses to gnunet-descriptors | 73 | * The hashmap containing the mappings from ipv6-addresses to gnunet-descriptors |
74 | */ | 74 | */ |
75 | struct GNUNET_CONTAINER_MultiHashMap* hashmap; | 75 | extern struct GNUNET_CONTAINER_MultiHashMap* hashmap; |
76 | 76 | ||
77 | struct map_entry { | 77 | struct map_entry { |
78 | struct GNUNET_vpn_service_descriptor desc; | 78 | struct GNUNET_vpn_service_descriptor desc; |