Index: channels/chan_sip.c =================================================================== --- channels/chan_sip.c (revision 369436) +++ channels/chan_sip.c (working copy) @@ -3872,7 +3872,7 @@ ast_debug(3, "Re-scheduled destruction of SIP call %s\n", p->callid ? p->callid : ""); append_history(p, "ReliableXmit", "timeout"); if (sscanf(p->lastmsg, "Tx: %30s", method_str) == 1 || sscanf(p->lastmsg, "Rx: %30s", method_str) == 1) { - if (method_match(SIP_CANCEL, method_str) || method_match(SIP_BYE, method_str)) { + if (p->ongoing_reinvite || method_match(SIP_CANCEL, method_str) || method_match(SIP_BYE, method_str)) { pvt_set_needdestroy(p, "autodestruct"); } } @@ -6266,6 +6266,21 @@ return 0; } +static int reinvite_timeout(const void *data) +{ + struct sip_pvt *dialog = (struct sip_pvt *) data; + struct ast_channel *owner = sip_pvt_lock_full(dialog); + dialog->reinviteid = -1; + check_pendings(dialog); + if (owner) { + ast_channel_unlock(owner); + ast_channel_unref(owner); + } + ao2_unlock(dialog); + dialog_unref(dialog, "unref for reinvite timeout"); + return 0; +} + /*! \brief sip_hangup: Hangup SIP call * Part of PBX interface, called from ast_hangup */ static int sip_hangup(struct ast_channel *ast) @@ -6454,8 +6469,16 @@ ast_set_flag(&p->flags[0], SIP_PENDINGBYE); ast_clear_flag(&p->flags[0], SIP_NEEDREINVITE); AST_SCHED_DEL_UNREF(sched, p->waitid, dialog_unref(p, "when you delete the waitid sched, you should dec the refcount for the stored dialog ptr")); - if (sip_cancel_destroy(p)) + if (sip_cancel_destroy(p)) { ast_log(LOG_WARNING, "Unable to cancel SIP destruction. Expect bad things.\n"); + } + /* If we have an ongoing reinvite, there is a chance that we have gotten a provisional + * response, but something weird has happened and we will never receive a final response. + * So, just in case, check for pending actions after a bit of time to trigger the pending + * bye that we are setting above */ + if (p->ongoing_reinvite && p->reinviteid < 0) { + p->reinviteid = ast_sched_add(sched, 32 * p->timer_t1, reinvite_timeout, dialog_ref(p, "ref for reinvite_timeout")); + } } } } @@ -7785,6 +7808,7 @@ p->method = intended_method; p->initid = -1; p->waitid = -1; + p->reinviteid = -1; p->autokillid = -1; p->request_queue_sched_id = -1; p->provisional_keepalive_sched_id = -1; @@ -12267,7 +12291,7 @@ initialize_initreq(p, &req); p->lastinvite = p->ocseq; ast_set_flag(&p->flags[0], SIP_OUTGOING); /* Change direction of this dialog */ - + p->ongoing_reinvite = 1; return send_request(p, &req, XMIT_CRITICAL, p->ocseq); } @@ -20365,8 +20389,11 @@ static void check_pendings(struct sip_pvt *p) { if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) { - /* if we can't BYE, then this is really a pending CANCEL */ - if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) { + if (p->reinviteid > -1) { + /* Outstanding p->reinviteid timeout, so wait... */ + return; + } else if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) { + /* if we can't BYE, then this is really a pending CANCEL */ p->invitestate = INV_CANCELLED; transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE); /* If the cancel occurred on an initial invite, cancel the pending BYE */ @@ -20465,8 +20489,9 @@ INVITE, but do set an autodestruct just in case we never get it. */ } else { /* We have a pending outbound invite, don't send something - new in-transaction */ - if (p->pendinginvite) + * new in-transaction, unless it is a pending reinvite, then + * by the time we are called here, we should probably just hang up. */ + if (p->pendinginvite && !p->ongoing_reinvite) return; if (p->owner) { @@ -20711,9 +20736,17 @@ if (resp >= 300 && (p->invitestate == INV_CALLING || p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA )) p->invitestate = INV_COMPLETED; + if ((resp >= 200 && reinvite)) { + p->ongoing_reinvite = 0; + if (p->reinviteid > -1) { + AST_SCHED_DEL_UNREF(sched, p->reinviteid, dialog_unref(p, "unref dialog for reinvite timeout because of a final response")); + } + } + /* Final response, clear out pending invite */ - if ((resp == 200 || resp >= 300) && p->pendinginvite && seqno == p->pendinginvite) + if ((resp == 200 || resp >= 300) && p->pendinginvite && seqno == p->pendinginvite) { p->pendinginvite = 0; + } /* If this is a response to our initial INVITE, we need to set what we can use * for this peer. Index: channels/sip/include/sip.h =================================================================== --- channels/sip/include/sip.h (revision 369436) +++ channels/sip/include/sip.h (working copy) @@ -1099,6 +1099,7 @@ struct sip_auth_container *peerauth;/*!< Realm authentication credentials */ int noncecount; /*!< Nonce-count */ unsigned int stalenonce:1; /*!< Marks the current nonce as responded too */ + unsigned int ongoing_reinvite:1; /*!< There is a reinvite in progress that might need to be cleaned up */ char lastmsg[256]; /*!< Last Message sent/received */ int amaflags; /*!< AMA Flags */ uint32_t pendinginvite; /*!< Any pending INVITE or state NOTIFY (in subscribe pvt's) ? (seqno of this) */ @@ -1111,6 +1112,7 @@ int initid; /*!< Auto-congest ID if appropriate (scheduler) */ int waitid; /*!< Wait ID for scheduler after 491 or other delays */ + int reinviteid; /*!< Reinvite in case of provisional, but no final response */ int autokillid; /*!< Auto-kill ID (scheduler) */ int t38id; /*!< T.38 Response ID */ struct sip_refer *refer; /*!< REFER: SIP transfer data structure */