Ignore:
Timestamp:
Feb 27, 2013 11:57:43 AM (6 years ago)
Author:
ming
Message:

Re #1583: Backported to 1.x

Location:
pjproject/branches/1.x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/pjsip/src/pjsip/sip_transport_tcp.c

    r3553 r4393  
    7474    PJ_DECL_LIST_MEMBER(struct delayed_tdata); 
    7575    pjsip_tx_data_op_key    *tdata_op_key; 
     76    pj_time_val              timeout; 
    7677}; 
    7778 
     
    650651static void tcp_flush_pending_tx(struct tcp_transport *tcp) 
    651652{ 
     653    pj_time_val now; 
     654 
     655    pj_gettickcount(&now); 
    652656    pj_lock_acquire(tcp->base.lock); 
    653657    while (!pj_list_empty(&tcp->delayed_list)) { 
     
    663667        tdata = pending_tx->tdata_op_key->tdata; 
    664668        op_key = (pj_ioqueue_op_key_t*)pending_tx->tdata_op_key; 
     669 
     670        if (pending_tx->timeout.sec > 0 && 
     671            PJ_TIME_VAL_GT(now, pending_tx->timeout)) 
     672        { 
     673            continue; 
     674        } 
    665675 
    666676        /* send! */ 
     
    11231133             * connect() is still in progress. Put the transmit data to 
    11241134             * the delayed list. 
     1135             * Starting from #1583 (https://trac.pjsip.org/repos/ticket/1583), 
     1136             * we also add timeout value for the transmit data. When the 
     1137             * connect() is completed, the timeout value will be checked to 
     1138             * determine whether the transmit data needs to be sent. 
    11251139             */ 
    1126             delayed_tdata = PJ_POOL_ALLOC_T(tdata->pool,  
    1127                                             struct delayed_tdata); 
     1140            delayed_tdata = PJ_POOL_ZALLOC_T(tdata->pool,  
     1141                                             struct delayed_tdata); 
    11281142            delayed_tdata->tdata_op_key = &tdata->op_key; 
     1143            if (tdata->msg && tdata->msg->type == PJSIP_REQUEST_MSG) { 
     1144                pj_gettickcount(&delayed_tdata->timeout); 
     1145                delayed_tdata->timeout.msec += pjsip_cfg()->tsx.td; 
     1146                pj_time_val_normalize(&delayed_tdata->timeout); 
     1147            } 
    11291148 
    11301149            pj_list_push_back(&tcp->delayed_list, delayed_tdata); 
Note: See TracChangeset for help on using the changeset viewer.