Changeset 871 for pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

Timestamp:

Dec 29, 2006 12:13:10 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #25: Authentication loops forever when server keeps rejecting request with stale=true

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c (modified) (4 diffs)

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

@@ -44 +44 @@
 #endif
 
+
 /* Transform digest to string.
  * output must be at least PJSIP_MD5STRLEN+1 bytes.
@@ -600 +601 @@
     auth = sess->cached_auth.next;
     while (auth != &sess->cached_auth) {
+        /* Reset stale counter */
+        auth->stale_cnt = 0;
+
         if (auth->qop_value == PJSIP_AUTH_QOP_NONE) {
 #           if defined(PJSIP_AUTH_HEADER_CACHING) && \
@@ -708 +712 @@
              * the same credential.
              */
-            PJ_LOG(4, (THIS_FILE, "Authorization failed for %.*s@%.*s",
+            PJ_LOG(4, (THIS_FILE, "Authorization failed for %.*s@%.*s: "
+                       "server rejected with stale=false",
                        sent_auth->credential.digest.username.slen,
                        sent_auth->credential.digest.username.ptr,
@@ -714 +719 @@
                        sent_auth->credential.digest.realm.ptr));
             return PJSIP_EFAILEDCREDENTIAL;
+        }
+
+        cached_auth->stale_cnt++;
+        if (cached_auth->stale_cnt >= PJSIP_MAX_STALE_COUNT) {
+            /* Our credential is rejected. No point in trying to re-supply
+             * the same credential.
+             */
+            PJ_LOG(4, (THIS_FILE, "Authorization failed for %.*s@%.*s: "
+                       "maximum number of stale retries exceeded",
+                       sent_auth->credential.digest.username.slen,
+                       sent_auth->credential.digest.username.ptr,
+                       sent_auth->credential.digest.realm.slen,
+                       sent_auth->credential.digest.realm.ptr));
+            return PJSIP_EAUTHSTALECOUNT;
         }