[asterisk-commits] irroot: branch 10 r337487 - in /branches/10: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 22 04:26:26 2011
New Revision: 337487

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337487
Log:
Merged revisions 337486 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r337486 | irroot | 2011-09-22 11:22:26 +0200 (Thu, 22 Sep 2011) | 10 lines
  
  If IP address is used in chan_h323 host parameter of peer configuration.
  module tries to resolve IP address to IP address and fails.
  
  Simple fix to set family of socket this is a hangover from ipv6 changes.
  
  (closes issue ASTERISK-18237)
  (issue ASTERISK-17278)
  (issue ASTERISK-17500)
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_h323.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_h323.c?view=diff&rev=337487&r1=337486&r2=337487
==============================================================================
--- branches/10/channels/chan_h323.c (original)
+++ branches/10/channels/chan_h323.c Thu Sep 22 04:26:26 2011
@@ -1582,6 +1582,7 @@
 			{
 				struct ast_sockaddr tmp;
 
+				tmp.ss.ss_family = AF_INET;
 				if (ast_get_ip(&tmp, v->value)) {
 					ast_log(LOG_ERROR, "Could not determine IP for %s\n", v->value);
 					ASTOBJ_UNREF(peer, oh323_destroy_peer);