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 | |
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')
-rw-r--r-- | channels/chan_gtalk.c | 6 | ||||
-rw-r--r-- | channels/chan_h323.c | 4 | ||||
-rw-r--r-- | channels/chan_jingle.c | 8 |
3 files changed, 9 insertions, 9 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; diff --git a/channels/chan_h323.c b/channels/chan_h323.c index cf41acc69..a8aa9b7d0 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -962,7 +962,7 @@ static int __oh323_rtp_create(struct oh323_pvt *pvt) { struct ast_sockaddr tmp; - tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&tmp, &bindaddr); if (ast_find_ourip(&our_addr, &tmp)) { ast_mutex_unlock(&pvt->lock); ast_log(LOG_ERROR, "Unable to locate local IP address for RTP stream\n"); @@ -1994,7 +1994,7 @@ static void setup_rtp_connection(unsigned call_reference, const char *remoteIp, { struct ast_sockaddr tmp; - tmp = ast_sockaddr_from_sin(them); + ast_sockaddr_from_sin(&tmp, &them); ast_rtp_instance_set_remote_address(pvt->rtp, &tmp); } if (pvt->recvonly) { diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 35618b1fa..560d3ec17 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -622,7 +622,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); - bindaddr_tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); ast_find_ourip(&us_tmp, &bindaddr_tmp); us.s_addr = htonl(ast_sockaddr_ipv4(&us_tmp)); @@ -782,7 +782,7 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from, ast_copy_string(tmp->them, idroster, sizeof(tmp->them)); tmp->initiator = 1; } - bindaddr_tmp = ast_sockaddr_from_sin(bindaddr); + ast_sockaddr_from_sin(&bindaddr_tmp, &bindaddr); tmp->rtp = ast_rtp_instance_new("asterisk", sched, &bindaddr_tmp, NULL); tmp->parent = client; if (!tmp->rtp) { @@ -1084,7 +1084,7 @@ static int jingle_update_stun(struct jingle *client, struct jingle_pvt *p) sin.sin_port = htons(tmp->port); snprintf(username, sizeof(username), "%s:%s", tmp->ufrag, p->ourcandidates->ufrag); - sin_tmp = ast_sockaddr_from_sin(sin); + ast_sockaddr_from_sin(&sin_tmp, &sin); ast_rtp_instance_stun_request(p->rtp, &sin_tmp, username); tmp = tmp->next; } @@ -1906,7 +1906,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, Jingle disabled\n"); return 0; |