Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_util.c
- Timestamp:
- Oct 29, 2006 6:13:13 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/symbian/pjsip/src/pjsip/sip_util.c
r448 r789 85 85 endpt_hdr = pjsip_endpt_get_request_headers(endpt)->next; 86 86 while (endpt_hdr != pjsip_endpt_get_request_headers(endpt)) { 87 pjsip_hdr *hdr = pjsip_hdr_shallow_clone(tdata->pool, endpt_hdr);87 pjsip_hdr *hdr = (pjsip_hdr *)pjsip_hdr_shallow_clone(tdata->pool, endpt_hdr); 88 88 pjsip_msg_add_hdr( tdata->msg, hdr ); 89 89 endpt_hdr = endpt_hdr->next; … … 93 93 if (param_from->tag.slen == 0) 94 94 pj_create_unique_string(tdata->pool, ¶m_from->tag); 95 pjsip_msg_add_hdr(msg, ( void*)param_from);95 pjsip_msg_add_hdr(msg, (pjsip_hdr*)param_from); 96 96 97 97 /* Add To header. */ 98 pjsip_msg_add_hdr(msg, ( void*)param_to);98 pjsip_msg_add_hdr(msg, (pjsip_hdr*)param_to); 99 99 100 100 /* Add Contact header. */ 101 101 if (param_contact) { 102 pjsip_msg_add_hdr(msg, ( void*)param_contact);102 pjsip_msg_add_hdr(msg, (pjsip_hdr*)param_contact); 103 103 } 104 104 105 105 /* Add Call-ID header. */ 106 pjsip_msg_add_hdr(msg, ( void*)param_call_id);106 pjsip_msg_add_hdr(msg, (pjsip_hdr*)param_call_id); 107 107 108 108 /* Add CSeq header. */ 109 pjsip_msg_add_hdr(msg, ( void*)param_cseq);109 pjsip_msg_add_hdr(msg, (pjsip_hdr*)param_cseq); 110 110 111 111 /* Add a blank Via header in the front of the message. */ 112 112 via = pjsip_via_hdr_create(tdata->pool); 113 113 via->rport_param = 0; 114 pjsip_msg_insert_first_hdr(msg, ( void*)via);114 pjsip_msg_insert_first_hdr(msg, (pjsip_hdr*)via); 115 115 116 116 /* Add header params as request headers */ … … 135 135 /* Create message body. */ 136 136 if (param_text) { 137 body = pj_pool_calloc(tdata->pool, 1, sizeof(pjsip_msg_body));137 body = (pjsip_msg_body*) pj_pool_calloc(tdata->pool, 1, sizeof(pjsip_msg_body)); 138 138 body->content_type.type = str_TEXT; 139 139 body->content_type.subtype = str_PLAIN; … … 297 297 PJ_TRY { 298 298 /* Duplicate target URI and headers. */ 299 target = pjsip_uri_clone(tdata->pool, param_target);300 from = pjsip_hdr_clone(tdata->pool, param_from);299 target = (pjsip_uri*) pjsip_uri_clone(tdata->pool, param_target); 300 from = (pjsip_fromto_hdr*) pjsip_hdr_clone(tdata->pool, param_from); 301 301 pjsip_fromto_hdr_set_from(from); 302 to = pjsip_hdr_clone(tdata->pool, param_to);302 to = (pjsip_fromto_hdr*)pjsip_hdr_clone(tdata->pool, param_to); 303 303 pjsip_fromto_hdr_set_to(to); 304 304 if (param_contact) 305 contact = pjsip_hdr_clone(tdata->pool, param_contact);305 contact = (pjsip_contact_hdr*) pjsip_hdr_clone(tdata->pool, param_contact); 306 306 else 307 307 contact = NULL; 308 call_id = pjsip_hdr_clone(tdata->pool, param_call_id);308 call_id = (pjsip_cid_hdr*) pjsip_hdr_clone(tdata->pool, param_call_id); 309 309 cseq = pjsip_cseq_hdr_create(tdata->pool); 310 310 if (param_cseq >= 0) … … 386 386 via = rdata->msg_info.via; 387 387 while (via) { 388 pjsip_msg_add_hdr( msg, pjsip_hdr_clone(tdata->pool, via));388 pjsip_msg_add_hdr( msg, (pjsip_hdr*)pjsip_hdr_clone(tdata->pool, via)); 389 389 via = via->next; 390 390 if (via != (void*)&req_msg->hdr) 391 via = pjsip_msg_find_hdr(req_msg, PJSIP_H_VIA, via);391 via = (pjsip_via_hdr*) pjsip_msg_find_hdr(req_msg, PJSIP_H_VIA, via); 392 392 else 393 393 break; … … 395 395 396 396 /* Copy all Record-Route headers, in order. */ 397 rr = pjsip_msg_find_hdr(req_msg, PJSIP_H_RECORD_ROUTE, NULL);397 rr = (pjsip_route_hdr*) pjsip_msg_find_hdr(req_msg, PJSIP_H_RECORD_ROUTE, NULL); 398 398 while (rr) { 399 pjsip_msg_add_hdr(msg, pjsip_hdr_clone(tdata->pool, rr));399 pjsip_msg_add_hdr(msg, (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, rr)); 400 400 rr = rr->next; 401 401 if (rr != (void*)&req_msg->hdr) 402 rr = pjsip_msg_find_hdr(req_msg, PJSIP_H_RECORD_ROUTE, rr);402 rr = (pjsip_route_hdr*) pjsip_msg_find_hdr(req_msg, PJSIP_H_RECORD_ROUTE, rr); 403 403 else 404 404 break; … … 406 406 407 407 /* Copy Call-ID header. */ 408 hdr = pjsip_msg_find_hdr( req_msg, PJSIP_H_CALL_ID, NULL);409 pjsip_msg_add_hdr(msg, pjsip_hdr_clone(tdata->pool, hdr));408 hdr = (pjsip_hdr*) pjsip_msg_find_hdr( req_msg, PJSIP_H_CALL_ID, NULL); 409 pjsip_msg_add_hdr(msg, (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, hdr)); 410 410 411 411 /* Copy From header. */ 412 hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.from);412 hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, rdata->msg_info.from); 413 413 pjsip_msg_add_hdr( msg, hdr); 414 414 415 415 /* Copy To header. */ 416 hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.to);416 hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, rdata->msg_info.to); 417 417 pjsip_msg_add_hdr( msg, hdr); 418 418 419 419 /* Copy CSeq header. */ 420 hdr = pjsip_hdr_clone(tdata->pool, rdata->msg_info.cseq);420 hdr = (pjsip_hdr*) pjsip_hdr_clone(tdata->pool, rdata->msg_info.cseq); 421 421 pjsip_msg_add_hdr( msg, hdr); 422 422 … … 495 495 496 496 /* Clear Via headers in the new request. */ 497 while ((via= pjsip_msg_find_hdr(ack->msg, PJSIP_H_VIA, NULL)) != NULL)497 while ((via=(pjsip_hdr*)pjsip_msg_find_hdr(ack->msg, PJSIP_H_VIA, NULL)) != NULL) 498 498 pj_list_erase(via); 499 499 500 500 /* Must contain single Via, just as the original INVITE. */ 501 hdr = pjsip_msg_find_hdr( invite_msg, PJSIP_H_VIA, NULL);502 pjsip_msg_insert_first_hdr( ack->msg, pjsip_hdr_clone(ack->pool,hdr) );501 hdr = (pjsip_hdr*) pjsip_msg_find_hdr( invite_msg, PJSIP_H_VIA, NULL); 502 pjsip_msg_insert_first_hdr( ack->msg, (pjsip_hdr*) pjsip_hdr_clone(ack->pool,hdr) ); 503 503 504 504 /* If the original INVITE has Route headers, those header fields MUST 505 505 * appear in the ACK. 506 506 */ 507 hdr = pjsip_msg_find_hdr( invite_msg, PJSIP_H_ROUTE, NULL);507 hdr = (pjsip_hdr*) pjsip_msg_find_hdr( invite_msg, PJSIP_H_ROUTE, NULL); 508 508 while (hdr != NULL) { 509 pjsip_msg_add_hdr( ack->msg, pjsip_hdr_clone(ack->pool, hdr) );509 pjsip_msg_add_hdr( ack->msg, (pjsip_hdr*) pjsip_hdr_clone(ack->pool, hdr) ); 510 510 hdr = hdr->next; 511 511 if (hdr == &invite_msg->hdr) 512 512 break; 513 hdr = pjsip_msg_find_hdr( invite_msg, PJSIP_H_ROUTE, hdr);513 hdr = (pjsip_hdr*) pjsip_msg_find_hdr( invite_msg, PJSIP_H_ROUTE, hdr); 514 514 } 515 515 … … 579 579 580 580 /* Clear Via headers in the new request. */ 581 while ((via= pjsip_msg_find_hdr(cancel_tdata->msg, PJSIP_H_VIA, NULL)) != NULL)581 while ((via=(pjsip_hdr*)pjsip_msg_find_hdr(cancel_tdata->msg, PJSIP_H_VIA, NULL)) != NULL) 582 582 pj_list_erase(via); 583 583 … … 586 586 * request being cancelled. 587 587 */ 588 hdr = pjsip_msg_find_hdr(req_tdata->msg, PJSIP_H_VIA, NULL);588 hdr = (pjsip_hdr*) pjsip_msg_find_hdr(req_tdata->msg, PJSIP_H_VIA, NULL); 589 589 if (hdr) { 590 590 pjsip_msg_insert_first_hdr(cancel_tdata->msg, 591 pjsip_hdr_clone(cancel_tdata->pool, hdr));591 (pjsip_hdr*) pjsip_hdr_clone(cancel_tdata->pool, hdr)); 592 592 } 593 593 … … 596 596 * Copy "Route" header from the request. 597 597 */ 598 hdr = pjsip_msg_find_hdr(req_tdata->msg, PJSIP_H_ROUTE, NULL);598 hdr = (pjsip_hdr*) pjsip_msg_find_hdr(req_tdata->msg, PJSIP_H_ROUTE, NULL); 599 599 while (hdr != NULL) { 600 600 pjsip_msg_add_hdr(cancel_tdata->msg, 601 pjsip_hdr_clone(cancel_tdata->pool, hdr));601 (pjsip_hdr*) pjsip_hdr_clone(cancel_tdata->pool, hdr)); 602 602 hdr = hdr->next; 603 603 if (hdr != &cancel_tdata->msg->hdr) 604 hdr = pjsip_msg_find_hdr(cancel_tdata->msg, PJSIP_H_ROUTE, hdr);604 hdr = (pjsip_hdr*) pjsip_msg_find_hdr(cancel_tdata->msg, PJSIP_H_ROUTE, hdr); 605 605 else 606 606 break; … … 642 642 */ 643 643 last_route_hdr = first_route_hdr = 644 pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, NULL);644 (pjsip_route_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, NULL); 645 645 if (first_route_hdr) { 646 646 topmost_route_uri = &first_route_hdr->name_addr; 647 647 while (last_route_hdr->next != (void*)&tdata->msg->hdr) { 648 648 pjsip_route_hdr *hdr; 649 hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, 649 hdr = (pjsip_route_hdr*) 650 pjsip_msg_find_hdr(tdata->msg, PJSIP_H_ROUTE, 650 651 last_route_hdr->next); 651 652 if (!hdr) … … 672 673 PJSIP_URI_SCHEME_IS_SIPS(topmost_route_uri)) 673 674 { 674 const pjsip_sip_uri *url = 675 const pjsip_sip_uri *url = (const pjsip_sip_uri *) 675 676 pjsip_uri_get_uri((void*)topmost_route_uri); 676 677 has_lr_param = url->lr_param; … … 691 692 */ 692 693 } else { 693 new_request_uri = pjsip_uri_get_uri((void*)topmost_route_uri); 694 new_request_uri = (const pjsip_uri *) 695 pjsip_uri_get_uri((void*)topmost_route_uri); 694 696 pj_list_erase(first_route_hdr); 695 697 if (first_route_hdr == last_route_hdr) … … 758 760 pj_ssize_t sent ) 759 761 { 760 pjsip_send_state *stateless_data = token;762 pjsip_send_state *stateless_data = (pjsip_send_state *) token; 761 763 762 764 PJ_UNUSED_ARG(tdata); … … 858 860 if (via->branch_param.slen == 0) { 859 861 pj_str_t tmp; 860 via->branch_param.ptr = pj_pool_alloc(tdata->pool, 862 via->branch_param.ptr = (char*) 863 pj_pool_alloc(tdata->pool, 861 864 PJSIP_MAX_BRANCH_LEN); 862 865 via->branch_param.slen = PJSIP_MAX_BRANCH_LEN; … … 902 905 const struct pjsip_server_addresses *addr) 903 906 { 904 pjsip_send_state *stateless_data = token;907 pjsip_send_state *stateless_data = (pjsip_send_state *) token; 905 908 906 909 /* Fail on server resolution. */ … … 950 953 951 954 /* Keep stateless data. */ 952 stateless_data = pj_pool_zalloc(tdata->pool, sizeof(pjsip_send_state)); 955 stateless_data = (pjsip_send_state *) 956 pj_pool_zalloc(tdata->pool, sizeof(pjsip_send_state)); 953 957 stateless_data->token = token; 954 958 stateless_data->endpt = endpt; … … 1073 1077 pj_ssize_t sent) 1074 1078 { 1075 pjsip_send_state *send_state = token;1079 pjsip_send_state *send_state = (pjsip_send_state *) token; 1076 1080 pj_bool_t cont = PJ_FALSE; 1077 1081 … … 1093 1097 const pjsip_server_addresses *addr ) 1094 1098 { 1095 pjsip_send_state *send_state = token;1099 pjsip_send_state *send_state = (pjsip_send_state *) token; 1096 1100 1097 1101 if (status != PJ_SUCCESS) { … … 1161 1165 1162 1166 /* Create structure to keep the sending state. */ 1163 send_state = pj_pool_zalloc(tdata->pool, sizeof(pjsip_send_state)); 1167 send_state = (pjsip_send_state *) 1168 pj_pool_zalloc(tdata->pool, sizeof(pjsip_send_state)); 1164 1169 send_state->endpt = endpt; 1165 1170 send_state->tdata = tdata; … … 1229 1234 const pjsip_hdr *hdr = hdr_list->next; 1230 1235 while (hdr != hdr_list) { 1231 pjsip_msg_add_hdr( tdata->msg, pjsip_hdr_clone(tdata->pool, hdr) );1236 pjsip_msg_add_hdr( tdata->msg, (pjsip_hdr*)pjsip_hdr_clone(tdata->pool, hdr) ); 1232 1237 hdr = hdr->next; 1233 1238 }
Note: See TracChangeset
for help on using the changeset viewer.