Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_auth_client.c

Timestamp:

Oct 29, 2006 6:13:13 PM (17 years ago)

Author:

bennylp

Message:

Another Symbian commit, ported all PJSIP libraries and sipstateless runs without crashes (still no SIP message though)

File:

• pjproject/branches/symbian/pjsip/src/pjsip/sip_auth_client.c (modified) (10 diffs)

pjproject/branches/symbian/pjsip/src/pjsip/sip_auth_client.c

@@ -213 +213 @@
     
     /* Allocate memory. */
-    cred->response.ptr = pj_pool_alloc(pool, PJSIP_MD5STRLEN);
+    cred->response.ptr = (char*)pj_pool_alloc(pool, PJSIP_MD5STRLEN);
     cred->response.slen = PJSIP_MD5STRLEN;
 
@@ -228 +228 @@
          */
         cred->qop = pjsip_AUTH_STR;
-        cred->nc.ptr = pj_pool_alloc(pool, 16);
+        cred->nc.ptr = (char*)pj_pool_alloc(pool, 16);
         pj_ansi_snprintf(cred->nc.ptr, 16, "%06u", nc);
 
@@ -266 +266 @@
     if (cached_auth->cnonce.slen == 0) {
         /* Save the whole challenge */
-        cached_auth->last_chal = pjsip_hdr_clone(ses_pool, hdr);
+        cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
+                                  pjsip_hdr_clone(ses_pool, hdr);
 
         /* Create cnonce */
@@ -366 +367 @@
     sess->endpt = (pjsip_endpoint*)rhs->endpt;
     sess->cred_cnt = rhs->cred_cnt;
-    sess->cred_info = pj_pool_alloc(pool, 
+    sess->cred_info = (pjsip_cred_info*) pj_pool_alloc(pool, 
                                     sess->cred_cnt*sizeof(pjsip_cred_info));
     for (i=0; i<rhs->cred_cnt; ++i) {
@@ -401 +402 @@
     } else {
         int i;
-        sess->cred_info = pj_pool_alloc(sess->pool, cred_cnt * sizeof(*c));
+        sess->cred_info = (pjsip_cred_info*)
+                          pj_pool_alloc(sess->pool, cred_cnt * sizeof(*c));
         for (i=0; i<cred_cnt; ++i) {
             sess->cred_info[i].data_type = c[i].data_type;
@@ -527 +529 @@
                 cached_hdr->hdr = hauth;
             } else {
-                cached_hdr = pj_pool_alloc(pool, sizeof(*cached_hdr));
+                cached_hdr = (pjsip_cached_auth_hdr*)
+                             pj_pool_alloc(pool, sizeof(*cached_hdr));
                 pjsip_method_copy( pool, &cached_hdr->method, method);
                 cached_hdr->hdr = hauth;
@@ -536 +539 @@
 #       if defined(PJSIP_AUTH_AUTO_SEND_NEXT) && PJSIP_AUTH_AUTO_SEND_NEXT!=0
             if (hdr != cached_auth->last_chal) {
-                cached_auth->last_chal = pjsip_hdr_clone(sess_pool, hdr);
+                cached_auth->last_chal = (pjsip_www_authenticate_hdr*)
+                                          pjsip_hdr_clone(sess_pool, hdr);
             }
 #       endif
@@ -609 +613 @@
                     if (pjsip_method_cmp(&entry->method, method)==0) {
                         pjsip_authorization_hdr *hauth;
-                        hauth = pjsip_hdr_shallow_clone(tdata->pool, entry->hdr);
+                        hauth=(pjsip_authorization_hdr*) 
+                              pjsip_hdr_shallow_clone(tdata->pool, entry->hdr);
                         pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)hauth);
                     } else {
@@ -795 +800 @@
         cached_auth = find_cached_auth(sess, &hchal->challenge.common.realm );
         if (!cached_auth) {
-            cached_auth = pj_pool_zalloc( sess->pool, sizeof(*cached_auth));
+            cached_auth = (pjsip_cached_auth *)
+                          pj_pool_zalloc( sess->pool, sizeof(*cached_auth));
             pj_strdup( sess->pool, &cached_auth->realm, &hchal->challenge.common.realm);
             cached_auth->is_proxy = (hchal->type == PJSIP_H_PROXY_AUTHENTICATE);
@@ -823 +829 @@
 
     /* Remove branch param in Via header. */
-    via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
+    via = (pjsip_via_hdr*)
+          pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
     via->branch_param.slen = 0;