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

Timestamp:

Nov 6, 2009 4:16:36 AM (14 years ago)

Author:

bennylp

Message:

Fixed ticket #986: Assertion when authorization PJSIP_AUTH_AUTO_SEND_NEXT is enabled (thanks Zhefeng Du for the report)

• also added SIPp scenario for testing

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c (modified) (1 diff)

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

@@ -323 +323 @@
                                    const pjsip_www_authenticate_hdr *hdr )
 {
-    if (hdr->challenge.digest.qop.slen == 0)
+    if (hdr->challenge.digest.qop.slen == 0) {
+#if PJSIP_AUTH_AUTO_SEND_NEXT!=0
+        if (!cached_auth->last_chal || pj_stricmp2(&hdr->scheme, "digest")) {
+            cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
+                                     pjsip_hdr_clone(ses_pool, hdr);
+        } else {
+            /* Only update if the new challenge is "significantly different"
+             * than the one in the cache, to reduce memory usage.
+             */
+            const pjsip_digest_challenge *d1 = 
+                        &cached_auth->last_chal->challenge.digest;
+            const pjsip_digest_challenge *d2 = &hdr->challenge.digest;
+
+            if (pj_strcmp(&d1->domain, &d2->domain) ||
+                pj_strcmp(&d1->realm, &d2->realm) ||
+                pj_strcmp(&d1->nonce, &d2->nonce) ||
+                pj_strcmp(&d1->opaque, &d2->opaque) ||
+                pj_strcmp(&d1->algorithm, &d2->algorithm) ||
+                pj_strcmp(&d1->qop, &d2->qop))
+            {
+                cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
+                                         pjsip_hdr_clone(ses_pool, hdr);
+            }
+        }
+#endif
         return;
+    }
 
     /* Initialize cnonce and qop if not present. */