diff options
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ce2f3de3a..002cf5271 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9390,13 +9390,14 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in seqno = p->ocseq; } - /* 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 && p->options && !ast_strlen_zero(p->options->auth))) { + /* A CANCEL must have the same branch as the INVITE that it is canceling. */ + if (sipmethod == SIP_CANCEL) { p->branch = p->invite_branch; build_via(p); + } else if (newbranch && (sipmethod == SIP_INVITE)) { + p->branch ^= ast_random(); + p->invite_branch = p->branch; + build_via(p); } else if (newbranch) { p->branch ^= ast_random(); build_via(p); |