[asterisk-commits] trunk r32819 - in /trunk: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Jun  7 12:54:26 2006
New Revision: 32819

URL: http://svn.digium.com/view/asterisk?rev=32819&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=32819&r1=32818&r2=32819&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Jun  7 12:54:26 2006
@@ -6416,9 +6416,9 @@
 									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 @@
 	}
 #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);
 		}