[asterisk-commits] irroot: trunk r337488 - in /trunk: ./ channels/chan_h323.c

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 22 04:31:41 2011
New Revision: 337488

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

................
  r337487 | irroot | 2011-09-22 11:26:26 +0200 (Thu, 22 Sep 2011) | 16 lines
  
  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:
    trunk/   (props changed)
    trunk/channels/chan_h323.c

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

Modified: trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_h323.c?view=diff&rev=337488&r1=337487&r2=337488
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Thu Sep 22 04:31:41 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);