diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-08 23:46:20 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-08 23:46:20 +0000 |
| commit | b502005acdeab661893f341e4303171b705ed773 (patch) | |
| tree | 30947c8e9d4b5597cb75931b69bd91525bcc4f1d /channels/chan_gtalk.c | |
| parent | 90a1e4acd5a12a02e7453f4859854a08eb7fcb89 (diff) | |
Fix calls of ast_sockaddr_from_sin() from IPv6 integration.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@274828 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 1a964e75a..1252bde19 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -813,7 +813,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); - bindaddr_tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); ast_find_ourip(&us, &bindaddr_tmp); 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."); @@ -956,7 +956,7 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const tmp->initiator = 1; } /* clear codecs */ - bindaddr_tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); if (!(tmp->rtp = ast_rtp_instance_new("asterisk", sched, &bindaddr_tmp, NULL))) { ast_log(LOG_ERROR, "Failed to create a new RTP instance (possibly an invalid bindaddr?)\n"); ast_free(tmp); @@ -2096,7 +2096,7 @@ static int load_module(void) if (!io) ast_log(LOG_WARNING, "Unable to create I/O context\n"); - bindaddr_tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); if (ast_find_ourip(&ourip_tmp, &bindaddr_tmp)) { ast_log(LOG_WARNING, "Unable to get own IP address, Gtalk disabled\n"); return 0; |