sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 181029,181031 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r181029 | mmichelson | 2009-03-10 19:30:26 -0500 (Tue, 10 Mar 2009) | 9 lines
  
  Fix incorrect tag checking on transfers when pedantic=yes is enabled.
  
  (closes issue #14611)
  Reported by: klaus3000
  Patches:
        patch_chan_sip_attended_transfer_1.4.23.txt uploaded by klaus3000 (license 65)
  Tested by: klaus3000
........
  r181031 | mmichelson | 2009-03-10 19:32:40 -0500 (Tue, 10 Mar 2009) | 3 lines
  
  Remove unused variables.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson 2009-03-11 00:46:47 +00:00
parent bfc0d3b795
commit 85a5f68fe1
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
channels/chan_sip.c
View File

@ -12389,7 +12389,6 @@ static struct sip_pvt *get_sip_pvt_byid_locked(const char *callid, const char *t
/* Go ahead and lock it (and its owner) before returning */
sip_pvt_lock(sip_pvt_ptr);
if (sip_cfg.pedanticsipchecking) {
const char *pvt_fromtag, *pvt_totag;
unsigned char frommismatch = 0, tomismatch = 0;
if (ast_strlen_zero(fromtag)) {
@ -12406,30 +12405,20 @@ static struct sip_pvt *get_sip_pvt_byid_locked(const char *callid, const char *t
return NULL;
}
if (sip_pvt_ptr->outgoing_call == TRUE) {
/* Outgoing call tags : from is "our", to is "their" */
pvt_fromtag = sip_pvt_ptr->tag ;
pvt_totag = sip_pvt_ptr->theirtag ;
} else {
/* Incoming call tags : from is "their", to is "our" */
pvt_fromtag = sip_pvt_ptr->theirtag ;
pvt_totag = sip_pvt_ptr->tag ;
}
frommismatch = !!strcmp(fromtag, pvt_fromtag);
tomismatch = !!strcmp(totag, pvt_totag);
frommismatch = !!strcmp(fromtag, sip_pvt_ptr->theirtag);
tomismatch = !!strcmp(totag, sip_pvt_ptr->tag);
if (frommismatch || 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",
sip_pvt_ptr->outgoing_call == TRUE ? "OUTGOING": "INCOMING", sip_pvt_ptr->callid,
fromtag, pvt_fromtag);
fromtag, sip_pvt_ptr->theirtag);
}
if (tomismatch) {
ast_debug(4, "Matched %s call for callid=%s - pedantic to tag check fails; their tag is %s our tag is %s\n",
sip_pvt_ptr->outgoing_call == TRUE ? "OUTGOING": "INCOMING", sip_pvt_ptr->callid,
totag, pvt_totag);
totag, sip_pvt_ptr->tag);
}
return NULL;
}