Changeset 3999 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c
- Timestamp:
- Mar 30, 2012 7:10:13 AM (12 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
-
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c
r3996 r3999 2930 2930 2931 2931 pj_log_push_indent(); 2932 PJSUA_LOCK();2933 2932 2934 2933 call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; 2935 2934 2936 2935 if (!call) { 2937 PJSUA_UNLOCK();2938 2936 pj_log_pop_indent(); 2939 2937 return; … … 3078 3076 if (inv->state == PJSIP_INV_STATE_DISCONNECTED) { 3079 3077 3080 pj_assert(call != NULL); 3081 3082 if (call) 3083 pjsua_media_channel_deinit(call->index); 3078 PJSUA_LOCK(); 3079 3080 pjsua_media_channel_deinit(call->index); 3084 3081 3085 3082 /* Free call */ 3086 3083 call->inv = NULL; 3084 3085 pj_assert(pjsua_var.call_cnt > 0); 3087 3086 --pjsua_var.call_cnt; 3088 3087 … … 3090 3089 reset_call(call->index); 3091 3090 3092 } 3093 3094 PJSUA_UNLOCK(); 3091 PJSUA_UNLOCK(); 3092 } 3095 3093 pj_log_pop_indent(); 3096 3094 } … … 3203 3201 3204 3202 pj_log_push_indent(); 3205 PJSUA_LOCK();3206 3203 3207 3204 call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; … … 3280 3277 3281 3278 on_return: 3282 PJSUA_UNLOCK();3283 3279 pj_log_pop_indent(); 3284 3280 } … … 3392 3388 unsigned i; 3393 3389 pj_status_t status; 3394 3395 PJSUA_LOCK();3396 3390 3397 3391 call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; … … 3481 3475 3482 3476 on_return: 3483 PJSUA_UNLOCK();3484 3477 pj_log_pop_indent(); 3485 3478 } … … 3496 3489 3497 3490 pj_log_push_indent(); 3498 PJSUA_LOCK();3499 3491 3500 3492 call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; … … 3521 3513 3522 3514 on_return: 3523 PJSUA_UNLOCK();3524 3515 pj_log_pop_indent(); 3525 3516 } … … 3984 3975 3985 3976 pj_log_push_indent(); 3986 PJSUA_LOCK();3987 3977 3988 3978 call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; … … 3997 3987 * receive another REFER for this call. 3998 3988 */ 3989 goto on_return; 3990 } 3991 3992 /* https://trac.pjsip.org/repos/ticket/1452: 3993 * If a request is retried due to 401/407 challenge, don't process the 3994 * transaction first but wait until we've retried it. 3995 */ 3996 if (tsx->role == PJSIP_ROLE_UAC && 3997 (tsx->status_code==401 || tsx->status_code==407) && 3998 tsx->last_tx && tsx->last_tx->auth_retry) 3999 { 3999 4000 goto on_return; 4000 4001 } … … 4125 4126 4126 4127 on_return: 4127 4128 PJSUA_UNLOCK();4129 4128 pj_log_pop_indent(); 4130 4129 } … … 4140 4139 4141 4140 pj_log_push_indent(); 4142 PJSUA_LOCK();4143 4141 4144 4142 if (pjsua_var.ua_cfg.cb.on_call_redirected) { … … 4153 4151 } 4154 4152 4155 PJSUA_UNLOCK();4156 4153 pj_log_pop_indent(); 4157 4154
Note: See TracChangeset
for help on using the changeset viewer.