diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-10-14 15:21:42 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-10-14 15:21:42 +0000 |
| commit | b1cc567e3f1aee5befefe48665f71178e1305260 (patch) | |
| tree | 1f4585574a95c4cc7b531967b8a4d3c962f247e3 /main/acl.c | |
| parent | 6b1019418accc376ab3555a8007b723688d37a51 (diff) | |
Merged revisions 291758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r291758 | pabelanger | 2010-10-14 11:15:12 -0400 (Thu, 14 Oct 2010) | 11 lines
Add the ability for ast_find_ourip to return IPv4, IPv6 or both.
While testing chan_gtalk I noticed jabber was using my IPv6 address
and not IPv4. When using bindaddr=0.0.0.0 it is possible for ast_find_ourip()
to return both IPv6 and IPv4 results. Adding a family parameter gives you
the ablility to choose.
Since jabber/gtalk/h323 do not support IPv6, we should only return IPv4 results.
Review: https://reviewboard.asterisk.org/r/973/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/acl.c')
| -rw-r--r-- | main/acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c index 09ae0167d..9f0c640ff 100644 --- a/main/acl.c +++ b/main/acl.c @@ -720,7 +720,7 @@ int ast_ouraddrfor(const struct ast_sockaddr *them, struct ast_sockaddr *us) return 0; } -int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindaddr) +int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindaddr, int family) { char ourhost[MAXHOSTNAMELEN] = ""; struct ast_sockaddr root; @@ -735,7 +735,7 @@ int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindad if (gethostname(ourhost, sizeof(ourhost) - 1)) { ast_log(LOG_WARNING, "Unable to get hostname\n"); } else { - if (resolve_first(ourip, ourhost, PARSE_PORT_FORBID, 0) == 0) { + if (resolve_first(ourip, ourhost, PARSE_PORT_FORBID, family) == 0) { return 0; } } |