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

FS-7117 #comment revert bf5210bf72 and implement it in ws.c please be sure to learn to use git commit hooks to properly associate commits with jiras

Browse Source
This commit is contained in:
Anthony Minessale
2015-01-07 11:17:31 -06:00
parent 23c1829382
commit 5187aaed79
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,10 @@ int ws_handshake(wsh_t *wsh)
proto_buf);
respond[511] = 0;
ws_raw_write(wsh, respond, strlen(respond));
if (ws_raw_write(wsh, respond, strlen(respond)) != strlen(respond)) {
goto err;
}
wsh->handshake = 1;
return 0;
@@ -403,10 +406,16 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
ssize_t r;
int sanity = 2000;
int ssl_err = 0;
ssize_t wrote = 0;
if (wsh->ssl) {
do {
r = SSL_write(wsh->ssl, data, bytes);
r = SSL_write(wsh->ssl, (void *)((unsigned char *)data + wrote), bytes - wrote);
if (r > 0) {
wrote += r;
}
if (sanity < 2000) {
ms_sleep(1);
}
@@ -415,7 +424,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
ssl_err = SSL_get_error(wsh->ssl, r);
}
} while (--sanity > 0 && r == -1 && ssl_err == SSL_ERROR_WANT_WRITE);
} while (--sanity > 0 && ((r == -1 && ssl_err == SSL_ERROR_WANT_WRITE) || (wsh->block && wrote < bytes)));
if (ssl_err) {
r = ssl_err * -1;
@@ -425,12 +434,18 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
}
do {
r = send(wsh->sock, data, bytes, 0);
r = send(wsh->sock, (void *)((unsigned char *)data + wrote), bytes - wrote, 0);
if (r > 0) {
wrote += r;
}
if (sanity < 2000) {
ms_sleep(1);
}
} while (--sanity > 0 && r == -1 && xp_is_blocking(xp_errno()));
} while (--sanity > 0 && ((r == -1 && xp_is_blocking(xp_errno())) || (wsh->block && wrote < bytes)));
//if (r<0) {
//printf("wRITE FAIL: %s\n", strerror(errno));
//}