Changeset 3999 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (14 diffs)

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

@@ -2930 +2930 @@
 
     pj_log_push_indent();
-    PJSUA_LOCK();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
 
     if (!call) {
-        PJSUA_UNLOCK();
         pj_log_pop_indent();
         return;
@@ -3078 +3076 @@
     if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
 
-        pj_assert(call != NULL);
-
-        if (call)
-            pjsua_media_channel_deinit(call->index);
+        PJSUA_LOCK();
+        
+        pjsua_media_channel_deinit(call->index);
 
         /* Free call */
         call->inv = NULL;
+
+        pj_assert(pjsua_var.call_cnt > 0);
         --pjsua_var.call_cnt;
 
@@ -3090 +3089 @@
         reset_call(call->index);
 
-    }
-
-    PJSUA_UNLOCK();
+        PJSUA_UNLOCK();
+    }
     pj_log_pop_indent();
 }
@@ -3203 +3201 @@
 
     pj_log_push_indent();
-    PJSUA_LOCK();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
@@ -3280 +3277 @@
 
 on_return:
-    PJSUA_UNLOCK();
     pj_log_pop_indent();
 }
@@ -3392 +3388 @@
     unsigned i;
     pj_status_t status;
-
-    PJSUA_LOCK();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
@@ -3481 +3475 @@
 
 on_return:
-    PJSUA_UNLOCK();
     pj_log_pop_indent();
 }
@@ -3496 +3489 @@
 
     pj_log_push_indent();
-    PJSUA_LOCK();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
@@ -3521 +3513 @@
 
 on_return:
-    PJSUA_UNLOCK();
     pj_log_pop_indent();
 }
@@ -3984 +3975 @@
 
     pj_log_push_indent();
-    PJSUA_LOCK();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
@@ -3997 +3987 @@
          * receive another REFER for this call.
          */
+        goto on_return;
+    }
+
+    /* https://trac.pjsip.org/repos/ticket/1452:
+     *    If a request is retried due to 401/407 challenge, don't process the
+     *    transaction first but wait until we've retried it.
+     */
+    if (tsx->role == PJSIP_ROLE_UAC &&
+        (tsx->status_code==401 || tsx->status_code==407) &&
+        tsx->last_tx && tsx->last_tx->auth_retry)
+    {
         goto on_return;
     }
@@ -4125 +4126 @@
 
 on_return:
-
-    PJSUA_UNLOCK();
     pj_log_pop_indent();
 }
@@ -4140 +4139 @@
 
     pj_log_push_indent();
-    PJSUA_LOCK();
 
     if (pjsua_var.ua_cfg.cb.on_call_redirected) {
@@ -4153 +4151 @@
     }
 
-    PJSUA_UNLOCK();
     pj_log_pop_indent();