Changeset 57 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c
- Timestamp:
- Nov 19, 2005 1:20:08 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_transport.c
r54 r57 43 43 pj_lock_t *lock; 44 44 pjsip_endpoint *endpt; 45 pj_ioqueue_t *ioqueue;46 pj_timer_heap_t *timer_heap;47 45 pjsip_tpfactory factory_list; 48 46 void (*msg_cb)(pjsip_endpoint*, pj_status_t, pjsip_rx_data*); … … 357 355 if (pj_atomic_get(tp->ref_cnt) == 1) { 358 356 if (tp->idle_timer.id != PJ_FALSE) { 359 pj _timer_heap_cancel(tp->tpmgr->timer_heap, &tp->idle_timer);357 pjsip_endpt_cancel_timer(tp->tpmgr->endpt, &tp->idle_timer); 360 358 tp->idle_timer.id = PJ_FALSE; 361 359 } … … 384 382 pj_assert(tp->idle_timer.id == 0); 385 383 tp->idle_timer.id = PJ_TRUE; 386 pj_timer_heap_schedule(tp->tpmgr->timer_heap, &tp->idle_timer, &delay); 384 pjsip_endpt_schedule_timer(tp->tpmgr->endpt, &tp->idle_timer, 385 &delay); 387 386 } 388 387 pj_lock_release(tp->tpmgr->lock); … … 441 440 pj_assert(tp->idle_timer.id == PJ_FALSE); 442 441 if (tp->idle_timer.id != PJ_FALSE) { 443 pj _timer_heap_cancel(mgr->timer_heap, &tp->idle_timer);442 pjsip_endpt_cancel_timer(mgr->endpt, &tp->idle_timer); 444 443 tp->idle_timer.id = PJ_FALSE; 445 444 } … … 532 531 PJ_DEF(pj_status_t) pjsip_tpmgr_create( pj_pool_t *pool, 533 532 pjsip_endpoint *endpt, 534 pj_ioqueue_t *ioqueue,535 pj_timer_heap_t *timer_heap,536 533 void (*cb)(pjsip_endpoint*, 537 534 pj_status_t, … … 549 546 mgr->endpt = endpt; 550 547 mgr->msg_cb = cb; 551 mgr->ioqueue = ioqueue;552 mgr->timer_heap = timer_heap;553 548 pj_list_init(&mgr->factory_list); 554 549 … … 593 588 itr = next; 594 589 } 595 pj_ioqueue_destroy(mgr->ioqueue);596 590 597 591 pj_lock_release(mgr->lock); … … 802 796 /* Request factory to create transport. */ 803 797 status = factory->create_transport(factory, mgr, mgr->endpt, 804 mgr->ioqueue,remote, p_transport);798 remote, p_transport); 805 799 806 800 pj_lock_release(mgr->lock);
Note: See TracChangeset
for help on using the changeset viewer.