aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-06-10 01:07:49 +0000
committerChristian Grothoff <christian@grothoff.org>2012-06-10 01:07:49 +0000
commit5ab33d2f38aa43fd772e33e70fb709e6c91b1d8a (patch)
tree6d0b3f4138d98445910e5b6e47dfa0e44eb90408
parenta22640773028063ac43c64ad38e786aaf766ba3e (diff)
downloadgnunet-5ab33d2f38aa43fd772e33e70fb709e6c91b1d8a.tar.gz
gnunet-5ab33d2f38aa43fd772e33e70fb709e6c91b1d8a.zip
-moving defines to top
-rw-r--r--src/testing/testing.c33
1 files changed, 15 insertions, 18 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c
index eb87b3764..fdd198b6a 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -36,12 +36,26 @@
36#define LOG(kind,...) \ 36#define LOG(kind,...) \
37 GNUNET_log_from (kind, "gnunettestingnew", __VA_ARGS__) 37 GNUNET_log_from (kind, "gnunettestingnew", __VA_ARGS__)
38 38
39
40/** 39/**
41 * Size of a hostkey when written to a file 40 * Size of a hostkey when written to a file
42 */ 41 */
43#define HOSTKEYFILESIZE 914 42#define HOSTKEYFILESIZE 914
44 43
44/**
45 * Lowest port used for GNUnet testing. Should be high enough to not
46 * conflict with other applications running on the hosts but be low
47 * enough to not conflict with client-ports (typically starting around
48 * 32k).
49 */
50#define LOW_PORT 12000
51
52/**
53 * Highest port used for GNUnet testing. Should be low enough to not
54 * conflict with the port range for "local" ports (client apps; see
55 * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
56 */
57#define HIGH_PORT 56000
58
45 59
46/** 60/**
47 * Handle for a system on which GNUnet peers are executed; 61 * Handle for a system on which GNUnet peers are executed;
@@ -142,23 +156,6 @@ struct GNUNET_TESTING_Peer
142 156
143 157
144/** 158/**
145 * Lowest port used for GNUnet testing. Should be high enough to not
146 * conflict with other applications running on the hosts but be low
147 * enough to not conflict with client-ports (typically starting around
148 * 32k).
149 */
150#define LOW_PORT 12000
151
152
153/**
154 * Highest port used for GNUnet testing. Should be low enough to not
155 * conflict with the port range for "local" ports (client apps; see
156 * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
157 */
158#define HIGH_PORT 56000
159
160
161/**
162 * Testing includes a number of pre-created hostkeys for faster peer 159 * Testing includes a number of pre-created hostkeys for faster peer
163 * startup. This function loads such keys into memory from a file. 160 * startup. This function loads such keys into memory from a file.
164 * 161 *