-merging gnunet-daemon-vpn.h into gnunet-daemon-vpn.c

3 files changed, 66 insertions, 131 deletions

diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 38b37dd65..1fb1dd3f6 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -33,7 +33,7 @@ gnunet_helper_vpn_SOURCES = \
  gnunet-helper-vpn.c
 
 gnunet_daemon_vpn_SOURCES = \
- gnunet-daemon-vpn.c gnunet-daemon-vpn.h 
+ gnunet-daemon-vpn.c 
 gnunet_daemon_vpn_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 919614ae7..c9463184c 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -36,7 +36,6 @@
 #include "gnunet_constants.h"
 #include <block_dns.h>
 #include "gnunet_dns_service.h"
-#include "gnunet-daemon-vpn.h"
 
 
 const struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -60,6 +59,71 @@ struct answer_packet_list *answer_proc_head;
 
 struct answer_packet_list *answer_proc_tail;
 
+struct answer_packet_list
+{
+  struct answer_packet_list *next GNUNET_PACKED;
+  struct answer_packet_list *prev GNUNET_PACKED;
+  struct GNUNET_SERVER_Client *client;
+  struct answer_packet pkt;
+};
+
+
+void
+send_icmp6_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+send_icmp4_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+size_t
+send_udp_service (void *cls, size_t size, void *buf);
+
+GNUNET_HashCode *
+address6_mapping_exists (struct in6_addr *v6addr);
+GNUNET_HashCode *
+address4_mapping_exists (uint32_t addr);
+
+unsigned int
+port_in_ports (uint64_t ports, uint16_t port);
+
+void
+send_pkt_to_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
+                  const struct GNUNET_ATS_Information *atsi);
+
+struct map_entry
+{
+    /** The description of the service (used for service) */
+  struct GNUNET_vpn_service_descriptor desc;
+
+    /** The real address of the service (used for remote) */
+  char addrlen;
+  char addr[16];
+
+  struct GNUNET_MESH_Tunnel *tunnel;
+  uint16_t namelen;
+  char additional_ports[8192];
+
+  struct GNUNET_CONTAINER_HeapNode *heap_node;
+  GNUNET_HashCode hash;
+    /**
+     * After this struct the name is located in DNS-Format!
+     */
+};
+
+
+struct remote_addr
+{
+  char addrlen;
+  unsigned char addr[16];
+  char proto;
+};
+
+struct tunnel_state
+{
+  struct GNUNET_MESH_TransmitHandle *th;
+  struct tunnel_notify_queue *head, *tail;
+
+  int addrlen;
+};
+
 
 struct tunnel_notify_queue
 {
diff --git a/src/vpn/gnunet-daemon-vpn.h b/src/vpn/gnunet-daemon-vpn.h
deleted file mode 100644
index e4c259ec4..000000000
--- a/src/vpn/gnunet-daemon-vpn.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2010 Christian Grothoff
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file vpn/gnunet-daemon-vpn.h
- * @brief
- * @author Philipp Toelke
- */
-#ifndef GNUNET_DAEMON_VPN_H
-#define GNUNET_DAEMON_VPN_H
-
-#include "gnunet_dns_service.h"
-
-struct answer_packet_list
-{
-  struct answer_packet_list *next GNUNET_PACKED;
-  struct answer_packet_list *prev GNUNET_PACKED;
-  struct GNUNET_SERVER_Client *client;
-  struct answer_packet pkt;
-};
-
-
-
-extern struct answer_packet_list *answer_proc_head;
-
-extern struct answer_packet_list *answer_proc_tail;
-
-extern struct GNUNET_DNS_Handle *dns_handle;
-
-
-void
-send_icmp6_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-void
-send_icmp4_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-size_t
-send_udp_service (void *cls, size_t size, void *buf);
-
-GNUNET_HashCode *
-address6_mapping_exists (struct in6_addr *v6addr);
-GNUNET_HashCode *
-address4_mapping_exists (uint32_t addr);
-
-unsigned int
-port_in_ports (uint64_t ports, uint16_t port);
-
-void
-send_pkt_to_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
-                  const struct GNUNET_ATS_Information *atsi);
-
-/**
- * The configuration to use
- */
-extern const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * The handle to mesh
- */
-extern struct GNUNET_MESH_Handle *mesh_handle;
-
-/**
- * The hashmap containing the mappings from ipv6-addresses to gnunet-descriptors
- */
-extern struct GNUNET_CONTAINER_MultiHashMap *hashmap;
-
-struct map_entry
-{
-    /** The description of the service (used for service) */
-  struct GNUNET_vpn_service_descriptor desc;
-
-    /** The real address of the service (used for remote) */
-  char addrlen;
-  char addr[16];
-
-  struct GNUNET_MESH_Tunnel *tunnel;
-  uint16_t namelen;
-  char additional_ports[8192];
-
-  struct GNUNET_CONTAINER_HeapNode *heap_node;
-  GNUNET_HashCode hash;
-    /**
-     * After this struct the name is located in DNS-Format!
-     */
-};
-
-/**
- * Checks if a bit is active in the bitArray
- *
- * @param bitArray memory area to set the bit in
- * @param bitIdx which bit to test
- * @return GNUNET_YES if the bit is set, GNUNET_NO if not.
- */
-int
-testBit (char *bitArray, unsigned int bitIdx);
-
-
-struct remote_addr
-{
-  char addrlen;
-  unsigned char addr[16];
-  char proto;
-};
-
-struct tunnel_state
-{
-  struct GNUNET_MESH_TransmitHandle *th;
-  struct tunnel_notify_queue *head, *tail;
-
-  int addrlen;
-};
-
-#endif /* end of include guard: GNUNET-DAEMON-VPN_H */