[svn-commits] russell: branch 1.6.1 r152573 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Oct 29 00:35:20 2008
New Revision: 152573

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152573
Log:
Merged revisions 152569 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines

Merged revisions 152539 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines

Fix an incorrect usage of sizeof()

(closes issue #13795)
Reported by: andrew53
Patches:
	chan_sip_sizeof.patch uploaded by andrew53 (license 519)

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=152573&r1=152572&r2=152573
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Oct 29 00:35:20 2008
@@ -6987,7 +6987,7 @@
 				struct sockaddr_in peer;
 				ast_rtp_get_peer(p->rtp, &peer);
 				if (peer.sin_addr.s_addr) {
-					memcpy(&sin.sin_addr, &peer.sin_addr, sizeof(&sin.sin_addr));
+					memcpy(&sin.sin_addr, &peer.sin_addr, sizeof(sin.sin_addr));
 					if (debug) {
 						ast_log(LOG_DEBUG, "Peer T.38 UDPTL is set behind NAT and with destination, destination address now %s\n", ast_inet_ntoa(sin.sin_addr));
 					}