rtp_relay: avoid crash when dialog/b2b not loaded

razvancrainea · razvancrainea · commit e00300c46178 · 2023-05-29T11:45:49.000+03:00
diff --git a/modules/rtp_relay/rtp_relay_ctx.c b/modules/rtp_relay/rtp_relay_ctx.c
@@ -1007,6 +1007,10 @@ int rtp_relay_ctx_preinit(void)
 	if (load_b2b_logic_api(&rtp_relay_b2b)==0) {
 		rtp_relay_b2b_ctx_idx = rtp_relay_b2b.ctx_register_ptr(rtp_relay_b2b_end);
 	}
+	if (rtp_relay_dlg_ctx_idx < 0 && rtp_relay_b2b_ctx_idx < 0) {
+		LM_ERR("nor dialog not b2b modules loaded - cannot use this module!\n");
+		return -1;
+	}
 	return 0;
 }
 
@@ -1852,6 +1856,10 @@ int rtp_relay_ctx_engage(struct sip_msg *msg,
 	}
 
 	if (route_type != LOCAL_ROUTE) {
+		if (rtp_relay_dlg_ctx_idx < 0) {
+			LM_ERR("dialog module not loaded - failed to engage\n");
+			return -1;
+		}
 		if (!rtp_relay_ctx_engaged(ctx)) {
 
 			/* handles the replies to the original INVITE */

Original file line number	Diff line number	Diff line change
`@@ -1007,6 +1007,10 @@ int rtp_relay_ctx_preinit(void)`
`1007`	`1007`	`if (load_b2b_logic_api(&rtp_relay_b2b)==0) {`
`1008`	`1008`	`rtp_relay_b2b_ctx_idx = rtp_relay_b2b.ctx_register_ptr(rtp_relay_b2b_end);`
`1009`	`1009`	`}`
	`1010`	`+ if (rtp_relay_dlg_ctx_idx < 0 && rtp_relay_b2b_ctx_idx < 0) {`
	`1011`	`+ LM_ERR("nor dialog not b2b modules loaded - cannot use this module!\n");`
	`1012`	`+ return -1;`
	`1013`	`+ }`
`1010`	`1014`	`return 0;`
`1011`	`1015`	`}`
`1012`	`1016`
`@@ -1852,6 +1856,10 @@ int rtp_relay_ctx_engage(struct sip_msg *msg,`
`1852`	`1856`	`}`
`1853`	`1857`
`1854`	`1858`	`if (route_type != LOCAL_ROUTE) {`
	`1859`	`+ if (rtp_relay_dlg_ctx_idx < 0) {`
	`1860`	`+ LM_ERR("dialog module not loaded - failed to engage\n");`
	`1861`	`+ return -1;`
	`1862`	`+ }`
`1855`	`1863`	`if (!rtp_relay_ctx_engaged(ctx)) {`
`1856`	`1864`
`1857`	`1865`	`/* handles the replies to the original INVITE */`