summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/main.c14
-rw-r--r--test/sip/sipsrv.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/test/main.c b/test/main.c
index eb1530e..955643a 100644
--- a/test/main.c
+++ b/test/main.c
@@ -111,6 +111,13 @@ static const struct test *find_test(const char *name)
}
+static void ua_exit_handler(void *arg)
+{
+ debug("ua exited -- stopping main runloop\n");
+ re_cancel();
+}
+
+
static void usage(void)
{
(void)re_fprintf(stderr,
@@ -175,12 +182,7 @@ int main(int argc, char *argv[])
}
str_ncpy(config->sip.local, "127.0.0.1:0", sizeof(config->sip.local));
-#if 0
- /* XXX: needed for ua tests */
- err = ua_init("test", true, true, true, false);
- if (err)
- goto out;
-#endif
+ uag_set_exit_handler(ua_exit_handler, NULL);
if (argc >= (optind + 1)) {
diff --git a/test/sip/sipsrv.c b/test/sip/sipsrv.c
index 76b4b6f..ce1d562 100644
--- a/test/sip/sipsrv.c
+++ b/test/sip/sipsrv.c
@@ -216,7 +216,7 @@ static bool sip_msg_handler(const struct sip_msg *msg, void *arg)
out:
if (srv->terminate)
- re_cancel();
+ re_cancel(); /* XXX: avoid this */
return true;
}