Ignore:
Timestamp:
Nov 21, 2005 1:55:47 AM (18 years ago)
Author:
bennylp
Message:

Set svn:eol-style property

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsip/sip_auth_msg.c

    • Property svn:eol-style set to native
    r51 r65  
    4848    pjsip_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr)); 
    4949    init_hdr(hdr, PJSIP_H_AUTHORIZATION, &authorization_hdr_vptr); 
     50    pj_list_init(&hdr->credential.common.other_param); 
    5051    return hdr; 
    5152} 
     
    5556    pjsip_proxy_authorization_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr)); 
    5657    init_hdr(hdr, PJSIP_H_PROXY_AUTHORIZATION, &authorization_hdr_vptr); 
     58    pj_list_init(&hdr->credential.common.other_param); 
    5759    return hdr; 
    5860} 
     
    7779    copy_advance_pair(buf, ", qop=", 6, cred->qop); 
    7880    copy_advance_pair(buf, ", nc=", 5, cred->nc); 
    79     copy_advance(buf, cred->other_param); 
     81     
     82    printed = pjsip_param_print_on(&cred->other_param, buf, endbuf-buf, ','); 
     83    if (printed < 0) 
     84        return -1; 
     85    buf += printed; 
    8086 
    8187    return (int) (buf-startbuf); 
     
    148154        pj_strdup(pool, &hdr->credential.digest.qop, &rhs->credential.digest.qop); 
    149155        pj_strdup(pool, &hdr->credential.digest.nc, &rhs->credential.digest.nc); 
    150         pj_strdup(pool, &hdr->credential.digest.other_param, &rhs->credential.digest.other_param); 
     156        pjsip_param_clone(pool, &hdr->credential.digest.other_param, &rhs->credential.digest.other_param); 
    151157    } else if (pj_stricmp2(&hdr->scheme, "pgp") == 0) { 
    152158        pj_assert(0); 
     
    166172    pjsip_authorization_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); 
    167173    pj_memcpy(hdr, rhs, sizeof(*hdr)); 
     174    pjsip_param_shallow_clone(pool, &hdr->credential.common.other_param,  
     175                              &rhs->credential.common.other_param); 
    168176    return hdr; 
    169177} 
     
    193201    pjsip_www_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr)); 
    194202    init_hdr(hdr, PJSIP_H_WWW_AUTHENTICATE, &www_authenticate_hdr_vptr); 
     203    pj_list_init(&hdr->challenge.common.other_param); 
    195204    return hdr; 
    196205} 
     
    201210    pjsip_proxy_authenticate_hdr *hdr = pj_pool_calloc(pool, 1, sizeof(*hdr)); 
    202211    init_hdr(hdr, PJSIP_H_PROXY_AUTHENTICATE, &www_authenticate_hdr_vptr); 
     212    pj_list_init(&hdr->challenge.common.other_param); 
    203213    return hdr; 
    204214} 
     
    221231    copy_advance_pair(buf, ",algorithm=", 11, chal->algorithm); 
    222232    copy_advance_pair_quote_cond(buf, ",qop=", 5, chal->qop, '"', '"'); 
    223     copy_advance(buf, chal->other_param); 
     233     
     234    printed = pjsip_param_print_on(&chal->other_param, buf, endbuf-buf, ','); 
     235    if (printed < 0) 
     236        return -1; 
     237    buf += printed; 
    224238 
    225239    return (int)(buf-startbuf); 
     
    286300        pj_strdup(pool, &hdr->challenge.digest.algorithm, &rhs->challenge.digest.algorithm); 
    287301        pj_strdup(pool, &hdr->challenge.digest.qop, &rhs->challenge.digest.qop); 
    288         pj_strdup(pool, &hdr->challenge.digest.other_param, &rhs->challenge.digest.other_param); 
     302        pjsip_param_clone(pool, &hdr->challenge.digest.other_param,  
     303                          &rhs->challenge.digest.other_param); 
    289304    } else if (pj_stricmp2(&hdr->scheme, "pgp") == 0) { 
    290305        pj_assert(0); 
     
    305320    pjsip_www_authenticate_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); 
    306321    pj_memcpy(hdr, rhs, sizeof(*hdr)); 
    307     return hdr; 
    308 } 
    309  
    310  
     322    pjsip_param_shallow_clone(pool, &hdr->challenge.common.other_param,  
     323                              &rhs->challenge.common.other_param); 
     324    return hdr; 
     325} 
     326 
     327 
Note: See TracChangeset for help on using the changeset viewer.