Changeset 3954

Timestamp:

Feb 18, 2012 2:12:22 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1452: Wrong call media state is reported if hold request is challenged with authentication (thanks Bogdan Krakowski for the fix)

Location:

pjproject/branches/1.x/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (1 diff)
• src/pjsip/sip_auth_client.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/include/pjsip/sip_transport.h

@@ -573 +573 @@
      */
     pjsip_tpselector        tp_sel;
+
+    /**
+     * Special flag to indicate that this transmit data is a request that has
+     * been updated with proper authentication response and is ready to be
+     * sent for retry.
+     */
+    pj_bool_t               auth_retry;
 
     /**

pjproject/branches/1.x/pjsip/src/pjsip/sip_auth_client.c

@@ -1104 +1104 @@
 
     tdata = old_request;
-    
+    tdata->auth_retry = PJ_FALSE;
+
     /*
      * Respond to each authentication challenge.
@@ -1175 +1176 @@
     pjsip_tx_data_invalidate_msg(tdata);
 
+    /* Retrying.. */
+    tdata->auth_retry = PJ_TRUE;
+
     /* Increment reference counter. */
     pjsip_tx_data_add_ref(tdata);

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

@@ -4327 +4327 @@
     }
 
+    /* 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)
+    {
+        PJSUA_UNLOCK();
+        return;
+    }
+
     /* Notify application callback first */
     if (pjsua_var.ua_cfg.cb.on_call_tsx_state) {