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

[gnunet]

Author: grothoff
Date: 2012-01-02 11:34:48 +0100 (Mon, 02 Jan 2012)
New Revision: 18934

Modified:
   gnunet/src/vpn/gnunet-daemon-exit.c
Log:
-minor cleanup

Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2012-01-02 10:33:24 UTC (rev 18933)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2012-01-02 10:34:48 UTC (rev 18934)
@@ -34,53 +34,7 @@
 
 #include "gnunet-vpn-packet.h"
 
-/**
- * The handle to the configuration used throughout the process
- */
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-/**
- * The handle to the helper
- */
-static struct GNUNET_HELPER_Handle *helper_handle;
-
-/**
- * Arguments to the exit helper.
- */
-static char *exit_argv[7];
-
-/**
- * Final status code.
- */
-static int ret;
-
-/**
- * The handle to mesh
- */
-static struct GNUNET_MESH_Handle *mesh_handle;
-
-/**
- * This hashmaps contains the mapping from peer, service-descriptor,
- * source-port and destination-port to a struct redirect_state
- */
-static struct GNUNET_CONTAINER_MultiHashMap *udp_connections;
-
-static struct GNUNET_CONTAINER_Heap *udp_connections_heap;
-
-static struct GNUNET_CONTAINER_MultiHashMap *tcp_connections;
-
-static struct GNUNET_CONTAINER_Heap *tcp_connections_heap;
-
-/**
- * If there are at least this many udp-Connections, old ones will be removed
- */
-static long long unsigned int max_udp_connections = 200;
-
-/**
- * If there are at least this many tcp-Connections, old ones will be removed
- */
-static long long unsigned int max_tcp_connections = 200;
-
 struct remote_addr
 {
   char addrlen;
@@ -148,17 +102,6 @@
   struct redirect_info redirect_info;
 };
 
-/**
- * This hashmaps saves interesting things about the configured UDP services
- */
-static struct GNUNET_CONTAINER_MultiHashMap *udp_services;
-
-/**
- * This hashmaps saves interesting things about the configured TCP services
- */
-
-static struct GNUNET_CONTAINER_MultiHashMap *tcp_services;
-
 struct tunnel_notify_queue
 {
   struct tunnel_notify_queue *next;
@@ -176,6 +119,65 @@
 
 
 /**
+ * The handle to the configuration used throughout the process
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * The handle to the helper
+ */
+static struct GNUNET_HELPER_Handle *helper_handle;
+
+/**
+ * Arguments to the exit helper.
+ */
+static char *exit_argv[7];
+
+/**
+ * Final status code.
+ */
+static int ret;
+
+/**
+ * The handle to mesh
+ */
+static struct GNUNET_MESH_Handle *mesh_handle;
+
+/**
+ * This hashmaps contains the mapping from peer, service-descriptor,
+ * source-port and destination-port to a struct redirect_state
+ */
+static struct GNUNET_CONTAINER_MultiHashMap *udp_connections;
+
+static struct GNUNET_CONTAINER_Heap *udp_connections_heap;
+
+static struct GNUNET_CONTAINER_MultiHashMap *tcp_connections;
+
+static struct GNUNET_CONTAINER_Heap *tcp_connections_heap;
+
+/**
+ * If there are at least this many udp-Connections, old ones will be removed
+ */
+static long long unsigned int max_udp_connections = 200;
+
+/**
+ * If there are at least this many tcp-Connections, old ones will be removed
+ */
+static long long unsigned int max_tcp_connections = 200;
+
+/**
+ * This hashmaps saves interesting things about the configured UDP services
+ */
+static struct GNUNET_CONTAINER_MultiHashMap *udp_services;
+
+/**
+ * This hashmaps saves interesting things about the configured TCP services
+ */
+
+static struct GNUNET_CONTAINER_MultiHashMap *tcp_services;
+
+
+/**
  * Function that frees everything from a hashmap
  */
 static int