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

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 28 13:49:30 2006
New Revision: 15704

URL: http://svn.digium.com/view/asterisk?rev=15704&view=rev
Log:
Merged revisions 15703 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r15703 | russell | 2006-03-28 14:47:03 -0500 (Tue, 28 Mar 2006) | 2 lines

fix Bus Error on sparc (issue #6354)

........

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=15704&r1=15703&r2=15704&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Mar 28 13:49:30 2006
@@ -42,6 +42,7 @@
 #include <sys/signal.h>
 #include <signal.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <unistd.h>
 #include <netdb.h>
@@ -5544,7 +5545,7 @@
 	
 	memset(&ied, 0, sizeof(ied));
 	if (ies->apparent_addr)
-		memcpy(&new, ies->apparent_addr, sizeof(new));
+		bcopy(ies->apparent_addr, &new, sizeof(new));
 	if (ies->callno)
 		newcall = ies->callno;
 	if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
@@ -5695,7 +5696,7 @@
 
 	memset(&us, 0, sizeof(us));
 	if (ies->apparent_addr)
-		memcpy(&us, ies->apparent_addr, sizeof(us));
+		bcopy(ies->apparent_addr, &us, sizeof(us));
 	if (ies->username)
 		ast_copy_string(peer, ies->username, sizeof(peer));
 	if (ies->refresh)