kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

FS-6854 #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2014-09-25 21:43:57 +05:00
parent 221af936d8
commit f7de058acd
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Sep 24 01:09:42 CDT 2014 Thu Sep 25 21:43:53 CDT 2014

18
libs/sofia-sip/libsofia-sip-ua/tport/ws.c
View File

@ -332,12 +332,13 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
ssize_t r; ssize_t r;
int err = 0; int err = 0;
wsh->x++;
if (wsh->x > 250) ms_sleep(1);
if (wsh->ssl) { if (wsh->ssl) {
do { do {
r = SSL_read(wsh->ssl, data, bytes); r = SSL_read(wsh->ssl, data, bytes);
ms_sleep(10);
if (r == -1) { if (r == -1) {
err = SSL_get_error(wsh->ssl, r); err = SSL_get_error(wsh->ssl, r);
@ -345,6 +346,8 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
r = -2; r = -2;
goto end; goto end;
} }
if (block) ms_sleep(10);
} }
} while (r == -1 && err == SSL_ERROR_WANT_READ && wsh->x < 100); } while (r == -1 && err == SSL_ERROR_WANT_READ && wsh->x < 100);
@ -354,10 +357,17 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
do { do {
r = recv(wsh->sock, data, bytes, 0); r = recv(wsh->sock, data, bytes, 0);
ms_sleep(10); if (r == -1) {
if (!block && xp_is_blocking(xp_errno())) {
r = -2;
goto end;
}
if (block) ms_sleep(10);
}
} while (r == -1 && xp_is_blocking(xp_errno()) && wsh->x < 100); } while (r == -1 && xp_is_blocking(xp_errno()) && wsh->x < 100);
if (wsh->x >= 100) { if (wsh->x >= 1000 || (block && wsh->x >= 100)) {
r = -1; r = -1;
} }

18
src/mod/endpoints/mod_verto/ws.c
View File

@ -332,12 +332,13 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
ssize_t r; ssize_t r;
int err = 0; int err = 0;
wsh->x++;
if (wsh->x > 250) ms_sleep(1);
if (wsh->ssl) { if (wsh->ssl) {
do { do {
r = SSL_read(wsh->ssl, data, bytes); r = SSL_read(wsh->ssl, data, bytes);
ms_sleep(10);
if (r == -1) { if (r == -1) {
err = SSL_get_error(wsh->ssl, r); err = SSL_get_error(wsh->ssl, r);
@ -345,6 +346,8 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
r = -2; r = -2;
goto end; goto end;
} }
if (block) ms_sleep(10);
} }
} while (r == -1 && err == SSL_ERROR_WANT_READ && wsh->x < 100); } while (r == -1 && err == SSL_ERROR_WANT_READ && wsh->x < 100);
@ -354,10 +357,17 @@ ssize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes, int block)
do { do {
r = recv(wsh->sock, data, bytes, 0); r = recv(wsh->sock, data, bytes, 0);
ms_sleep(10); if (r == -1) {
if (!block && xp_is_blocking(xp_errno())) {
r = -2;
goto end;
}
if (block) ms_sleep(10);
}
} while (r == -1 && xp_is_blocking(xp_errno()) && wsh->x < 100); } while (r == -1 && xp_is_blocking(xp_errno()) && wsh->x < 100);
if (wsh->x >= 100) { if (wsh->x >= 1000 || (block && wsh->x >= 100)) {
r = -1; r = -1;
} }