aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_jingle.c
diff options
context:
space:
mode:
authorpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-14 15:15:12 +0000
committerpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-14 15:15:12 +0000
commit1a629f8a54982fc50c01125690fe04b4aa2fa924 (patch)
treeb40da03943df7385877f89513794963cb6e8ea32 /channels/chan_jingle.c
parent681aee87a208fe0efa5f325fcfa0a18f472d4c97 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.8@291758 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
-rw-r--r--channels/chan_jingle.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 25b4d7e45..c12704835 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -623,7 +623,7 @@ static int jingle_create_candidates(struct jingle *client, struct jingle_pvt *p,
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_tmp, &bindaddr_tmp);
+ ast_find_ourip(&us_tmp, &bindaddr_tmp, AF_INET);
us.s_addr = htonl(ast_sockaddr_ipv4(&us_tmp));
/* Setup our first jingle candidate */
@@ -1904,15 +1904,17 @@ static int load_module(void)
}
sched = sched_context_create();
- if (!sched)
+ if (!sched) {
ast_log(LOG_WARNING, "Unable to create schedule context\n");
+ }
io = io_context_create();
- if (!io)
+ if (!io) {
ast_log(LOG_WARNING, "Unable to create I/O context\n");
+ }
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, Jingle disabled\n");
return 0;
}