Module: kamailio Branch: 4.3 Commit: c58d4c4471f794944c60164a19ae3aa884fe2ade URL: https://github.com/kamailio/kamailio/commit/c58d4c4471f794944c60164a19ae3aa8...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2015-09-17T13:59:28+02:00

tm: test if transaction was suspended before resuming inside t_continue()

(cherry picked from commit 52c4965bbb4cde5d7bddcf697aa504e7c2202ac1)

---

Modified: modules/tm/t_suspend.c

---

Diff: https://github.com/kamailio/kamailio/commit/c58d4c4471f794944c60164a19ae3aa8... Patch: https://github.com/kamailio/kamailio/commit/c58d4c4471f794944c60164a19ae3aa8...

---

diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index de18a2a..0658e39 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -106,10 +106,10 @@ int t_suspend(struct sip_msg *msg, * - failure route to be executed if the branch is not continued * before timeout */ t->uac[t->async_backup.blind_uac].on_failure = t->on_failure; + t->flags |= T_ASYNC_SUSPENDED; } else { LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED; - t->flags |= T_ASYNC_SUSPENDED; /* this is a reply suspend find which branch */

if (t_check( msg , &branch )==-1){ @@ -131,6 +131,7 @@ int t_suspend(struct sip_msg *msg,

LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; + t->flags |= T_ASYNC_SUSPENDED; }

*hash_index = t->hash_index; @@ -176,7 +177,13 @@ int t_continue(unsigned int hash_index, unsigned int label, return -1; }

+ if (!(t->flags & T_ASYNC_SUSPENDED)) { + LM_ERR("transaction is not suspended [%u:%u]\n", hash_index, label); + return -2; + } + if (t->flags & T_CANCELED) { + t->flags &= ~T_ASYNC_SUSPENDED; /* The transaction has already been canceled, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ @@ -219,6 +226,7 @@ int t_continue(unsigned int hash_index, unsigned int label, /* Either t_continue() has already been * called or the branch has already timed out. * Needless to continue. */ + t->flags &= ~T_ASYNC_SUSPENDED; UNLOCK_ASYNC_CONTINUE(t); UNREF(t); /* t_unref would kill the transaction */ return 1; @@ -443,9 +451,14 @@ int t_continue(unsigned int hash_index, unsigned int label, sip_msg_free(t->uac[branch].reply); t->uac[branch].reply = 0; } + + /*This transaction is no longer suspended so unsetting the SUSPEND flag*/ + t->flags &= ~T_ASYNC_SUSPENDED; + return 0;

kill_trans: + t->flags &= ~T_ASYNC_SUSPENDED; /* The script has hopefully set the error code. If not, * let us reply with a default error. */ if ((kill_transaction_unsafe(t,