Merged revisions 32818 via svnmerge from

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

........
r32818 | russell | 2006-06-07 13:53:21 -0400 (Wed, 07 Jun 2006) | 2 lines

fix some broken code with BRIDGE_OPTIMIZATION defined (issue #7292)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2006-06-07 17:54:26 +00:00
parent 39bcaa0773
commit 66dca5e378
1 changed files with 4 additions and 4 deletions

View File

@ -6416,9 +6416,9 @@ static int socket_process(struct iax2_thread *thread)
iax_frame_wrap(fr, &f);
#ifdef BRIDGE_OPTIMIZATION
if (iaxs[fr->callno]->bridgecallno) {
forward_delivery(&fr);
forward_delivery(fr);
} else {
duped_fr = iaxfrdup2(&fr);
duped_fr = iaxfrdup2(fr);
if (duped_fr) {
schedule_delivery(duped_fr, updatehistory, 1, &fr->ts);
}
@ -7643,9 +7643,9 @@ retryowner2:
}
#ifdef BRIDGE_OPTIMIZATION
if (iaxs[fr->callno]->bridgecallno) {
forward_delivery(&fr);
forward_delivery(fr);
} else {
duped_fr = iaxfrdup2(&fr);
duped_fr = iaxfrdup2(fr);
if (duped_fr) {
schedule_delivery(duped_fr, updatehistory, 0, &fr->ts);
}