rtpengine/rtpengine: avoid waiting for probe in MI cmd

OpenSIPS · Aug 12, 2024 · 767cb5f · 767cb5f
1 parent 0e06ef1
commit 767cb5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c
@@ -1200,7 +1200,7 @@ static mi_response_t *mi_enable_rtp_proxy(const mi_params_t *params,
 	int enable, set;
 	struct rtpe_set * rtpe_list;
 	struct rtpe_node * crt_rtpe;
-	int found, prev_disabled, recheck_ticks;
+	int found, disabled, prev_disabled, recheck_ticks;
 
 	found = 0;
 
@@ -1234,18 +1234,21 @@ static mi_response_t *mi_enable_rtp_proxy(const mi_params_t *params,
 					/*set the enabled/disabled status*/
 					found = 1;
 					prev_disabled = crt_rtpe->rn_disabled;
-					crt_rtpe->rn_disabled = enable?0:1;
 					switch (enable) {
 						case 0: /* disable */
 							recheck_ticks = MI_MAX_RECHECK_TICKS;
+							disabled = 1;
 							break;
 						case 2: /* pending */
 							recheck_ticks = get_ticks() + rtpengine_disable_tout;
+							disabled = 1;
 							break;
 						default: /* enable */
 							recheck_ticks = MI_MIN_RECHECK_TICKS;
+							disabled = 0;
 							break;
 					}
+					crt_rtpe->rn_disabled = disabled;
 					crt_rtpe->rn_recheck_ticks = recheck_ticks;
 					if (prev_disabled != crt_rtpe->rn_disabled)
 						raise_rtpengine_status_event(crt_rtpe);

diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
@@ -905,7 +905,7 @@ static mi_response_t *mi_enable_rtp_proxy(const mi_params_t *params,
 	int enable;
 	struct rtpp_set * rtpp_list;
 	struct rtpp_node * crt_rtpp;
-	int found, prev_disabled, recheck_ticks;
+	int found, disabled, prev_disabled, recheck_ticks;
 
 	found = 0;
 
@@ -937,19 +937,22 @@ static mi_response_t *mi_enable_rtp_proxy(const mi_params_t *params,
 					/*set the enabled/disabled status*/
 					found = 1;
 					prev_disabled = crt_rtpp->rn_disabled;
-					crt_rtpp->rn_disabled = enable?0:1;
 					switch (enable) {
 						case 0: /* disable */
 							recheck_ticks = MI_MAX_RECHECK_TICKS;
+							disabled = 1;
 							break;
 						case 2: /* pending */
 							recheck_ticks = get_ticks() + rtpproxy_disable_tout;
+							disabled = 1;
 							break;
 						default: /* enable */
 							recheck_ticks = MI_MIN_RECHECK_TICKS;
+							disabled = 0;
 							break;
 					}
 					crt_rtpp->rn_recheck_ticks = recheck_ticks;
+					crt_rtpp->rn_disabled = disabled;
 					if (prev_disabled != crt_rtpp->rn_disabled)
 						raise_rtpproxy_event(crt_rtpp, crt_rtpp->rn_disabled);
 				}