aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_service.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/test_service.c')
-rw-r--r--src/util/test_service.c37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 9bd58352b..daafa6cd3 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -76,8 +76,7 @@ ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
76} 76}
77 77
78static void 78static void
79do_stop (void *cls, 79do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
80 const struct GNUNET_SCHEDULER_TaskContext *tc)
81{ 80{
82 GNUNET_SERVICE_stop (sctx); 81 GNUNET_SERVICE_stop (sctx);
83} 82}
@@ -143,8 +142,7 @@ check ()
143 GNUNET_SERVICE_run (5, 142 GNUNET_SERVICE_run (5,
144 argv, 143 argv,
145 "test_service", 144 "test_service",
146 GNUNET_SERVICE_OPTION_NONE, 145 GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
147 &runner, &ok));
148 GNUNET_assert (0 == ok); 146 GNUNET_assert (0 == ok);
149 return ok; 147 return ok;
150} 148}
@@ -217,8 +215,8 @@ start_stop_main (void *cls,
217 const struct GNUNET_CONFIGURATION_Handle *cfg) 215 const struct GNUNET_CONFIGURATION_Handle *cfg)
218{ 216{
219 int *ret = cls; 217 int *ret = cls;
220 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 218
221 "Starting service using start method\n"); 219 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service using start method\n");
222 sctx = GNUNET_SERVICE_start ("test_service", cfg); 220 sctx = GNUNET_SERVICE_start ("test_service", cfg);
223 GNUNET_assert (NULL != sctx); 221 GNUNET_assert (NULL != sctx);
224 runner (cls, GNUNET_SERVICE_get_server (sctx), cfg); 222 runner (cls, GNUNET_SERVICE_get_server (sctx), cfg);
@@ -245,6 +243,7 @@ check_start_stop ()
245 GNUNET_GETOPT_OPTION_END 243 GNUNET_GETOPT_OPTION_END
246 }; 244 };
247 int ret = 1; 245 int ret = 1;
246
248 GNUNET_assert (GNUNET_OK == 247 GNUNET_assert (GNUNET_OK ==
249 GNUNET_PROGRAM_run (5, 248 GNUNET_PROGRAM_run (5,
250 argv, 249 argv,
@@ -278,22 +277,22 @@ main (int argc, char *argv[])
278 s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0); 277 s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
279#endif 278#endif
280 if (NULL == s) 279 if (NULL == s)
280 {
281 if ((errno == ENOBUFS) ||
282 (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES))
281 { 283 {
282 if ((errno == ENOBUFS) || 284 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
283 (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES)) 285 return 1;
284 {
285 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
286 return 1;
287 }
288 fprintf (stderr,
289 "IPv6 support seems to not be available (%s), not testing it!\n",
290 strerror (errno));
291 } 286 }
287 fprintf (stderr,
288 "IPv6 support seems to not be available (%s), not testing it!\n",
289 strerror (errno));
290 }
292 else 291 else
293 { 292 {
294 GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s)); 293 GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
295 ret += check6 (); 294 ret += check6 ();
296 } 295 }
297 ret += check_start_stop (); 296 ret += check_start_stop ();
298 297
299 return ret; 298 return ret;