event: make struct bevent private

cspiel1 · May 3, 2024 · af28d46 · af28d46
1 parent d8cd089
commit af28d46
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/include/baresip.h b/include/baresip.h
@@ -872,17 +872,7 @@ enum ua_event {
 };
 
 
-struct bevent {
-	enum ua_event ev;
-	const char *txt;
-	int err;
-	union {
-		struct ua *ua;
-		struct call *call;
-		const struct sip_msg *msg;
-		void *arg;
-	} u;
-};
+struct bevent;
 
 
 /** SIP auto answer method */
@@ -1688,6 +1678,8 @@ const char  *uag_event_str(enum ua_event ev);
 struct call    *bevent_get_call(const struct bevent *event);
 struct ua      *bevent_get_ua(const struct bevent *event);
 const struct sip_msg *bevent_get_msg(const struct bevent *event);
+enum ua_event bevent_get_enum(const struct bevent *event);
+const char *bevent_get_text(const struct bevent *event);
 
 
 /*

diff --git a/modules/menu/menu.c b/modules/menu/menu.c
@@ -661,8 +661,8 @@ static bool event_handler(struct bevent *event, void *arg)
 	uint32_t count;
 	struct pl val;
 	char * uri;
-	enum ua_event        ev    = event->ev;
-	const char           *prm  = event->txt;
+	enum ua_event        ev    = bevent_get_enum(event);
+	const char           *prm  = bevent_get_text(event);
 	struct call          *call = bevent_get_call(event);
 	struct ua            *ua   = bevent_get_ua(event);
 	struct account       *acc  = ua_account(bevent_get_ua(event));

diff --git a/src/event.c b/src/event.c
@@ -14,6 +14,19 @@ enum {
 };
 
 
+struct bevent {
+	enum ua_event ev;
+	const char *txt;
+	int err;
+	union {
+		struct ua *ua;
+		struct call *call;
+		const struct sip_msg *msg;
+		void *arg;
+	} u;
+};
+
+
 struct ua_eh {
 	struct le le;
 	ua_event_h *h;
@@ -229,6 +242,18 @@ const struct sip_msg *bevent_get_msg(const struct bevent *event)
 }
 
 
+enum ua_event bevent_get_enum(const struct bevent *event)
+{
+	return event ? event->ev : UA_EVENT_MAX;
+}
+
+
+const char *bevent_get_text(const struct bevent *event)
+{
+	return event ? event->txt : "";
+}
+
+
 static int add_rtcp_stats(struct odict *od_parent, const struct rtcp_stats *rs)
 {
 	struct odict *od = NULL, *tx = NULL, *rx = NULL;

diff --git a/test/call.c b/test/call.c
@@ -606,10 +606,10 @@ static bool event_handler(struct bevent *event, void *arg)
 	struct agent *ag;
 	struct stream *strm = NULL;
 	char curi[256];
-	enum ua_event        ev    = event->ev;
-	const char           *prm  = event->txt;
-	struct call          *call = bevent_get_call(event);
-	struct ua            *ua   = bevent_get_ua(event);
+	enum ua_event ev    = bevent_get_enum(event);
+	const char    *prm  = bevent_get_text(event);
+	struct call   *call = bevent_get_call(event);
+	struct ua     *ua   = bevent_get_ua(event);
 	int err = 0;
 
 #if 1

diff --git a/test/ua.c b/test/ua.c
@@ -59,10 +59,10 @@ static bool event_handler(struct bevent *event, void *arg)
 {
 	struct test *t = arg;
 	size_t i;
-	enum ua_event        ev    = event->ev;
-	const char           *prm  = event->txt;
-	struct call          *call = bevent_get_call(event);
-	struct ua            *ua   = bevent_get_ua(event);
+	enum ua_event ev    = bevent_get_enum(event);
+	const char    *prm  = bevent_get_text(event);
+	struct call   *call = bevent_get_call(event);
+	struct ua     *ua   = bevent_get_ua(event);
 	int err = 0;
 	const char referto[] = "sip:user@127.0.0.1";
 	(void)call;