Changeset 4039


Ignore:
Timestamp:
Apr 12, 2012 8:04:03 AM (7 years ago)
Author:
nanang
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

    r4037 r4039  
    416416    } 
    417417 
    418     /* Get CRC of account proxy setting */ 
    419     acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt); 
    420  
    421     /* Get CRC of global outbound proxy setting */ 
    422     acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy, 
    423                                          pjsua_var.ua_cfg.outbound_proxy_cnt); 
    424      
    425418    /* Check the route URI's and force loose route if required */ 
    426419    for (i=0; i<acc->cfg.proxy_cnt; ++i) { 
     
    429422            return status; 
    430423    } 
     424 
     425    /* Get CRC of account proxy setting */ 
     426    acc->local_route_crc = calc_proxy_crc(acc->cfg.proxy, acc->cfg.proxy_cnt); 
     427 
     428    /* Get CRC of global outbound proxy setting */ 
     429    acc->global_route_crc=calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy, 
     430                                         pjsua_var.ua_cfg.outbound_proxy_cnt); 
    431431 
    432432    status = initialize_acc(id); 
     
    745745            pj_list_push_back(&local_route, r); 
    746746        } 
     747 
     748        /* Recalculate the CRC again after route URI normalization */ 
     749        local_route_crc = calc_proxy_crc(acc_proxy, cfg->proxy_cnt); 
    747750    } 
    748751 
Note: See TracChangeset for help on using the changeset viewer.