[sr-dev] git:master:5a537506: rtpengine: Allow op for all deactivated machines

[Stefan Mititelu]

Module: kamailio
Branch: master
Commit: 5a537506141027ca3d3ef87f49913ab628c30690
URL: https://github.com/kamailio/kamailio/commit/5a537506141027ca3d3ef87f49913ab628c30690

Author: Stefan Mititelu <stefan.mititelu at 1and1.ro>
Committer: Stefan Mititelu <stefan.mititelu at 1and1.ro>
Date: 2015-12-07T13:30:02+02:00

rtpengine: Allow op for all deactivated machines

If allow_op modparam enabled, send commands to the disabled machines for the
existing call. So far this was done only for manually deactivated machines.
This is useful because there might be cases of proxy timeout, cases when you
may want to still allow the operations for the existing calls.

---

Modified: modules/rtpengine/rtpengine.c

---

Diff:  https://github.com/kamailio/kamailio/commit/5a537506141027ca3d3ef87f49913ab628c30690.diff
Patch: https://github.com/kamailio/kamailio/commit/5a537506141027ca3d3ef87f49913ab628c30690.patch

---

diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c
index 893bc9d..bba10ef 100644
--- a/modules/rtpengine/rtpengine.c
+++ b/modules/rtpengine/rtpengine.c
@@ -2452,18 +2452,16 @@ select_rtpp_node(str callid, str viabranch, int do_test)
 		return node;
 	}
 
-	// if node _manually_ disabled(e.g kamctl) and proper configuration, return it
-	if (node->rn_recheck_ticks == MI_MAX_RECHECK_TICKS) {
-		if (rtpengine_allow_op) {
+	// if proper configuration and node manually or timeout disabled, return it
+	if (rtpengine_allow_op) {
+		if (node->rn_recheck_ticks == MI_MAX_RECHECK_TICKS) {
 			LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return it\n",
 				node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s);
-			return node;
+		} else {
+			LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled, either broke or timeout disabled! Return it\n",
+				node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s);
 		}
-		LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled(permanent) (probably still UP)! Return NULL\n",
-			node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s);
-	} else {
-		LM_DBG("node=%.*s for calllen=%d callid=%.*s is disabled (probably BROKE)! Return NULL\n",
-			node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s);
+		return node;
 	}
 
 	return NULL;