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)
........

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

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 2e76ce77bee749868bd73d85a1a66ee1dd86d85a..9f416ba20b0c702b840373aad069273aeaa6065e 100644 (file)
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -1582,6 +1582,7 @@ static struct oh323_peer *build_peer(const char *name, struct ast_variable *v, s
                        {
                                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);