Changeset 789 for pjproject/branches/symbian/pjsip/src/pjsip/sip_ua_layer.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_ua_layer.c
r416 r789 166 166 167 167 /* Get the dialog where this transaction belongs. */ 168 dlg = tsx->mod_data[mod_ua.mod.id];168 dlg = (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id]; 169 169 170 170 /* If dialog instance has gone, it could mean that the dialog … … 245 245 246 246 set_key->slen = call_id->slen + local_tag->slen + 1; 247 set_key->ptr = pj_pool_alloc(pool, set_key->slen);247 set_key->ptr = (char*) pj_pool_alloc(pool, set_key->slen); 248 248 pj_assert(set_key->ptr != NULL); 249 249 … … 268 268 return set; 269 269 } else { 270 set = pj_pool_alloc(mod_ua.pool, sizeof(struct dlg_set)); 270 set = (struct dlg_set *) 271 pj_pool_alloc(mod_ua.pool, sizeof(struct dlg_set)); 271 272 return set; 272 273 } … … 299 300 struct dlg_set *dlg_set; 300 301 301 dlg_set = pj_hash_get( mod_ua.dlg_table, dlg->local.info->tag.ptr, 302 dlg_set = (struct dlg_set *) 303 pj_hash_get( mod_ua.dlg_table, dlg->local.info->tag.ptr, 302 304 dlg->local.info->tag.slen, 303 305 &dlg->local.tag_hval); … … 367 369 368 370 /* Find this dialog from the dialog set. */ 369 dlg_set = dlg->dlg_set;371 dlg_set = (struct dlg_set *) dlg->dlg_set; 370 372 d = dlg_set->dlg_list.next; 371 373 while (d != (pjsip_dialog*)&dlg_set->dlg_list && d != dlg) { … … 401 403 PJ_DEF(pjsip_dialog*) pjsip_rdata_get_dlg( pjsip_rx_data *rdata ) 402 404 { 403 return rdata->endpt_info.mod_data[mod_ua.mod.id];405 return (pjsip_dialog*) rdata->endpt_info.mod_data[mod_ua.mod.id]; 404 406 } 405 407 406 408 PJ_DEF(pjsip_dialog*) pjsip_tsx_get_dlg( pjsip_transaction *tsx ) 407 409 { 408 return tsx->mod_data[mod_ua.mod.id];410 return (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id]; 409 411 } 410 412 … … 442 444 /* We should find the dialog attached to the INVITE transaction */ 443 445 if (tsx) { 444 dlg = tsx->mod_data[mod_ua.mod.id];446 dlg = (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id]; 445 447 pj_mutex_unlock(tsx->mutex); 446 448 … … 448 450 * (e.g. during debugging where initially there is a dialog) 449 451 */ 450 return dlg ? dlg->dlg_set : NULL;452 return dlg ? (struct dlg_set *)dlg->dlg_set : NULL; 451 453 452 454 } else { … … 465 467 466 468 /* Lookup the dialog set. */ 467 dlg_set = pj_hash_get(mod_ua.dlg_table, tag->ptr, tag->slen, NULL); 469 dlg_set = (struct dlg_set *) 470 pj_hash_get(mod_ua.dlg_table, tag->ptr, tag->slen, NULL); 468 471 return dlg_set; 469 472 } … … 594 597 595 598 /* Get the dialog set. */ 596 dlg_set = dlg->dlg_set;599 dlg_set = (struct dlg_set *)dlg->dlg_set; 597 600 598 601 /* Even if transaction is found and (candidate) dialog has been … … 622 625 623 626 /* Get the dialog set. */ 624 dlg_set = pj_hash_get(mod_ua.dlg_table, 627 dlg_set = (struct dlg_set *) 628 pj_hash_get(mod_ua.dlg_table, 625 629 rdata->msg_info.from->tag.ptr, 626 630 rdata->msg_info.from->tag.slen, … … 801 805 const char *title; 802 806 803 dlg_set = pj_hash_this(mod_ua.dlg_table, it);807 dlg_set = (struct dlg_set *) pj_hash_this(mod_ua.dlg_table, it); 804 808 if (!dlg_set || pj_list_empty(&dlg_set->dlg_list)) continue; 805 809
Note: See TracChangeset
for help on using the changeset viewer.