sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ticket #906: Transaction is not destroyed when transport timeout event comes later than transaction timeout (thanks Norma Steveley for the report) 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@2797 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2009-06-25 10:05:18 +00:00
parent 324fccc932
commit 45fe2e81e2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pjsip/src/pjsip/sip_transaction.c
View File

@ -1697,7 +1697,10 @@ static void send_msg_callback( pjsip_send_state *send_state,
tsx->transport = NULL;
}
if (!*cont) {
/* Also stop processing if transaction has been flagged with
* pending destroy (http://trac.pjsip.org/repos/ticket/906)
*/
if ((!*cont) || (tsx->transport_flag & TSX_HAS_PENDING_DESTROY)) {
char errmsg[PJ_ERR_MSG_SIZE];
pjsip_status_code sc;
pj_str_t err;
@ -1733,6 +1736,14 @@ static void send_msg_callback( pjsip_send_state *send_state,
{
tsx_set_state( tsx, PJSIP_TSX_STATE_TERMINATED,
PJSIP_EVENT_TRANSPORT_ERROR, send_state->tdata);
}
/* Don't forget to destroy if we have pending destroy flag
* (http://trac.pjsip.org/repos/ticket/906)
*/
else if (tsx->transport_flag & TSX_HAS_PENDING_DESTROY)
{
tsx_set_state( tsx, PJSIP_TSX_STATE_DESTROYED,
PJSIP_EVENT_TRANSPORT_ERROR, send_state->tdata);
}
} else {