Changeset 4039

Timestamp:

Apr 12, 2012 8:04:03 AM (12 years ago)

Author:

nanang

Message:

Fix #1483: make sure that the CRC calculation of account proxy setting is done after proxy URI normalization.

File:

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

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -416 +416 @@
     }
 
-    /* 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) {
@@ -429 +422 @@
             return status;
     }
+
+    /* 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);
@@ -745 +745 @@
             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);
     }