From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 21 May 2010 20:38:46 +0000 (+0000)
Subject: Merged revisions 265087 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91d462a57f0f41431215044f4c58a5e2922c7c9;p=thirdparty%2Fasterisk.git

Merged revisions 265087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r265087 | mmichelson | 2010-05-21 15:38:14 -0500 (Fri, 21 May 2010) | 7 lines

  Be sure to set the sin_family on the proxy when allocating.

  (closes issue #17157)
  Reported by: stuarth
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6736ab86cd..52fd9ce88a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3333,6 +3333,7 @@ static struct sip_proxy *proxy_allocate(char *name, char *port, int force)
 	proxy->force = force;
 	ast_copy_string(proxy->name, name, sizeof(proxy->name));
 	proxy->ip.sin_port = htons(port_str2int(port, STANDARD_SIP_PORT));
+	proxy->ip.sin_family = AF_INET;
 	proxy_update(proxy);
 	return proxy;
 }