Skip to content

F
freeswitch
提交 d395223f authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者： Muteesa Fred
浏览文件
操作

FS-10762: [freeswitch-core] Websocket logic error #resolve

上级 333516c4
隐藏空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 6 行删除
libs/sofia-sip/libsofia-sip-ua/tport/ws.c
浏览文件 @ d395223f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define WS_NOBLOCK 0 #define WS_NOBLOCK 0
#define WS_INIT_SANITY 5000 #define WS_INIT_SANITY 5000
#define WS_WRITE_SANITY 2000 #define WS_WRITE_SANITY 200
#define SHA1_HASH_SIZE 20 #define SHA1_HASH_SIZE 20
static struct ws_globals_s ws_globals; static struct ws_globals_s ws_globals;
...@@ -424,6 +424,11 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -424,6 +424,11 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
do { do {
r = SSL_write(wsh->ssl, (void *)((unsigned char *)data + wrote), bytes - wrote); r = SSL_write(wsh->ssl, (void *)((unsigned char *)data + wrote), bytes - wrote);
if (r == 0) {
ssl_err = 42;
break;
}
if (r > 0) { if (r > 0) {
wrote += r; wrote += r;
} }
...@@ -433,9 +438,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -433,9 +438,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (wsh->block) { if (wsh->block) {
if (sanity < WS_WRITE_SANITY * 3 / 4) { if (sanity < WS_WRITE_SANITY * 3 / 4) {
ms = 60; ms = 50;
} else if (sanity < WS_WRITE_SANITY / 2) { } else if (sanity < WS_WRITE_SANITY / 2) {
ms = 10; ms = 25;
} }
} }
ms_sleep(ms); ms_sleep(ms);
...@@ -456,6 +461,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -456,6 +461,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (ssl_err) { if (ssl_err) {
r = ssl_err * -1; r = ssl_err * -1;
wsh->down = 1;
} }
return r; return r;
......
src/mod/endpoints/mod_verto/ws.c
浏览文件 @ d395223f
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define WS_NOBLOCK 0 #define WS_NOBLOCK 0
#define WS_INIT_SANITY 5000 #define WS_INIT_SANITY 5000
#define WS_WRITE_SANITY 2000 #define WS_WRITE_SANITY 200
#define SHA1_HASH_SIZE 20 #define SHA1_HASH_SIZE 20
static struct ws_globals_s ws_globals; static struct ws_globals_s ws_globals;
...@@ -424,6 +424,11 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -424,6 +424,11 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
do { do {
r = SSL_write(wsh->ssl, (void *)((unsigned char *)data + wrote), bytes - wrote); r = SSL_write(wsh->ssl, (void *)((unsigned char *)data + wrote), bytes - wrote);
if (r == 0) {
ssl_err = 42;
break;
}
if (r > 0) { if (r > 0) {
wrote += r; wrote += r;
} }
...@@ -433,9 +438,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -433,9 +438,9 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (wsh->block) { if (wsh->block) {
if (sanity < WS_WRITE_SANITY * 3 / 4) { if (sanity < WS_WRITE_SANITY * 3 / 4) {
ms = 60; ms = 50;
} else if (sanity < WS_WRITE_SANITY / 2) { } else if (sanity < WS_WRITE_SANITY / 2) {
ms = 10; ms = 25;
} }
} }
ms_sleep(ms); ms_sleep(ms);
...@@ -456,6 +461,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -456,6 +461,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (ssl_err) { if (ssl_err) {
r = ssl_err * -1; r = ssl_err * -1;
wsh->down = 1;
} }
return r; return r;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论