event: put stop flag to bevent instead of return value

include/baresip.h

@@ -886,7 +886,7 @@ enum answer_method {
 /** Defines the User-Agent event handler */
 typedef void (ua_event_h)(struct ua *ua, enum ua_event ev,
 			  struct call *call, const char *prm, void *arg);
-typedef bool (bevent_h)(struct bevent *event, void *arg);
+typedef void (bevent_h)(struct bevent *event, void *arg);
 typedef void (options_resp_h)(int err, const struct sip_msg *msg, void *arg);
 typedef void (refer_resp_h)(int err, const struct sip_msg *msg, void *arg);
 

modules/menu/menu.c

@@ -652,7 +652,7 @@ static void process_module_event(struct call *call, const char *prm)
 }
 
 
-static bool event_handler(struct bevent *event, void *arg)
+static void event_handler(struct bevent *event, void *arg)
 {
 	struct call *call2 = NULL;
 	int32_t adelay = -1;
@@ -684,11 +684,11 @@ static bool event_handler(struct bevent *event, void *arg)
 	case UA_EVENT_CALL_INCOMING:
 
 		if (call_state(call) != CALL_STATE_INCOMING)
-			return false;
+			return;
 
 		if (account_answermode(acc) == ANSWERMODE_AUTO) {
 			if (!menu_autoanwser_call(call))
-				return false;
+				return;
 		}
 
 		/* the new incoming call should not change the current call */
@@ -902,7 +902,7 @@ static bool event_handler(struct bevent *event, void *arg)
 		break;
 
 	case UA_EVENT_UNREGISTERING:
-		return false;
+		return;
 
 	case UA_EVENT_MWI_NOTIFY:
 		info("----- MWI for %s -----\n", account_aor(acc));
@@ -924,7 +924,6 @@ static bool event_handler(struct bevent *event, void *arg)
 	incall = ev == UA_EVENT_CALL_CLOSED ? count > 1 : count;
 	menu_set_incall(incall);
 	menu_update_callstatus(incall);
-	return false;
 }
 
 

src/event.c

@@ -18,6 +18,7 @@ struct bevent {
 	enum ua_event ev;
 	const char *txt;
 	int err;
+	bool stop;
 	union {
 		struct ua *ua;
 		struct call *call;
@@ -55,7 +56,7 @@ struct ehe {
 static struct list ehel;               /**< Event handlers (struct ehe)     */
 
 
-static bool bevent_emit_base(struct bevent *event);
+static void bevent_emit_base(struct bevent *event);
 
 
 static void ehe_destructor(void *arg)
@@ -624,7 +625,7 @@ void ua_event(struct ua *ua, enum ua_event ev, struct call *call,
 	warning("Used deprecated ua_event() for %s. "
 		"Use one of event_xxx_emit() instead!\n",
 		uag_event_str(ev));
-	struct bevent event = {ev, buf, 0, { 0 } };
+	struct bevent event = {ev, buf, 0, false, { 0 } };
 
 	if (bevent_class(ev) == BEVENT_CLASS_CALL)
 		event.u.call = call;
@@ -680,27 +681,27 @@ void module_event(const char *module, const char *event, struct ua *ua,
 		eh->h(ua, UA_EVENT_MODULE, call, buf, eh->arg);
 	}
 
-	struct bevent bevent = {UA_EVENT_MODULE, buf, 0, { 0 } };
-	(void)bevent_emit_base(&bevent);
+	struct bevent bevent = {UA_EVENT_MODULE, buf, 0, false, { 0 } };
+	bevent_emit_base(&bevent);
 
 out:
 	mem_deref(buf);
 }
 
 
-static bool bevent_emit_base(struct bevent *event)
+static void bevent_emit_base(struct bevent *event)
 {
 	struct le *le;
 	le = ehel.head;
 	while (le) {
 		struct ehe *ehe = le->data;
 		le = le->next;
 
-		if (ehe->h(event, ehe->arg))
-			return true;
-	}
+		ehe->h(event, ehe->arg);
 
-	return false;
+		if (event->stop)
+			return;
+	}
 }
 
 
@@ -720,14 +721,14 @@ static int bevent_emit(struct bevent *event, const char *fmt, va_list ap)
 
 	event->txt = buf;
 	event->err = 0;
-	bool stop = bevent_emit_base(event);
+	bevent_emit_base(event);
 	if (event->err) {
 		err = event->err;
 		goto out;
 	}
 
 	/* backwards compatibility */
-	if (stop)
+	if (event->stop)
 		goto out;
 
 	ua_event_private(ua, event->ev, call, event->txt);

test/call.c

@@ -599,7 +599,7 @@ static void process_rules(struct agent *ag, enum ua_event ev, const char *prm)
 }
 
 
-static bool event_handler(struct bevent *event, void *arg)
+static void event_handler(struct bevent *event, void *arg)
 {
 	struct fixture *f = arg;
 	struct call *call2 = NULL;
@@ -627,7 +627,7 @@ static bool event_handler(struct bevent *event, void *arg)
 	else if (ua == f->c.ua)
 		ag = &f->c;
 	else {
-		return false;
+		return;
 	}
 
 	switch (ev) {
@@ -861,7 +861,7 @@ static bool event_handler(struct bevent *event, void *arg)
 	if (ag->failed && ag->peer->failed) {
 		info("test: re_cancel on call failed\n");
 		re_cancel();
-		return false;
+		return;
 	}
 
 	process_rules(ag, ev, prm);
@@ -872,7 +872,7 @@ static bool event_handler(struct bevent *event, void *arg)
 		fixture_abort(f, err);
 	}
 
-	return false;
+	return;
 }
 
 

test/ua.c

@@ -55,7 +55,7 @@ static void test_abort(struct test *t, int err)
 }
 
 
-static bool event_handler(struct bevent *event, void *arg)
+static void event_handler(struct bevent *event, void *arg)
 {
 	struct test *t = arg;
 	size_t i;
@@ -71,7 +71,7 @@ static bool event_handler(struct bevent *event, void *arg)
 	ASSERT_TRUE(t != NULL);
 
 	if (ua != t->ua)
-		return false;
+		return;
 
 	if (ev == UA_EVENT_REGISTER_OK) {
 
@@ -103,8 +103,6 @@ static bool event_handler(struct bevent *event, void *arg)
 		warning("selftest: event handler error: %m\n", err);
 		t->err = err;
 	}
-
-	return false;
 }