diff options
Diffstat (limited to 'pjsip/src/pjsip/sip_msg.c')
-rw-r--r-- | pjsip/src/pjsip/sip_msg.c | 103 |
1 files changed, 52 insertions, 51 deletions
diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c index 47c493db..f94cd315 100644 --- a/pjsip/src/pjsip/sip_msg.c +++ b/pjsip/src/pjsip/sip_msg.c @@ -240,7 +240,7 @@ PJ_DEF(int) pjsip_method_cmp( const pjsip_method *m1, const pjsip_method *m2) PJ_DEF(pjsip_msg*) pjsip_msg_create( pj_pool_t *pool, pjsip_msg_type_e type) { - pjsip_msg *msg = pj_pool_alloc(pool, sizeof(pjsip_msg)); + pjsip_msg *msg = PJ_POOL_ALLOC_T(pool, pjsip_msg); pj_list_init(&msg->hdr); msg->type = type; msg->body = NULL; @@ -257,7 +257,8 @@ PJ_DEF(pjsip_msg*) pjsip_msg_clone( pj_pool_t *pool, const pjsip_msg *src) /* Clone request/status line */ if (src->type == PJSIP_REQUEST_MSG) { pjsip_method_copy(pool, &dst->line.req.method, &src->line.req.method); - dst->line.req.uri = pjsip_uri_clone(pool, src->line.req.uri); + dst->line.req.uri = (pjsip_uri*) pjsip_uri_clone(pool, + src->line.req.uri); } else { dst->line.status.code = src->line.status.code; pj_strdup(pool, &dst->line.status.reason, &src->line.status.reason); @@ -266,7 +267,7 @@ PJ_DEF(pjsip_msg*) pjsip_msg_clone( pj_pool_t *pool, const pjsip_msg *src) /* Clone headers */ sh = src->hdr.next; while (sh != &src->hdr) { - pjsip_hdr *dh = pjsip_hdr_clone(pool, sh); + pjsip_hdr *dh = (pjsip_hdr*) pjsip_hdr_clone(pool, sh); pjsip_msg_add_hdr(dst, dh); sh = sh->next; } @@ -282,7 +283,7 @@ PJ_DEF(pjsip_msg*) pjsip_msg_clone( pj_pool_t *pool, const pjsip_msg *src) PJ_DEF(void*) pjsip_msg_find_hdr( const pjsip_msg *msg, pjsip_hdr_e hdr_type, const void *start) { - const pjsip_hdr *hdr=start, *end=&msg->hdr; + const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=&msg->hdr; if (hdr == NULL) { hdr = msg->hdr.next; @@ -298,7 +299,7 @@ PJ_DEF(void*) pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, const pj_str_t *name, const void *start) { - const pjsip_hdr *hdr=start, *end=&msg->hdr; + const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr; if (hdr == NULL) { hdr = msg->hdr.next; @@ -318,7 +319,7 @@ PJ_DEF(void*) pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, PJ_DEF(void*) pjsip_msg_find_remove_hdr( pjsip_msg *msg, pjsip_hdr_e hdr_type, void *start) { - pjsip_hdr *hdr = pjsip_msg_find_hdr(msg, hdr_type, start); + pjsip_hdr *hdr = (pjsip_hdr*) pjsip_msg_find_hdr(msg, hdr_type, start); if (hdr) { pj_list_erase(hdr); } @@ -350,7 +351,7 @@ PJ_DEF(pj_ssize_t) pjsip_msg_print( const pjsip_msg *msg, *p++ = ' '; /* Add URI */ - uri = pjsip_uri_get_uri(msg->line.req.uri); + uri = (pjsip_uri*) pjsip_uri_get_uri(msg->line.req.uri); len = pjsip_uri_print( PJSIP_URI_IN_REQ_URI, uri, p, end-p); if (len < 1) return -1; @@ -484,20 +485,20 @@ PJ_DEF(pj_ssize_t) pjsip_msg_print( const pjsip_msg *msg, /////////////////////////////////////////////////////////////////////////////// PJ_DEF(void*) pjsip_hdr_clone( pj_pool_t *pool, const void *hdr_ptr ) { - const pjsip_hdr *hdr = hdr_ptr; + const pjsip_hdr *hdr = (const pjsip_hdr*) hdr_ptr; return (*hdr->vptr->clone)(pool, hdr_ptr); } PJ_DEF(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr_ptr ) { - const pjsip_hdr *hdr = hdr_ptr; + const pjsip_hdr *hdr = (const pjsip_hdr*) hdr_ptr; return (*hdr->vptr->shallow_clone)(pool, hdr_ptr); } PJ_DEF(int) pjsip_hdr_print_on( void *hdr_ptr, char *buf, pj_size_t len) { - pjsip_hdr *hdr = hdr_ptr; + pjsip_hdr *hdr = (pjsip_hdr*) hdr_ptr; return (*hdr->vptr->print_on)(hdr_ptr, buf, len); } @@ -562,7 +563,7 @@ pjsip_generic_string_hdr_init( pj_pool_t *pool, const pj_str_t *hnames, const pj_str_t *hvalue) { - pjsip_generic_string_hdr *hdr = mem; + pjsip_generic_string_hdr *hdr = (pjsip_generic_string_hdr*) mem; pj_str_t dup_hname, dup_hval; if (hnames) { @@ -624,7 +625,7 @@ static pjsip_generic_string_hdr* pjsip_generic_string_hdr_clone( pj_pool_t *pool static pjsip_generic_string_hdr* pjsip_generic_string_hdr_shallow_clone( pj_pool_t *pool, const pjsip_generic_string_hdr *rhs ) { - pjsip_generic_string_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_generic_string_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_string_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); return hdr; } @@ -653,7 +654,7 @@ PJ_DEF(pjsip_generic_int_hdr*) pjsip_generic_int_hdr_init( pj_pool_t *pool, const pj_str_t *hnames, int value) { - pjsip_generic_int_hdr *hdr = mem; + pjsip_generic_int_hdr *hdr = (pjsip_generic_int_hdr*) mem; init_hdr(hdr, PJSIP_H_OTHER, &generic_int_hdr_vptr); if (hnames) { @@ -693,7 +694,7 @@ static int pjsip_generic_int_hdr_print( pjsip_generic_int_hdr *hdr, static pjsip_generic_int_hdr* pjsip_generic_int_hdr_clone( pj_pool_t *pool, const pjsip_generic_int_hdr *rhs) { - pjsip_generic_int_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_generic_int_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_int_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); return hdr; } @@ -701,7 +702,7 @@ static pjsip_generic_int_hdr* pjsip_generic_int_hdr_clone( pj_pool_t *pool, static pjsip_generic_int_hdr* pjsip_generic_int_hdr_shallow_clone( pj_pool_t *pool, const pjsip_generic_int_hdr *rhs ) { - pjsip_generic_int_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_generic_int_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_int_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); return hdr; } @@ -728,7 +729,7 @@ PJ_DEF(pjsip_generic_array_hdr*) pjsip_generic_array_hdr_init( pj_pool_t *pool, void *mem, const pj_str_t *hnames) { - pjsip_generic_array_hdr *hdr = mem; + pjsip_generic_array_hdr *hdr = (pjsip_generic_array_hdr*) mem; init_hdr(hdr, PJSIP_H_OTHER, &generic_array_hdr_vptr); if (hnames) { @@ -772,7 +773,7 @@ static pjsip_generic_array_hdr* pjsip_generic_array_hdr_clone( pj_pool_t *pool, const pjsip_generic_array_hdr *rhs) { unsigned i; - pjsip_generic_array_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_generic_array_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_array_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); for (i=0; i<rhs->count; ++i) { @@ -786,7 +787,7 @@ static pjsip_generic_array_hdr* pjsip_generic_array_hdr_clone( pj_pool_t *pool, static pjsip_generic_array_hdr* pjsip_generic_array_hdr_shallow_clone( pj_pool_t *pool, const pjsip_generic_array_hdr *rhs) { - pjsip_generic_array_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_generic_array_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_generic_array_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); return hdr; } @@ -798,7 +799,7 @@ static pjsip_generic_array_hdr* pjsip_generic_array_hdr_shallow_clone( pj_pool_t PJ_DEF(pjsip_accept_hdr*) pjsip_accept_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_accept_hdr *hdr = mem; + pjsip_accept_hdr *hdr = (pjsip_accept_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -822,7 +823,7 @@ PJ_DEF(pjsip_accept_hdr*) pjsip_accept_hdr_create(pj_pool_t *pool) PJ_DEF(pjsip_allow_hdr*) pjsip_allow_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_allow_hdr *hdr = mem; + pjsip_allow_hdr *hdr = (pjsip_allow_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -845,7 +846,7 @@ PJ_DEF(pjsip_allow_hdr*) pjsip_allow_hdr_create(pj_pool_t *pool) PJ_DEF(pjsip_cid_hdr*) pjsip_cid_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_cid_hdr *hdr = mem; + pjsip_cid_hdr *hdr = (pjsip_cid_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -879,7 +880,7 @@ static pjsip_hdr_vptr clen_hdr_vptr = PJ_DEF(pjsip_clen_hdr*) pjsip_clen_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_clen_hdr *hdr = mem; + pjsip_clen_hdr *hdr = (pjsip_clen_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -941,7 +942,7 @@ static pjsip_hdr_vptr cseq_hdr_vptr = PJ_DEF(pjsip_cseq_hdr*) pjsip_cseq_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_cseq_hdr *hdr = mem; + pjsip_cseq_hdr *hdr = (pjsip_cseq_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -996,7 +997,7 @@ static pjsip_cseq_hdr* pjsip_cseq_hdr_clone( pj_pool_t *pool, static pjsip_cseq_hdr* pjsip_cseq_hdr_shallow_clone( pj_pool_t *pool, const pjsip_cseq_hdr *rhs ) { - pjsip_cseq_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_cseq_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_cseq_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); return hdr; } @@ -1020,7 +1021,7 @@ static pjsip_hdr_vptr contact_hdr_vptr = PJ_DEF(pjsip_contact_hdr*) pjsip_contact_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_contact_hdr *hdr = mem; + pjsip_contact_hdr *hdr = (pjsip_contact_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1112,7 +1113,7 @@ static pjsip_contact_hdr* pjsip_contact_hdr_clone(pj_pool_t *pool, if (hdr->star) return hdr; - hdr->uri = pjsip_uri_clone(pool, rhs->uri); + hdr->uri = (pjsip_uri*) pjsip_uri_clone(pool, rhs->uri); hdr->q1000 = rhs->q1000; hdr->expires = rhs->expires; pjsip_param_clone(pool, &hdr->other_param, &rhs->other_param); @@ -1123,7 +1124,7 @@ static pjsip_contact_hdr* pjsip_contact_hdr_shallow_clone( pj_pool_t *pool, const pjsip_contact_hdr *rhs) { - pjsip_contact_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_contact_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_contact_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param); return hdr; @@ -1149,7 +1150,7 @@ static pjsip_hdr_vptr ctype_hdr_vptr = PJ_DEF(pjsip_ctype_hdr*) pjsip_ctype_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_ctype_hdr *hdr = mem; + pjsip_ctype_hdr *hdr = (pjsip_ctype_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1227,7 +1228,7 @@ PJ_DEF(pjsip_expires_hdr*) pjsip_expires_hdr_init( pj_pool_t *pool, void *mem, int value) { - pjsip_expires_hdr *hdr = mem; + pjsip_expires_hdr *hdr = (pjsip_expires_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1266,7 +1267,7 @@ static pjsip_hdr_vptr fromto_hdr_vptr = PJ_DEF(pjsip_from_hdr*) pjsip_from_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_from_hdr *hdr = mem; + pjsip_from_hdr *hdr = (pjsip_from_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1285,7 +1286,7 @@ PJ_DEF(pjsip_from_hdr*) pjsip_from_hdr_create( pj_pool_t *pool ) PJ_DEF(pjsip_to_hdr*) pjsip_to_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_to_hdr *hdr = mem; + pjsip_to_hdr *hdr = (pjsip_to_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1354,7 +1355,7 @@ static pjsip_fromto_hdr* pjsip_fromto_hdr_clone( pj_pool_t *pool, hdr->type = rhs->type; hdr->name = rhs->name; hdr->sname = rhs->sname; - hdr->uri = pjsip_uri_clone(pool, rhs->uri); + hdr->uri = (pjsip_uri*) pjsip_uri_clone(pool, rhs->uri); pj_strdup( pool, &hdr->tag, &rhs->tag); pjsip_param_clone( pool, &hdr->other_param, &rhs->other_param); @@ -1365,7 +1366,7 @@ static pjsip_fromto_hdr* pjsip_fromto_hdr_shallow_clone( pj_pool_t *pool, const pjsip_fromto_hdr *rhs) { - pjsip_fromto_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_fromto_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_fromto_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param); return hdr; @@ -1380,7 +1381,7 @@ PJ_DEF(pjsip_max_fwd_hdr*) pjsip_max_fwd_hdr_init( pj_pool_t *pool, void *mem, int value) { - pjsip_max_fwd_hdr *hdr = mem; + pjsip_max_fwd_hdr *hdr = (pjsip_max_fwd_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1406,7 +1407,7 @@ PJ_DEF(pjsip_min_expires_hdr*) pjsip_min_expires_hdr_init( pj_pool_t *pool, void *mem, int value ) { - pjsip_min_expires_hdr *hdr = mem; + pjsip_min_expires_hdr *hdr = (pjsip_min_expires_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1440,7 +1441,7 @@ static pjsip_hdr_vptr routing_hdr_vptr = PJ_DEF(pjsip_rr_hdr*) pjsip_rr_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_rr_hdr *hdr = mem; + pjsip_rr_hdr *hdr = (pjsip_rr_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1460,7 +1461,7 @@ PJ_DEF(pjsip_rr_hdr*) pjsip_rr_hdr_create( pj_pool_t *pool ) PJ_DEF(pjsip_route_hdr*) pjsip_route_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_route_hdr *hdr = mem; + pjsip_route_hdr *hdr = (pjsip_route_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1520,7 +1521,7 @@ static int pjsip_routing_hdr_print( pjsip_routing_hdr *hdr, static pjsip_routing_hdr* pjsip_routing_hdr_clone( pj_pool_t *pool, const pjsip_routing_hdr *rhs ) { - pjsip_routing_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_routing_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_routing_hdr); init_hdr(hdr, rhs->type, rhs->vptr); pjsip_name_addr_init(&hdr->name_addr); @@ -1532,7 +1533,7 @@ static pjsip_routing_hdr* pjsip_routing_hdr_clone( pj_pool_t *pool, static pjsip_routing_hdr* pjsip_routing_hdr_shallow_clone( pj_pool_t *pool, const pjsip_routing_hdr *rhs ) { - pjsip_routing_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_routing_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_routing_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); pjsip_param_shallow_clone( pool, &hdr->other_param, &rhs->other_param); return hdr; @@ -1546,7 +1547,7 @@ static pjsip_routing_hdr* pjsip_routing_hdr_shallow_clone( pj_pool_t *pool, PJ_DEF(pjsip_require_hdr*) pjsip_require_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_require_hdr *hdr = mem; + pjsip_require_hdr *hdr = (pjsip_require_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1569,7 +1570,7 @@ PJ_DEF(pjsip_retry_after_hdr*) pjsip_retry_after_hdr_init( pj_pool_t *pool, void *mem, int value ) { - pjsip_retry_after_hdr *hdr = mem; + pjsip_retry_after_hdr *hdr = (pjsip_retry_after_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1593,7 +1594,7 @@ PJ_DEF(pjsip_retry_after_hdr*) pjsip_retry_after_hdr_create(pj_pool_t *pool, PJ_DEF(pjsip_supported_hdr*) pjsip_supported_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_supported_hdr *hdr = mem; + pjsip_supported_hdr *hdr = (pjsip_supported_hdr*) mem; PJ_UNUSED_ARG(pool); init_hdr(hdr, PJSIP_H_SUPPORTED, &generic_array_hdr_vptr); @@ -1615,7 +1616,7 @@ PJ_DEF(pjsip_supported_hdr*) pjsip_supported_hdr_create(pj_pool_t *pool) PJ_DEF(pjsip_unsupported_hdr*) pjsip_unsupported_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_unsupported_hdr *hdr = mem; + pjsip_unsupported_hdr *hdr = (pjsip_unsupported_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1648,7 +1649,7 @@ static pjsip_hdr_vptr via_hdr_vptr = PJ_DEF(pjsip_via_hdr*) pjsip_via_hdr_init( pj_pool_t *pool, void *mem ) { - pjsip_via_hdr *hdr = mem; + pjsip_via_hdr *hdr = (pjsip_via_hdr*) mem; PJ_UNUSED_ARG(pool); @@ -1755,7 +1756,7 @@ static pjsip_via_hdr* pjsip_via_hdr_clone( pj_pool_t *pool, static pjsip_via_hdr* pjsip_via_hdr_shallow_clone( pj_pool_t *pool, const pjsip_via_hdr *rhs ) { - pjsip_via_hdr *hdr = pj_pool_alloc(pool, sizeof(*hdr)); + pjsip_via_hdr *hdr = PJ_POOL_ALLOC_T(pool, pjsip_via_hdr); pj_memcpy(hdr, rhs, sizeof(*hdr)); pjsip_param_shallow_clone(pool, &hdr->other_param, &rhs->other_param); return hdr; @@ -1773,9 +1774,9 @@ PJ_DEF(pjsip_warning_hdr*) pjsip_warning_hdr_create( pj_pool_t *pool, const pj_str_t str_warning = { "Warning", 7 }; pj_str_t hvalue; - hvalue.ptr = pj_pool_alloc(pool, 10 + /* code */ - host->slen + 2 + /* host */ - text->slen + 2); /* text */ + hvalue.ptr = (char*) pj_pool_alloc(pool, 10 + /* code */ + host->slen + 2 + /* host */ + text->slen + 2); /* text */ hvalue.slen = pj_ansi_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"", code, (int)host->slen, host->ptr, (int)text->slen, text->ptr); @@ -1813,7 +1814,7 @@ PJ_DEF(void*) pjsip_clone_text_data( pj_pool_t *pool, const void *data, char *newdata = ""; if (len) { - newdata = pj_pool_alloc(pool, len); + newdata = (char*) pj_pool_alloc(pool, len); pj_memcpy(newdata, data, len); } return newdata; @@ -1855,7 +1856,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_msg_body_clone( pj_pool_t *pool, pjsip_msg_body *new_body; pj_status_t status; - new_body = pj_pool_alloc(pool, sizeof(pjsip_msg_body)); + new_body = PJ_POOL_ALLOC_T(pool, pjsip_msg_body); PJ_ASSERT_RETURN(new_body, NULL); status = pjsip_msg_body_copy(pool, new_body, body); @@ -1873,7 +1874,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_msg_body_create( pj_pool_t *pool, PJ_ASSERT_RETURN(pool && type && subtype && text, NULL); - body = pj_pool_zalloc(pool, sizeof(pjsip_msg_body)); + body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body); PJ_ASSERT_RETURN(body != NULL, NULL); pj_strdup(pool, &body->content_type.type, type); |