projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-more libexec fixes for OpenSUSE
[oweals/gnunet.git]
/
src
/
util
/
test_service.c
diff --git
a/src/util/test_service.c
b/src/util/test_service.c
index f64503ea54f80d316cf88a3fa7af7212d649046a..be49d18775bdab993c6d063b939b037578858397 100644
(file)
--- a/
src/util/test_service.c
+++ b/
src/util/test_service.c
@@
-31,8
+31,6
@@
#include "gnunet_time_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_NO
-
#define PORT 12435
#define MY_TYPE 256
#define PORT 12435
#define MY_TYPE 256
@@
-59,6
+57,10
@@
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_SERVICE_stop (sctx);
sctx = NULL;
}
GNUNET_SERVICE_stop (sctx);
sctx = NULL;
}
+ else
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ }
}
}
@@
-70,6
+72,7
@@
build_msg (void *cls, size_t size, void *buf)
if (size < sizeof (struct GNUNET_MessageHeader))
{
/* timeout */
if (size < sizeof (struct GNUNET_MessageHeader))
{
/* timeout */
+ GNUNET_break (0);
GNUNET_SCHEDULER_add_now (&do_stop, NULL);
ok = 1;
return 0;
GNUNET_SCHEDULER_add_now (&do_stop, NULL);
ok = 1;
return 0;
@@
-143,17
+146,11
@@
check ()
"test_service",
"-c",
"test_service_data.conf",
"test_service",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n");
GNUNET_assert (GNUNET_OK ==
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting service\n");
GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (
5
, argv, "test_service",
+ GNUNET_SERVICE_run (
3
, argv, "test_service",
GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
GNUNET_assert (0 == ok);
return ok;
GNUNET_SERVICE_OPTION_NONE, &runner, &ok));
GNUNET_assert (0 == ok);
return ok;
@@
-196,17
+193,11
@@
check6 ()
"test_service6",
"-c",
"test_service_data.conf",
"test_service6",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting v6 service\n");
GNUNET_assert (GNUNET_OK ==
NULL
};
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting v6 service\n");
GNUNET_assert (GNUNET_OK ==
- GNUNET_SERVICE_run (
5
, argv, "test_service6",
+ GNUNET_SERVICE_run (
3
, argv, "test_service6",
GNUNET_SERVICE_OPTION_NONE, &runner6,
&ok));
GNUNET_assert (0 == ok);
GNUNET_SERVICE_OPTION_NONE, &runner6,
&ok));
GNUNET_assert (0 == ok);
@@
-236,12
+227,6
@@
check_start_stop ()
"test-service-program",
"-c",
"test_service_data.conf",
"test-service-program",
"-c",
"test_service_data.conf",
- "-L",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
NULL
};
const struct GNUNET_GETOPT_CommandLineOption options[] = {
NULL
};
const struct GNUNET_GETOPT_CommandLineOption options[] = {
@@
-250,9
+235,9
@@
check_start_stop ()
int ret = 1;
GNUNET_assert (GNUNET_OK ==
int ret = 1;
GNUNET_assert (GNUNET_OK ==
- GNUNET_PROGRAM_run (
5
, argv, "test-service-program", "no help",
+ GNUNET_PROGRAM_run (
3
, argv, "test-service-program", "no help",
options, &start_stop_main, &ret));
options, &start_stop_main, &ret));
-
+
GNUNET_break (0 == ret);
return ret;
}
GNUNET_break (0 == ret);
return ret;
}
@@
-265,15
+250,10
@@
main (int argc, char *argv[])
struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
struct GNUNET_NETWORK_Handle *s = NULL;
GNUNET_log_setup ("test-service",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
ret += check ();
ret += check ();
NULL);
ret += check ();
ret += check ();
-
// FIXME
#ifndef MINGW
s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
// FIXME
#ifndef MINGW
s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
@@
-296,7
+276,6
@@
main (int argc, char *argv[])
ret += check6 ();
}
ret += check_start_stop ();
ret += check6 ();
}
ret += check_start_stop ();
-
return ret;
}
return ret;
}