diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-02-27 16:19:51 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-02-27 16:19:51 +0000 |
| commit | e0b49e7331aced07db94e46496ae53e4fbad968d (patch) | |
| tree | 67ecb7f7063225b49eb48ecfbc77123dcf424866 | |
| parent | d6a6422880039db8382d492f65dda5a4c87eb63b (diff) | |
Relax dialog checking in get_sip_pvt_byid_locked so it works when the dialog is forked.
(closes issue ASTERISK-20638)
Reported by: eelcob
Patches:
pedantic-call-pickup-from-tag.patch uploaded by eelcob (license 6442)
........
Merged revisions 382171 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 382174 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 249672729..cdf020ad7 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17661,7 +17661,10 @@ static struct sip_pvt *get_sip_pvt_byid_locked(const char *callid, const char *t frommismatch = !!strcmp(fromtag, sip_pvt_ptr->theirtag); tomismatch = !!strcmp(totag, sip_pvt_ptr->tag); - if (frommismatch || tomismatch) { + /* Don't check from if the dialog is not established, due to multi forking the from + * can change when the call is not answered yet. + */ + if ((frommismatch && ast_test_flag(&sip_pvt_ptr->flags[1], SIP_PAGE2_DIALOG_ESTABLISHED)) || tomismatch) { sip_pvt_unlock(sip_pvt_ptr); if (frommismatch) { ast_debug(4, "Matched %s call for callid=%s - pedantic from tag check fails; their tag is %s our tag is %s\n", |