diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-01-30 18:40:05 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-01-30 18:40:05 +0000 |
commit | 0d61adeb5f784b45f76d76dad9974f4111fb3c8c (patch) | |
tree | 4fe8830715bd6af57dd91ebca780318a645435cd /pjsip/src/test-pjsip | |
parent | 7638eeee106fe58a1225f642e733629f29418818 (diff) |
Finished implementation of UA layer (to be tested)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@127 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/test-pjsip')
-rw-r--r-- | pjsip/src/test-pjsip/dlg_core_test.c | 22 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/msg_logger.c | 4 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/msg_test.c | 45 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/transport_loop_test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/transport_test.c | 6 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/transport_udp_test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/tsx_basic_test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/tsx_uac_test.c | 6 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/tsx_uas_test.c | 6 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/txdata_test.c | 2 | ||||
-rw-r--r-- | pjsip/src/test-pjsip/uri_test.c | 38 |
12 files changed, 72 insertions, 65 deletions
diff --git a/pjsip/src/test-pjsip/dlg_core_test.c b/pjsip/src/test-pjsip/dlg_core_test.c new file mode 100644 index 00000000..348e3c3a --- /dev/null +++ b/pjsip/src/test-pjsip/dlg_core_test.c @@ -0,0 +1,22 @@ +/* $Id$ */ +/* + * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "test.h" +#include <pjsip.h> + diff --git a/pjsip/src/test-pjsip/msg_logger.c b/pjsip/src/test-pjsip/msg_logger.c index faa36b53..45a4cbaf 100644 --- a/pjsip/src/test-pjsip/msg_logger.c +++ b/pjsip/src/test-pjsip/msg_logger.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "msg_logger.c" @@ -64,8 +64,6 @@ static pjsip_module mod_msg_logger = -1, /* Id */ PJSIP_MOD_PRIORITY_TRANSPORT_LAYER-1,/* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ diff --git a/pjsip/src/test-pjsip/msg_test.c b/pjsip/src/test-pjsip/msg_test.c index 8fe879a3..f5debe84 100644 --- a/pjsip/src/test-pjsip/msg_test.c +++ b/pjsip/src/test-pjsip/msg_test.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define POOL_SIZE 8000 @@ -348,7 +348,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "INVITE sip:user@foo SIP/2.0\n" */ pjsip_method_set(&msg->line.req.method, PJSIP_INVITE_METHOD); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); msg->line.req.uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "user"); pj_strdup2(pool, &url->host, "foo"); @@ -360,7 +360,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) name_addr = pjsip_name_addr_create(pool); fromto->uri = (pjsip_uri*)name_addr; pj_strdup2(pool, &name_addr->display, "Hi I'm Joe"); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "joe.user"); pj_strdup2(pool, &url->host, "bar.otherdomain.com"); @@ -371,7 +371,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) name_addr = pjsip_name_addr_create(pool); fromto->uri = (pjsip_uri*)name_addr; pj_strdup2(pool, &name_addr->display, "Fellow User"); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "user"); pj_strdup2(pool, &url->host, "foo.bar.domain.com"); @@ -399,7 +399,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) contact->expires = 3600; name_addr = pjsip_name_addr_create(pool); contact->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "joe"); pj_strdup2(pool, &url->host, "bar"); @@ -410,7 +410,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) contact->q1000 = 500; name_addr = pjsip_name_addr_create(pool); contact->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "user"); pj_strdup2(pool, &url->host, "host"); @@ -420,7 +420,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) pjsip_msg_add_hdr(msg, (pjsip_hdr*)contact); name_addr = pjsip_name_addr_create(pool); contact->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*)url; pj_strdup2(pool, &url->user, "user2"); pj_strdup2(pool, &url->host, "host2"); @@ -435,7 +435,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "Route: <sip:bigbox3.site3.atlanta.com;lr>,\r\n" */ routing = pjsip_route_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); routing->name_addr.uri = (pjsip_uri*)url; pj_strdup2(pool, &url->host, "bigbox3.site3.atlanta.com"); url->lr_param = 1; @@ -443,7 +443,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* " <sip:server10.biloxi.com;lr>\r" */ routing = pjsip_route_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); routing->name_addr.uri = (pjsip_uri*)url; pj_strdup2(pool, &url->host, "server10.biloxi.com"); url->lr_param = 1; @@ -451,7 +451,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "Record-Route: <sip:server10.biloxi.com>,\r\n" */ routing = pjsip_rr_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); routing->name_addr.uri = (pjsip_uri*)url; pj_strdup2(pool, &url->host, "server10.biloxi.com"); url->lr_param = 0; @@ -459,7 +459,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* " <sip:bigbox3.site3.atlanta.com;lr>\n" */ routing = pjsip_rr_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)routing); - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); routing->name_addr.uri = (pjsip_uri*)url; pj_strdup2(pool, &url->host, "bigbox3.site3.atlanta.com"); url->lr_param = 1; @@ -497,7 +497,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "Organization: \r" */ str.ptr = "Organization"; str.slen = 12; - generic = pjsip_generic_string_hdr_create(pool, &str); + generic = pjsip_generic_string_hdr_create(pool, &str, NULL); pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); generic->hvalue.ptr = NULL; generic->hvalue.slen = 0; @@ -505,7 +505,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "Max-Forwards: 70\n" */ str.ptr = "Max-Forwards"; str.slen = 12; - generic = pjsip_generic_string_hdr_create(pool, &str); + generic = pjsip_generic_string_hdr_create(pool, &str, NULL); pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); str.ptr = "70"; str.slen = 2; @@ -514,7 +514,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* "X-Header: \r\n" */ str.ptr = "X-Header"; str.slen = 8; - generic = pjsip_generic_string_hdr_create(pool, &str); + generic = pjsip_generic_string_hdr_create(pool, &str, NULL); pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); str.ptr = NULL; str.slen = 0; @@ -523,7 +523,7 @@ static pjsip_msg *create_msg0(pj_pool_t *pool) /* P-Associated-URI:\r\n */ str.ptr = "P-Associated-URI"; str.slen = 16; - generic = pjsip_generic_string_hdr_create(pool, &str); + generic = pjsip_generic_string_hdr_create(pool, &str, NULL); pjsip_msg_add_hdr(msg, (pjsip_hdr*)generic); str.ptr = NULL; str.slen = 0; @@ -538,7 +538,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) pjsip_route_hdr *route; pjsip_name_addr *name_addr; pjsip_sip_uri *url; - pjsip_max_forwards_hdr *max_fwd; + pjsip_max_fwd_hdr *max_fwd; pjsip_to_hdr *to; pjsip_from_hdr *from; pjsip_contact_hdr *contact; @@ -581,22 +581,21 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) //"Route: <sip:proxy.sipprovider.com>\r\n" route = pjsip_route_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)route); - url = pjsip_url_create(pool, PJ_FALSE); + url = pjsip_sip_uri_create(pool, PJ_FALSE); route->name_addr.uri = (pjsip_uri*)url; url->host = pj_str("proxy.sipprovider.com"); //"Route: <sip:proxy.supersip.com:5060>\r\n" route = pjsip_route_hdr_create(pool); pjsip_msg_add_hdr(msg, (pjsip_hdr*)route); - url = pjsip_url_create(pool, PJ_FALSE); + url = pjsip_sip_uri_create(pool, PJ_FALSE); route->name_addr.uri = (pjsip_uri*)url; url->host = pj_str("proxy.supersip.com"); url->port = 5060; //"Max-Forwards: 70\r\n" - max_fwd = pjsip_max_forwards_hdr_create(pool); + max_fwd = pjsip_max_fwd_hdr_create(pool, 70); pjsip_msg_add_hdr(msg, (pjsip_hdr*)max_fwd); - max_fwd->ivalue = 70; //"To: Bob <sip:bob@biloxi.com>;tag=a6c85cf\r\n" to = pjsip_to_hdr_create(pool); @@ -604,7 +603,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) name_addr = pjsip_name_addr_create(pool); name_addr->display = pj_str("Bob"); to->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, PJ_FALSE); + url = pjsip_sip_uri_create(pool, PJ_FALSE); name_addr->uri = (pjsip_uri*)url; url->user = pj_str("bob"); url->host = pj_str("biloxi.com"); @@ -616,7 +615,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) name_addr = pjsip_name_addr_create(pool); name_addr->display = pj_str("Alice"); from->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, PJ_FALSE); + url = pjsip_sip_uri_create(pool, PJ_FALSE); name_addr->uri = (pjsip_uri*)url; url->user = pj_str("alice"); url->host = pj_str("atlanta.com"); @@ -638,7 +637,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) pjsip_msg_add_hdr(msg, (pjsip_hdr*)contact); name_addr = pjsip_name_addr_create(pool); contact->uri = (pjsip_uri*)name_addr; - url = pjsip_url_create(pool, PJ_TRUE); + url = pjsip_sip_uri_create(pool, PJ_TRUE); name_addr->uri = (pjsip_uri*)url; url->user = pj_str("bob"); url->host = pj_str("192.0.2.4"); diff --git a/pjsip/src/test-pjsip/test.c b/pjsip/src/test-pjsip/test.c index d634cc80..dd3453f8 100644 --- a/pjsip/src/test-pjsip/test.c +++ b/pjsip/src/test-pjsip/test.c @@ -20,7 +20,7 @@ #include "test.h" #include <pjlib.h> -#include <pjsip_core.h> +#include <pjsip.h> #define THIS_FILE "test.c" diff --git a/pjsip/src/test-pjsip/transport_loop_test.c b/pjsip/src/test-pjsip/transport_loop_test.c index f4e6bb3c..351fb7b6 100644 --- a/pjsip/src/test-pjsip/transport_loop_test.c +++ b/pjsip/src/test-pjsip/transport_loop_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "transport_loop_test.c" diff --git a/pjsip/src/test-pjsip/transport_test.c b/pjsip/src/test-pjsip/transport_test.c index 74f6d796..df6f55eb 100644 --- a/pjsip/src/test-pjsip/transport_test.c +++ b/pjsip/src/test-pjsip/transport_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "transport_test.c" @@ -101,8 +101,6 @@ static pjsip_module my_module = -1, /* Id */ PJSIP_MOD_PRIORITY_TSX_LAYER-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ @@ -305,8 +303,6 @@ static pjsip_module rt_module = -1, /* Id */ PJSIP_MOD_PRIORITY_TSX_LAYER-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ diff --git a/pjsip/src/test-pjsip/transport_udp_test.c b/pjsip/src/test-pjsip/transport_udp_test.c index ebc0557d..cf5f0ca5 100644 --- a/pjsip/src/test-pjsip/transport_udp_test.c +++ b/pjsip/src/test-pjsip/transport_udp_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "transport_udp_test.c" diff --git a/pjsip/src/test-pjsip/tsx_basic_test.c b/pjsip/src/test-pjsip/tsx_basic_test.c index 1db86f8d..6be0ea2a 100644 --- a/pjsip/src/test-pjsip/tsx_basic_test.c +++ b/pjsip/src/test-pjsip/tsx_basic_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "tsx_basic_test.c" diff --git a/pjsip/src/test-pjsip/tsx_uac_test.c b/pjsip/src/test-pjsip/tsx_uac_test.c index 2ec94e5a..c699bc54 100644 --- a/pjsip/src/test-pjsip/tsx_uac_test.c +++ b/pjsip/src/test-pjsip/tsx_uac_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "tsx_uac_test.c" @@ -103,8 +103,6 @@ static pjsip_module tsx_user = -1, /* Id */ PJSIP_MOD_PRIORITY_APPLICATION-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ @@ -124,8 +122,6 @@ static pjsip_module msg_receiver = -1, /* Id */ PJSIP_MOD_PRIORITY_APPLICATION-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ diff --git a/pjsip/src/test-pjsip/tsx_uas_test.c b/pjsip/src/test-pjsip/tsx_uas_test.c index ecc174c4..ed8f8574 100644 --- a/pjsip/src/test-pjsip/tsx_uas_test.c +++ b/pjsip/src/test-pjsip/tsx_uas_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "tsx_uas_test.c" @@ -142,8 +142,6 @@ static pjsip_module tsx_user = -1, /* Id */ PJSIP_MOD_PRIORITY_APPLICATION-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ @@ -163,8 +161,6 @@ static pjsip_module msg_sender = -1, /* Id */ PJSIP_MOD_PRIORITY_APPLICATION-1, /* Priority */ NULL, /* User data. */ - 0, /* Number of methods supported (=0). */ - { 0 }, /* Array of methods (none) */ NULL, /* load() */ NULL, /* start() */ NULL, /* stop() */ diff --git a/pjsip/src/test-pjsip/txdata_test.c b/pjsip/src/test-pjsip/txdata_test.c index 327ea084..d39fad42 100644 --- a/pjsip/src/test-pjsip/txdata_test.c +++ b/pjsip/src/test-pjsip/txdata_test.c @@ -18,7 +18,7 @@ */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define HFIND(msg,h,H) ((pjsip_##h##_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_##H, NULL)) diff --git a/pjsip/src/test-pjsip/uri_test.c b/pjsip/src/test-pjsip/uri_test.c index 28bdedd9..a221f4ca 100644 --- a/pjsip/src/test-pjsip/uri_test.c +++ b/pjsip/src/test-pjsip/uri_test.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "test.h" -#include <pjsip_core.h> +#include <pjsip.h> #include <pjlib.h> #define THIS_FILE "uri_test.c" @@ -317,7 +317,7 @@ struct uri_test static pjsip_uri *create_uri0(pj_pool_t *pool) { /* "sip:localhost" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "localhost"); return (pjsip_uri*)url; @@ -326,7 +326,7 @@ static pjsip_uri *create_uri0(pj_pool_t *pool) static pjsip_uri *create_uri1(pj_pool_t *pool) { /* "sip:user@localhost" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2( pool, &url->user, "user"); pj_strdup2( pool, &url->host, "localhost"); @@ -337,7 +337,7 @@ static pjsip_uri *create_uri1(pj_pool_t *pool) static pjsip_uri *create_uri2(pj_pool_t *pool) { /* "sip:user:password@localhost:5060" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2( pool, &url->user, "user"); pj_strdup2( pool, &url->passwd, "password"); @@ -350,7 +350,7 @@ static pjsip_uri *create_uri2(pj_pool_t *pool) static pjsip_uri *create_uri3(pj_pool_t *pool) { /* Like: "sip:localhost:5060", but without the port. */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "localhost"); return (pjsip_uri*)url; @@ -359,7 +359,7 @@ static pjsip_uri *create_uri3(pj_pool_t *pool) static pjsip_uri *create_uri4(pj_pool_t *pool) { /* "sip:localhost;transport=tcp;user=ip;ttl=255;lr;maddr=127.0.0.1;method=ACK" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "localhost"); pj_strdup2(pool, &url->transport_param, "tcp"); @@ -386,7 +386,7 @@ static pjsip_uri *create_uri5(pj_pool_t *pool) /* "sip:localhost;pickup=hurry;user=phone;message=I%20am%20sorry" "?Subject=Hello%20There&Server=SIP%20Server" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 0); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "localhost"); pj_strdup2(pool, &url->user_param, "phone"); @@ -405,7 +405,7 @@ static pjsip_uri *create_uri5(pj_pool_t *pool) static pjsip_uri *create_uri6(pj_pool_t *pool) { /* "sips:localhost" */ - pjsip_sip_uri *url = pjsip_url_create(pool, 1); + pjsip_sip_uri *url = pjsip_sip_uri_create(pool, 1); pj_strdup2(pool, &url->host, "localhost"); return (pjsip_uri*)url; @@ -417,7 +417,7 @@ static pjsip_uri *create_uri7(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &url->host, "localhost"); @@ -430,7 +430,7 @@ static pjsip_uri *create_uri8(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 1); + url = pjsip_sip_uri_create(pool, 1); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "Power Administrator"); @@ -444,7 +444,7 @@ static pjsip_uri *create_uri9(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "User"); @@ -460,7 +460,7 @@ static pjsip_uri *create_uri10(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "Strange User\\\"\\\\\\\""); @@ -474,7 +474,7 @@ static pjsip_uri *create_uri11(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "Rogue User\\"); @@ -488,7 +488,7 @@ static pjsip_uri *create_uri12(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "Strange User\""); @@ -500,7 +500,7 @@ static pjsip_uri *create_uri13(pj_pool_t *pool) { /* "sip:localhost;pvalue=\"hello world\"" */ pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "localhost"); //pj_strdup2(pool, &url->other_param, ";pvalue=\"hello world\""); param_add(url->other_param, "pvalue", "hello world"); @@ -513,7 +513,7 @@ static pjsip_uri *create_uri14(pj_pool_t *pool) pjsip_name_addr *name_addr = pjsip_name_addr_create(pool); pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); name_addr->uri = (pjsip_uri*) url; pj_strdup2(pool, &name_addr->display, "This is -. !% *_+`'~ me"); @@ -528,7 +528,7 @@ static pjsip_uri *create_uri15(pj_pool_t *pool) { /* "sip:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.com" */ pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, ALPHANUM "-_.com"); return (pjsip_uri*)url; } @@ -537,7 +537,7 @@ static pjsip_uri *create_uri16(pj_pool_t *pool) { /* "sip:" USER_CHAR ":" PASS_CHAR "@host" */ pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->user, USER_CHAR); pj_strdup2(pool, &url->passwd, PASS_CHAR); pj_strdup2(pool, &url->host, "host"); @@ -548,7 +548,7 @@ static pjsip_uri *create_uri17(pj_pool_t *pool) { /* "sip:host;user=ip;" PARAM_CHAR "%21=" PARAM_CHAR "%21;lr;other=1;transport=sctp;other2" */ pjsip_sip_uri *url; - url = pjsip_url_create(pool, 0); + url = pjsip_sip_uri_create(pool, 0); pj_strdup2(pool, &url->host, "host"); pj_strdup2(pool, &url->user_param, "ip"); pj_strdup2(pool, &url->transport_param, "sctp"); |