diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-03-05 16:44:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-03-05 16:44:16 +0000 |
| commit | 2736fe9917dfbcb3123b7c2b7e2f10ac9904a3c6 (patch) | |
| tree | 4c3c4d3e1e7880430152aa0a06be0c8ed0c02fef | |
| parent | dec0d4f9e3100d2b1a256695ef1f19e6ad0f29e2 (diff) | |
Defer sending the connected line reinvite if a reinvite is already in progress.
(issue ASTERISK-19355)
Reported by: tomaso
(closes issue AST-825)
........
Merged revisions 358162 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358163 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 861350bd4..f6ce9e923 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13434,7 +13434,7 @@ static void update_connectedline(struct sip_pvt *p, const void *data, size_t dat if (ast_channel_state(p->owner) == AST_STATE_UP || ast_test_flag(&p->flags[0], SIP_OUTGOING)) { struct sip_request req; - if (p->invitestate == INV_CONFIRMED || p->invitestate == INV_TERMINATED) { + if (!p->pendinginvite && (p->invitestate == INV_CONFIRMED || p->invitestate == INV_TERMINATED)) { reqprep(&req, p, ast_test_flag(&p->flags[0], SIP_REINVITE_UPDATE) ? SIP_UPDATE : SIP_INVITE, 0, 1); add_header(&req, "Allow", ALLOWED_METHODS); |