kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "stun.c: Fix ast_stun_request() erratic timeout."

Browse Source
This commit is contained in:
Joshua Colp
2017-04-12 04:54:33 -05:00
committed by Gerrit Code Review
parent 3c32680a8a 7c37365f03
commit c5536eaee9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/stun.c
View File

@@ -411,6 +411,7 @@ int ast_stun_request(int s, struct sockaddr_in *dst,
/* send request, possibly wait for reply */ /* send request, possibly wait for reply */
struct sockaddr_in src; struct sockaddr_in src;
socklen_t srclen; socklen_t srclen;
struct timeval start;
/* Send STUN message. */ /* Send STUN message. */
res = stun_send(s, dst, req); res = stun_send(s, dst, req);
@@ -424,12 +425,20 @@ int ast_stun_request(int s, struct sockaddr_in *dst,
break; break;
} }
start = ast_tvnow();
try_again: try_again:
/* Wait for response. */ /* Wait for response. */
{ {
struct pollfd pfds = { .fd = s, .events = POLLIN }; struct pollfd pfds = { .fd = s, .events = POLLIN };
int ms;
res = ast_poll(&pfds, 1, 3000); ms = ast_remaining_ms(start, 3000);
if (ms <= 0) {
/* No response, timeout */
res = 1;
continue;
}
res = ast_poll(&pfds, 1, ms);
if (res < 0) { if (res < 0) {
/* Error */ /* Error */
continue; continue;