diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-27 19:16:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-27 19:16:54 +0000 |
commit | 30b1be2179042384fa652dda414d80f8c2463b77 (patch) | |
tree | 9a5ccc9842c915ff7323616c4c6c05a39e44ff06 /src | |
parent | 663b3cf348ef49f117906262dbc4aebfb2e34f74 (diff) | |
download | gnunet-30b1be2179042384fa652dda414d80f8c2463b77.tar.gz gnunet-30b1be2179042384fa652dda414d80f8c2463b77.zip |
-fixing testing testcase build issues
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_testing_lib-new.h | 26 | ||||
-rw-r--r-- | src/testing/test_testing_new_portreservation.c | 14 | ||||
-rw-r--r-- | src/testing/testing_new.c | 12 |
3 files changed, 38 insertions, 14 deletions
diff --git a/src/include/gnunet_testing_lib-new.h b/src/include/gnunet_testing_lib-new.h index bf6abfc44..9d8bc364b 100644 --- a/src/include/gnunet_testing_lib-new.h +++ b/src/include/gnunet_testing_lib-new.h | |||
@@ -73,6 +73,7 @@ GNUNET_TESTING_system_create (const char *tmppath, | |||
73 | const char *controller); | 73 | const char *controller); |
74 | 74 | ||
75 | 75 | ||
76 | |||
76 | /** | 77 | /** |
77 | * Free system resources. | 78 | * Free system resources. |
78 | * | 79 | * |
@@ -109,6 +110,31 @@ GNUNET_TESTING_hostkey_get (uint32_t key_number, | |||
109 | struct GNUNET_PeerIdentity *id); | 110 | struct GNUNET_PeerIdentity *id); |
110 | 111 | ||
111 | 112 | ||
113 | /** | ||
114 | * Reserve a TCP or UDP port for a peer. | ||
115 | * | ||
116 | * @param system system to use for reservation tracking | ||
117 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP | ||
118 | * @return 0 if no free port was available | ||
119 | */ | ||
120 | uint16_t | ||
121 | GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, | ||
122 | int is_tcp); | ||
123 | |||
124 | |||
125 | /** | ||
126 | * Release reservation of a TCP or UDP port for a peer | ||
127 | * (used during GNUNET_TESTING_peer_destroy). | ||
128 | * | ||
129 | * @param system system to use for reservation tracking | ||
130 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP | ||
131 | * @param port reserved port to release | ||
132 | */ | ||
133 | void | ||
134 | GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, | ||
135 | int is_tcp, | ||
136 | uint16_t port); | ||
137 | |||
112 | 138 | ||
113 | /** | 139 | /** |
114 | * Create a new configuration using the given configuration | 140 | * Create a new configuration using the given configuration |
diff --git a/src/testing/test_testing_new_portreservation.c b/src/testing/test_testing_new_portreservation.c index c1382df38..012fbecc1 100644 --- a/src/testing/test_testing_new_portreservation.c +++ b/src/testing/test_testing_new_portreservation.c | |||
@@ -47,26 +47,26 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
47 | system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new", | 47 | system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new", |
48 | "localhost"); | 48 | "localhost"); |
49 | GNUNET_assert (NULL != system); | 49 | GNUNET_assert (NULL != system); |
50 | new_port1 = reserve_port (system, GNUNET_YES); | 50 | new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES); |
51 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 51 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
52 | "Reserved TCP port %u\n", new_port1); | 52 | "Reserved TCP port %u\n", new_port1); |
53 | GNUNET_assert (0 != new_port1); | 53 | GNUNET_assert (0 != new_port1); |
54 | new_port2 = reserve_port (system, GNUNET_YES); | 54 | new_port2 = GNUNET_TESTING_reserve_port (system, GNUNET_YES); |
55 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 55 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
56 | "Reserved TCP port %u\n", new_port2); | 56 | "Reserved TCP port %u\n", new_port2); |
57 | GNUNET_assert (0 != new_port2); | 57 | GNUNET_assert (0 != new_port2); |
58 | GNUNET_assert (new_port1 != new_port2); | 58 | GNUNET_assert (new_port1 != new_port2); |
59 | release_port (system, GNUNET_YES, new_port1); | 59 | GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1); |
60 | old_port1 = new_port1; | 60 | old_port1 = new_port1; |
61 | new_port1 = 0; | 61 | new_port1 = 0; |
62 | new_port1 = reserve_port (system, GNUNET_YES); | 62 | new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES); |
63 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 63 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
64 | "Reserved TCP port %u\n", new_port1); | 64 | "Reserved TCP port %u\n", new_port1); |
65 | GNUNET_assert (0 != new_port1); | 65 | GNUNET_assert (0 != new_port1); |
66 | GNUNET_assert (old_port1 == new_port1); | 66 | GNUNET_assert (old_port1 == new_port1); |
67 | release_port (system, GNUNET_YES, new_port1); | 67 | GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1); |
68 | release_port (system, GNUNET_YES, new_port2); | 68 | GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2); |
69 | release_port (system, GNUNET_YES, new_port2 + 1); /* OK to get error :) */ | 69 | GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2 + 1); /* OK to get error :) */ |
70 | GNUNET_TESTING_system_destroy (system, GNUNET_NO); | 70 | GNUNET_TESTING_system_destroy (system, GNUNET_NO); |
71 | } | 71 | } |
72 | 72 | ||
diff --git a/src/testing/testing_new.c b/src/testing/testing_new.c index 79ece3a26..820e91ff9 100644 --- a/src/testing/testing_new.c +++ b/src/testing/testing_new.c | |||
@@ -204,10 +204,9 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, | |||
204 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP | 204 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP |
205 | * @return 0 if no free port was available | 205 | * @return 0 if no free port was available |
206 | */ | 206 | */ |
207 | // static | ||
208 | uint16_t | 207 | uint16_t |
209 | reserve_port (struct GNUNET_TESTING_System *system, | 208 | GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system, |
210 | int is_tcp) | 209 | int is_tcp) |
211 | { | 210 | { |
212 | struct GNUNET_NETWORK_Handle *socket; | 211 | struct GNUNET_NETWORK_Handle *socket; |
213 | struct addrinfo hint; | 212 | struct addrinfo hint; |
@@ -277,11 +276,10 @@ reserve_port (struct GNUNET_TESTING_System *system, | |||
277 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP | 276 | * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP |
278 | * @param port reserved port to release | 277 | * @param port reserved port to release |
279 | */ | 278 | */ |
280 | // static | ||
281 | void | 279 | void |
282 | release_port (struct GNUNET_TESTING_System *system, | 280 | GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system, |
283 | int is_tcp, | 281 | int is_tcp, |
284 | uint16_t port) | 282 | uint16_t port) |
285 | { | 283 | { |
286 | uint32_t *port_buckets; | 284 | uint32_t *port_buckets; |
287 | uint16_t bucket; | 285 | uint16_t bucket; |