Properly take into account the dialplan priority in case entry matche…

…s both string and regex rules (cherry picked from commit 0625610)
OpenSIPS · Dec 2, 2013 · 8079e64 · 8079e64
1 parent 0ee2e29
commit 8079e64
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c
@@ -334,7 +334,10 @@ int translate(struct sip_msg *msg, str input, str * output, dpl_id_p idp,
 
 	/* pick the rule with lowest table index if both match and prio are equal */
 	if ((string_res | regexp_res) == 0) {
-		if (rrulep->table_id < rulep->table_id) {
+		if (rulep->pr < rrulep->pr) {
+			rulep = rrulep;
+		} else if (rrulep->pr == rulep->pr &&
+		           rrulep->table_id < rulep->table_id) {
 			rulep = rrulep;
 		}
 	}