rtpproxy+rtpengine: fair election when the first try is disabled

When a first attempt to use a rtpproxy/rtpengine node picks a disabled node, the next attempt should not consider the disabled nodes at all. (cherry picked from commit 9d5dd95)
OpenSIPS · May 2, 2022 · 4408617 · 4408617
1 parent 0cca86f
commit 4408617
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c
@@ -2608,7 +2608,8 @@ select_rtpe_node(str callid, int do_test, struct rtpe_set *set)
 				continue;
 			}
 		}
-		sumcut -= node->rn_weight;
+		if (!node->rn_disabled || !was_forced)
+			sumcut -= node->rn_weight;
 		node = node->rn_next;
 	}
 	/* No node list */

diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
@@ -2307,7 +2307,8 @@ select_rtpp_node(struct sip_msg * msg,
 				continue;
 			}
 		}
-		sumcut -= node->rn_weight;
+		if (!node->rn_disabled || !was_forced)
+			sumcut -= node->rn_weight;
 		node = node->rn_next;
 	}
 	/* No node list */