diff options
| author | Mark Michelson <mmichelson@digium.com> | 2009-06-10 20:15:48 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2009-06-10 20:15:48 +0000 |
| commit | 28fe3938b7795a1cd1b1a448065b1a91857ca28d (patch) | |
| tree | 486859ae71886c0f30bc2e575e04716529037e48 | |
| parent | df649a867125cd4ec641b420ec013c78ee82384a (diff) | |
Only try to use the invite_branch on outgoing INVITEs with auth credentials.
I have added a comment to the code to help ease understanding of the logic here
as well.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@199958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 4e78b96be..0117197b6 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8967,7 +8967,11 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in seqno = p->ocseq; } - if (sipmethod == SIP_CANCEL || sipmethod == SIP_INVITE) { + /* A CANCEL must have the same branch as the INVITE that it is canceling. + * Similarly, if we need to re-send an INVITE with auth credentials, then we + * need to use the same branch as we did the first time we sent the INVITE. + */ + if (sipmethod == SIP_CANCEL || (sipmethod == SIP_INVITE && !ast_strlen_zero(p->options->auth))) { p->branch = p->invite_branch; build_via(p); } else if (newbranch) { |