diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 15:23:04 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-24 15:23:04 +0000 |
| commit | a7048e08b09d84023ae0154a7249ead8ba7db2e2 (patch) | |
| tree | 80e0c66335fc614cf7f2958a36c4e0fc774d6900 /channels/chan_gtalk.c | |
| parent | 422f3773dd4bcf9412b9fa285693712861b5dd43 (diff) | |
Merged revisions 65892 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r65892 | oej | 2007-05-24 17:20:54 +0200 (Thu, 24 May 2007) | 2 lines
Issue 8193 - NAT issues with gtalk/STUN. Patch by phsultan. Thanks!
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@65898 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 0b2dfe98a..0cd2a5b46 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1136,6 +1136,7 @@ static int gtalk_update_stun(struct gtalk *client, struct gtalk_pvt *p) struct hostent *hp; struct ast_hostent ahp; struct sockaddr_in sin; + struct sockaddr_in aux; if (time(NULL) == p->laststun) return 0; @@ -1144,14 +1145,32 @@ static int gtalk_update_stun(struct gtalk *client, struct gtalk_pvt *p) p->laststun = time(NULL); while (tmp) { char username[256]; + + /* Find the IP address of the host */ hp = ast_gethostbyname(tmp->ip, &ahp); sin.sin_family = AF_INET; memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr)); sin.sin_port = htons(tmp->port); snprintf(username, sizeof(username), "%s%s", tmp->username, - p->ourcandidates->username); + p->ourcandidates->username); + + /* Find out the result of the STUN */ + ast_rtp_get_peer(p->rtp, &aux); + + /* If the STUN result is different from the IP of the hostname, + lock on the stun IP of the hostname advertised by the + remote client */ + if (aux.sin_addr.s_addr && + aux.sin_addr.s_addr != sin.sin_addr.s_addr) + ast_rtp_stun_request(p->rtp, &aux, username); + else + ast_rtp_stun_request(p->rtp, &sin, username); + + if (aux.sin_addr.s_addr && option_debug > 3) { + ast_log(LOG_DEBUG, "Receiving RTP traffic from IP %s, matches with remote candidate's IP %s\n", ast_inet_ntoa(aux.sin_addr), tmp->ip); + ast_log(LOG_DEBUG, "Sending STUN request to %s\n", tmp->ip); + } - ast_rtp_stun_request(p->rtp, &sin, username); tmp = tmp->next; } return 1; |