Changeset 1508 for pjproject/trunk

Timestamp:

Oct 18, 2007 3:28:33 PM (17 years ago)

Author:

bennylp

Message:

Updated Service-Route calculation

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -540 +540 @@
     const pj_str_t HROUTE = { "Route", 5 };
     pjsip_uri *uri[PJSUA_ACC_MAX_PROXIES];
-    unsigned i, uri_cnt = 0;
+    unsigned i, uri_cnt = 0, rcnt;
 
     /* Find and parse Service-Route headers */
@@ -603 +603 @@
     
     /* First remove all routes which are not the outbound proxies */
-    for (i=0, hr=acc->route_set.prev; 
-         i<pjsua_var.ua_cfg.outbound_proxy_cnt; 
-         ++i)
-     {
-        pjsip_route_hdr *prev = hr->prev;
-        pj_list_erase(hr);
-        hr = prev;
-     }
+    rcnt = pj_list_size(&acc->route_set);
+    if (rcnt != pjsua_var.ua_cfg.outbound_proxy_cnt) {
+        for (i=pjsua_var.ua_cfg.outbound_proxy_cnt, hr=acc->route_set.prev; 
+             i<rcnt; 
+             ++i)
+         {
+            pjsip_route_hdr *prev = hr->prev;
+            pj_list_erase(hr);
+            hr = prev;
+         }
+    }
 
     /* Then append the Service-Route URIs */