Ignore:
Timestamp:
Jan 30, 2006 6:40:05 PM (18 years ago)
Author:
bennylp
Message:

Finished implementation of UA layer (to be tested)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

    r119 r127  
    1818 */ 
    1919#include "test.h" 
    20 #include <pjsip_core.h> 
     20#include <pjsip.h> 
    2121#include <pjlib.h> 
    2222 
    … …  
    349349    /* "INVITE sip:user@foo SIP/2.0\n" */ 
    350350    pjsip_method_set(&msg->line.req.method, PJSIP_INVITE_METHOD); 
    351     url = pjsip_url_create(pool, 0); 
     351    url = pjsip_sip_uri_create(pool, 0); 
    352352    msg->line.req.uri = (pjsip_uri*)url; 
    353353    pj_strdup2(pool, &url->user, "user"); 
    … …  
    361361    fromto->uri = (pjsip_uri*)name_addr; 
    362362    pj_strdup2(pool, &name_addr->display, "Hi I'm Joe"); 
    363     url = pjsip_url_create(pool, 0); 
     363    url = pjsip_sip_uri_create(pool, 0); 
    364364    name_addr->uri = (pjsip_uri*)url; 
    365365    pj_strdup2(pool, &url->user, "joe.user"); 
    … …  
    372372    fromto->uri = (pjsip_uri*)name_addr; 
    373373    pj_strdup2(pool, &name_addr->display, "Fellow User"); 
    374     url = pjsip_url_create(pool, 0); 
     374    url = pjsip_sip_uri_create(pool, 0); 
    375375    name_addr->uri = (pjsip_uri*)url; 
    376376    pj_strdup2(pool, &url->user, "user"); 
    … …  
    400400    name_addr = pjsip_name_addr_create(pool); 
    401401    contact->uri = (pjsip_uri*)name_addr; 
    402     url = pjsip_url_create(pool, 0); 
     402    url = pjsip_sip_uri_create(pool, 0); 
    403403    name_addr->uri = (pjsip_uri*)url; 
    404404    pj_strdup2(pool, &url->user, "joe"); 
    … …  
    411411    name_addr = pjsip_name_addr_create(pool); 
    412412    contact->uri = (pjsip_uri*)name_addr; 
    413     url = pjsip_url_create(pool, 0); 
     413    url = pjsip_sip_uri_create(pool, 0); 
    414414    name_addr->uri = (pjsip_uri*)url; 
    415415    pj_strdup2(pool, &url->user, "user"); 
    … …  
    421421    name_addr = pjsip_name_addr_create(pool); 
    422422    contact->uri = (pjsip_uri*)name_addr; 
    423     url = pjsip_url_create(pool, 0); 
     423    url = pjsip_sip_uri_create(pool, 0); 
    424424    name_addr->uri = (pjsip_uri*)url; 
    425425    pj_strdup2(pool, &url->user, "user2"); 
    … …  
    436436    routing = pjsip_route_hdr_create(pool); 
    437437    pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); 
    438     url = pjsip_url_create(pool, 0); 
     438    url = pjsip_sip_uri_create(pool, 0); 
    439439    routing->name_addr.uri = (pjsip_uri*)url; 
    440440    pj_strdup2(pool, &url->host, "bigbox3.site3.atlanta.com"); 
    … …  
    444444    routing = pjsip_route_hdr_create(pool); 
    445445    pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); 
    446     url = pjsip_url_create(pool, 0); 
     446    url = pjsip_sip_uri_create(pool, 0); 
    447447    routing->name_addr.uri = (pjsip_uri*)url; 
    448448    pj_strdup2(pool, &url->host, "server10.biloxi.com"); 
    … …  
    452452    routing = pjsip_rr_hdr_create(pool); 
    453453    pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); 
    454     url = pjsip_url_create(pool, 0); 
     454    url = pjsip_sip_uri_create(pool, 0); 
    455455    routing->name_addr.uri = (pjsip_uri*)url; 
    456456    pj_strdup2(pool, &url->host, "server10.biloxi.com"); 
    … …  
    460460    routing = pjsip_rr_hdr_create(pool); 
    461461    pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); 
    462     url = pjsip_url_create(pool, 0); 
     462    url = pjsip_sip_uri_create(pool, 0); 
    463463    routing->name_addr.uri = (pjsip_uri*)url; 
    464464    pj_strdup2(pool, &url->host, "bigbox3.site3.atlanta.com"); 
    … …  
    498498    str.ptr = "Organization"; 
    499499    str.slen = 12; 
    500     generic = pjsip_generic_string_hdr_create(pool, &str); 
     500    generic = pjsip_generic_string_hdr_create(pool, &str, NULL); 
    501501    pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); 
    502502    generic->hvalue.ptr = NULL; 
    … …  
    506506    str.ptr = "Max-Forwards"; 
    507507    str.slen = 12; 
    508     generic = pjsip_generic_string_hdr_create(pool, &str); 
     508    generic = pjsip_generic_string_hdr_create(pool, &str, NULL); 
    509509    pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); 
    510510    str.ptr = "70"; 
    … …  
    515515    str.ptr = "X-Header"; 
    516516    str.slen = 8; 
    517     generic = pjsip_generic_string_hdr_create(pool, &str); 
     517    generic = pjsip_generic_string_hdr_create(pool, &str, NULL); 
    518518    pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); 
    519519    str.ptr = NULL; 
    … …  
    524524    str.ptr = "P-Associated-URI"; 
    525525    str.slen = 16; 
    526     generic = pjsip_generic_string_hdr_create(pool, &str); 
     526    generic = pjsip_generic_string_hdr_create(pool, &str, NULL); 
    527527    pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); 
    528528    str.ptr = NULL; 
    … …  
    539539    pjsip_name_addr *name_addr; 
    540540    pjsip_sip_uri *url; 
    541     pjsip_max_forwards_hdr *max_fwd; 
     541    pjsip_max_fwd_hdr *max_fwd; 
    542542    pjsip_to_hdr *to; 
    543543    pjsip_from_hdr *from; 
    … …  
    582582    route = pjsip_route_hdr_create(pool); 
    583583    pjsip_msg_add_hdr(msg, (pjsip_hdr*)route); 
    584     url = pjsip_url_create(pool, PJ_FALSE); 
     584    url = pjsip_sip_uri_create(pool, PJ_FALSE); 
    585585    route->name_addr.uri = (pjsip_uri*)url; 
    586586    url->host = pj_str("proxy.sipprovider.com"); 
    … …  
    589589    route = pjsip_route_hdr_create(pool); 
    590590    pjsip_msg_add_hdr(msg, (pjsip_hdr*)route); 
    591     url = pjsip_url_create(pool, PJ_FALSE); 
     591    url = pjsip_sip_uri_create(pool, PJ_FALSE); 
    592592    route->name_addr.uri = (pjsip_uri*)url; 
    593593    url->host = pj_str("proxy.supersip.com"); 
    … …  
    595595 
    596596    //"Max-Forwards: 70\r\n" 
    597     max_fwd = pjsip_max_forwards_hdr_create(pool); 
     597    max_fwd = pjsip_max_fwd_hdr_create(pool, 70); 
    598598    pjsip_msg_add_hdr(msg, (pjsip_hdr*)max_fwd); 
    599     max_fwd->ivalue = 70; 
    600599 
    601600    //"To: Bob <sip:bob@biloxi.com>;tag=a6c85cf\r\n" 
    … …  
    605604    name_addr->display = pj_str("Bob"); 
    606605    to->uri = (pjsip_uri*)name_addr; 
    607     url = pjsip_url_create(pool, PJ_FALSE); 
     606    url = pjsip_sip_uri_create(pool, PJ_FALSE); 
    608607    name_addr->uri = (pjsip_uri*)url; 
    609608    url->user = pj_str("bob"); 
    … …  
    617616    name_addr->display = pj_str("Alice"); 
    618617    from->uri = (pjsip_uri*)name_addr; 
    619     url = pjsip_url_create(pool, PJ_FALSE); 
     618    url = pjsip_sip_uri_create(pool, PJ_FALSE); 
    620619    name_addr->uri = (pjsip_uri*)url; 
    621620    url->user = pj_str("alice"); 
    … …  
    639638    name_addr = pjsip_name_addr_create(pool); 
    640639    contact->uri = (pjsip_uri*)name_addr; 
    641     url = pjsip_url_create(pool, PJ_TRUE); 
     640    url = pjsip_sip_uri_create(pool, PJ_TRUE); 
    642641    name_addr->uri = (pjsip_uri*)url; 
    643642    url->user = pj_str("bob"); 
Note: See TracChangeset for help on using the changeset viewer.