2
0
Эх сурвалжийг харах

modules/tm: load_contacts() now prefers contacts whose path is empty

- For contacts with the same q, order contacts so that contacts that
  have empty path are preferred over ones that have path defined.  In
  practice, this affects only contacts with the same ua instance id.
Juha Heinanen 12 жил өмнө
parent
commit
2a895f5dcf
1 өөрчлөгдсөн 3 нэмэгдсэн , 1 устгасан
  1. 3 1
      modules/tm/t_serial.c

+ 3 - 1
modules/tm/t_serial.c

@@ -251,7 +251,9 @@ int t_load_contacts(struct sip_msg* msg, char* key, char* value)
 
 	prev = (struct contact *)0;
 	curr = contacts;
-	while (curr && (curr->q < branch->q)) {
+	while (curr && 
+	       ((curr->q < next->q) ||
+		((curr->q == next->q) && (next->path.len == 0)))) {
 	    prev = curr;
 	    curr = curr->next;
 	}