Changeset 1539

Timestamp:

Nov 3, 2007 1:46:03 AM (17 years ago)

Author:

bennylp

Message:

Ticket #410: Endless authentication retries when 401/407 response contains no challenge

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_errno.h (modified) (1 diff)
• src/pjsip/sip_auth_client.c (modified) (4 diffs)
• src/pjsip/sip_errno.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_errno.h

@@ -392 +392 @@
  */
 #define PJSIP_EAUTHINAKACRED    (PJSIP_ERRNO_START_PJSIP + 113) /* 171113 */
-
+/**
+ * No challenge is found in the challenge.
+ */
+#define PJSIP_EAUTHNOCHAL       (PJSIP_ERRNO_START_PJSIP + 114) /* 171114 */
 
 /************************************************************

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -902 +902 @@
     pjsip_tx_data *tdata;
     const pjsip_hdr *hdr;
+    unsigned chal_cnt;
     pjsip_via_hdr *via;
     pj_status_t status;
@@ -922 +923 @@
      */
     hdr = rdata->msg_info.msg->hdr.next;
+    chal_cnt = 0;
     while (hdr != &rdata->msg_info.msg->hdr) {
         pjsip_cached_auth *cached_auth;
@@ -938 +940 @@
 
         hchal = (const pjsip_www_authenticate_hdr*) hdr;
+        ++chal_cnt;
 
         /* Find authentication session for this realm, create a new one
@@ -970 +973 @@
     }
 
+    /* Check if challenge is present */
+    if (chal_cnt == 0)
+        return PJSIP_EAUTHNOCHAL;
 
     /* Remove branch param in Via header. */

pjproject/trunk/pjsip/src/pjsip/sip_errno.c

@@ -105 +105 @@
     PJ_BUILD_ERR( PJSIP_EAUTHINNONCE,      "Invalid nonce value in authentication challenge"),
     PJ_BUILD_ERR( PJSIP_EAUTHINAKACRED,    "Invalid AKA credential"),
+    PJ_BUILD_ERR( PJSIP_EAUTHNOCHAL,       "No challenge is found"),
 
     /* UA/dialog layer. */