aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-29 05:35:20 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-29 05:35:20 +0000
commit1f6ad7c209a000caa1b9ce84e7446a730e475879 (patch)
treeca41fe61e85f12f8bd5daddd266f760e5276eee7 /channels
parent6040ddc2e90c1d8a95fa7583916c20ffbcc74951 (diff)
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) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152573 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d997f31bb..dc66bdae9 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6987,7 +6987,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
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));
}