diff options
author | Gregory Nietsky <gregory@distrotech.co.za> | 2011-09-22 09:31:41 +0000 |
---|---|---|
committer | Gregory Nietsky <gregory@distrotech.co.za> | 2011-09-22 09:31:41 +0000 |
commit | 308ec93d649bc5dea0faa69f129fabc22b61996e (patch) | |
tree | 58de31bf2c6a8a74d331b52aaec7875c6210e831 /channels/chan_h323.c | |
parent | 3935595e4396ef1bd4581761c43a1846011b1988 (diff) |
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)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r-- | channels/chan_h323.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 2e76ce77b..9f416ba20 100644 --- 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); |