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

Timestamp:

Apr 2, 2008 8:34:05 PM (16 years ago)

Author:

bennylp

Message:

Ticket #521: Duplicate Authorization header when PJSIP is configured to send empty Authorization header (thanks Roland Klabunde)

File:

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

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

@@ -873 +873 @@
                 pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)h);
             } else {
-                enum { HDRLEN = 256 };
-                const pj_str_t hname = pj_str("Authorization");
-                pj_str_t hval;
-                pjsip_generic_string_hdr *hs;
-                char *hdr;
-
-                hdr = (char*)pj_pool_alloc(tdata->pool, HDRLEN);
-                len = pj_ansi_snprintf(
-                    hdr, HDRLEN,
-                    "%.*s username=\"%.*s\", realm=\"%.*s\","
-                    " nonce=\"\", uri=\"%s\",%s%.*s%s response=\"\"",
-                    (int)c->scheme.slen, c->scheme.ptr,
-                    (int)c->username.slen, c->username.ptr,
-                    (int)c->realm.slen, c->realm.ptr,
-                    uri_str,
-                    (sess->pref.algorithm.slen ? " algorithm=" : ""),
-                    (int)sess->pref.algorithm.slen, sess->pref.algorithm.ptr,
-                    (sess->pref.algorithm.slen ? "," : ""));
-
-                PJ_ASSERT_RETURN(len>0 && len<HDRLEN, PJ_ETOOBIG);
-
-                hval.ptr = hdr;
-                hval.slen = len;
-                hs = pjsip_generic_string_hdr_create(tdata->pool, &hname, 
-                                                     &hval);
+                pjsip_authorization_hdr *hs;
+
+                hs = pjsip_authorization_hdr_create(tdata->pool);
+                pj_strdup(tdata->pool, &hs->scheme, &c->scheme);
+                pj_strdup(tdata->pool, &hs->credential.digest.username,
+                          &c->username);
+                pj_strdup(tdata->pool, &hs->credential.digest.realm,
+                          &c->realm);
+                pj_strdup2(tdata->pool, &hs->credential.digest.uri,
+                           uri_str);
+                pj_strdup(tdata->pool, &hs->credential.digest.algorithm,
+                          &sess->pref.algorithm);
+
                 pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)hs);
             }