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 /channels/chan_gtalk.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 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 326ea7035..36ef90307 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -859,7 +859,7 @@ static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, ch ast_rtp_instance_get_local_address(p->rtp, &sin_tmp); ast_sockaddr_to_sin(&sin_tmp, &sin); ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); - ast_find_ourip(&us, &bindaddr_tmp); + ast_find_ourip(&us, &bindaddr_tmp, AF_INET); if (!strcmp(ast_sockaddr_stringify_addr(&us), "127.0.0.1")) { ast_log(LOG_WARNING, "Found a loopback IP on the system, check your network configuration or set the bindaddr attribute."); } @@ -2217,7 +2217,7 @@ static int load_module(void) } ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); - if (ast_find_ourip(&ourip_tmp, &bindaddr_tmp)) { + if (ast_find_ourip(&ourip_tmp, &bindaddr_tmp, AF_INET)) { ast_log(LOG_WARNING, "Unable to get own IP address, Gtalk disabled\n"); return 0; } |