Changeset 4040 for pjproject/trunk

Timestamp:

Apr 12, 2012 8:10:06 AM (13 years ago)

Author:

nanang

Message:

Re #1474: merged r4039

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (3 diffs)

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

@@ -422 +422 @@
     }
 
-    /* Get CRC of account proxy setting */
-    acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt);
-
-    /* Get CRC of global outbound proxy setting */
-    acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy,
-                                         pjsua_var.ua_cfg.outbound_proxy_cnt);
-    
     /* Check the route URI's and force loose route if required */
     for (i=0; i<acc->cfg.proxy_cnt; ++i) {
@@ -438 +431 @@
         }
     }
+
+    /* Get CRC of account proxy setting */
+    acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt);
+
+    /* Get CRC of global outbound proxy setting */
+    acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy,
+                                         pjsua_var.ua_cfg.outbound_proxy_cnt);
 
     status = initialize_acc(id);
@@ -773 +773 @@
             pj_list_push_back(&local_route, r);
         }
+
+        /* Recalculate the CRC again after route URI normalization */
+        local_route_crc = calc_proxy_crc(acc_proxy, cfg->proxy_cnt);
     }