Changeset 4094


Ignore:
Timestamp:
Apr 26, 2012 9:31:00 AM (7 years ago)
Author:
bennylp
Message:

Re #1474: merged r4081-r4093

Location:
pjproject/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/pjsip/include/pjsip/sip_config.h

    r4038 r4094  
    432432 * seconds. 
    433433 * 
    434  * Default: 30 
     434 * Note that if the value is put lower than 33 seconds, it may cause some 
     435 * pjsip test units to fail. See the comment on the following link: 
     436 * https://trac.pjsip.org/repos/ticket/1465#comment:4 
     437 * 
     438 * Default: 33 
    435439 */ 
    436440#ifndef PJSIP_TRANSPORT_IDLE_TIME 
    437 #   define PJSIP_TRANSPORT_IDLE_TIME    30 
     441#   define PJSIP_TRANSPORT_IDLE_TIME    33 
    438442#endif 
    439443 
  • pjproject/trunk/pjsip/src/pjsip/sip_transport.c

    r4038 r4094  
    660660    } 
    661661 
     662    /* Add reference to prevent deletion, and to cancel idle timer if 
     663     * it's running. 
     664     */ 
     665    pjsip_transport_add_ref(tr); 
     666 
    662667    /* Fill in tp_info. */ 
    663668    tdata->tp_info.transport = tr; 
     
    677682    if (tr->tpmgr->on_tx_msg) { 
    678683        status = (*tr->tpmgr->on_tx_msg)(tr->endpt, tdata); 
    679         if (status != PJ_SUCCESS) 
     684        if (status != PJ_SUCCESS) { 
     685            pjsip_transport_dec_ref(tr); 
    680686            return status; 
     687        } 
    681688    } 
    682689 
     
    700707    } 
    701708 
     709    pjsip_transport_dec_ref(tr); 
    702710    return status; 
    703711} 
  • pjproject/trunk/pjsip/src/test/regc_test.c

    r3553 r4094  
    773773            /* client expected results: */ 
    774774            /* error    code    have_reg    expiration  contact_cnt auth?*/ 
    775             { PJ_FALSE, 503,    PJ_FALSE,   -1,         0,          PJ_FALSE} 
     775            { PJ_FALSE, 502,    PJ_FALSE,   -1,         0,          PJ_FALSE} 
    776776        }, 
    777777 
Note: See TracChangeset for help on using the changeset viewer.