diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-18 16:19:15 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-18 16:19:15 +0000 |
| commit | dcf2d5aa8c4bf0847aaffdbbb999ba34381e9522 (patch) | |
| tree | ed8d8bc9d40a9e6528d76b4a9b85c77df57d025f /channels | |
| parent | dd47d40d47c5e5f5a9fa707352c948c4b5137105 (diff) | |
via-header branches not updated correctly on INVITE
INVITE requests must always contain a new unique branch id. When
a new branch id is created for an INVITE, the dialog's invite_branch
variable must be updated so CANCEL requests use the correct branch id.
(closes issue #15262)
Reported by: maniax
Patches:
asterisk-1.6.1.0-sip-branch.patch uploaded by tweety (license 608)
invite_new_branch_trunk.diff uploaded by dvossel (license 671)
Tested by: maniax, dvossel
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@219450 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 9cc4cc283..d8a553e4d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6316,13 +6316,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); |