From: Kevin P. Fleming <kpfleming@digium.com>
Date: Mon, 25 Jul 2005 17:31:50 +0000 (+0000)
Subject: ensure socket address family is copied (bug #4789)
X-Git-Tag: 1.2.0-beta1~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5238d544e9debd1dedd9dd139d501dfa8ade2f88;p=thirdparty%2Fasterisk.git

ensure socket address family is copied (bug #4789)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d7fe500108..20f198f12d 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1639,9 +1639,11 @@ static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
 	if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) &&
 	    (!peer->maxms || ((peer->lastms >= 0)  && (peer->lastms <= peer->maxms)))) {
 		if (peer->addr.sin_addr.s_addr) {
+			r->sa.sin_family = peer->addr.sin_family;
 			r->sa.sin_addr = peer->addr.sin_addr;
 			r->sa.sin_port = peer->addr.sin_port;
 		} else {
+			r->sa.sin_family = peer->defaddr.sin_family;
 			r->sa.sin_addr = peer->defaddr.sin_addr;
 			r->sa.sin_port = peer->defaddr.sin_port;
 		}