Skip to content

F
freeswitch
提交 6c80281c authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

buffer websocket headers and body before sending to avoid fragmentation

上级 3df080a7
隐藏空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 11 行删除
libs/sofia-sip/.update
浏览文件 @ 6c80281c
Sat Jul 12 04:39:49 CDT 2014 Thu Jul 17 01:07:28 CDT 2014
libs/sofia-sip/libsofia-sip-ua/tport/ws.c
浏览文件 @ 6c80281c
...@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
{ {
size_t r; size_t r;
int sanity = 2000; int sanity = 2000;
int ssl_err = 0;
if (wsh->ssl) { if (wsh->ssl) {
do { do {
...@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (sanity < 2000) { if (sanity < 2000) {
ms_sleep(1); ms_sleep(1);
} }
} while (--sanity > 0 && r == -1 && SSL_get_error(wsh->ssl, r) == SSL_ERROR_WANT_WRITE);
if (r == -1) {
ssl_err = SSL_get_error(wsh->ssl, r);
}
} while (--sanity > 0 && r == -1 && ssl_err == SSL_ERROR_WANT_WRITE);
if (ssl_err) {
r = ssl_err * -1;
}
return r; return r;
} }
...@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh) ...@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh)
wsh->down = 2; wsh->down = 2;
if (wsh->write_buffer) {
free(wsh->write_buffer);
wsh->write_buffer = NULL;
wsh->write_buffer_len = 0;
}
if (wsh->ssl) { if (wsh->ssl) {
int code; int code;
do { do {
...@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes) ...@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
{ {
uint8_t hdr[14] = { 0 }; uint8_t hdr[14] = { 0 };
size_t hlen = 2; size_t hlen = 2;
uint8_t *bp;
ssize_t raw_ret = 0;
if (wsh->down) { if (wsh->down) {
return -1; return -1;
...@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes) ...@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
*u64 = htonl(bytes); *u64 = htonl(bytes);
} }
if (ws_raw_write(wsh, (void *) &hdr[0], hlen) != (ssize_t)hlen) { if (wsh->write_buffer_len < (hlen + bytes + 1)) {
return -1; void *tmp;
wsh->write_buffer_len = hlen + bytes + 1;
if ((tmp = realloc(wsh->write_buffer, wsh->write_buffer_len))) {
wsh->write_buffer = tmp;
} else {
abort();
}
} }
bp = (uint8_t *) wsh->write_buffer;
memcpy(bp, (void *) &hdr[0], hlen);
memcpy(bp + hlen, data, bytes);
raw_ret = ws_raw_write(wsh, bp, (hlen + bytes));
if (ws_raw_write(wsh, data, bytes) != (ssize_t)bytes) { if (raw_ret != (ssize_t) (hlen + bytes)) {
return -2; return raw_ret;
} }
return bytes; return bytes;
......
libs/sofia-sip/libsofia-sip-ua/tport/ws.h
浏览文件 @ 6c80281c
...@@ -89,6 +89,8 @@ typedef struct wsh_s { ...@@ -89,6 +89,8 @@ typedef struct wsh_s {
int secure_established; int secure_established;
int logical_established; int logical_established;
int x; int x;
void *write_buffer;
size_t write_buffer_len;
} wsh_t; } wsh_t;
ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc); ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc);
......
src/mod/endpoints/mod_verto/ws.c
浏览文件 @ 6c80281c
...@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -369,6 +369,7 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
{ {
size_t r; size_t r;
int sanity = 2000; int sanity = 2000;
int ssl_err = 0;
if (wsh->ssl) { if (wsh->ssl) {
do { do {
...@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) ...@@ -376,8 +377,17 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
if (sanity < 2000) { if (sanity < 2000) {
ms_sleep(1); ms_sleep(1);
} }
} while (--sanity > 0 && r == -1 && SSL_get_error(wsh->ssl, r) == SSL_ERROR_WANT_WRITE);
if (r == -1) {
ssl_err = SSL_get_error(wsh->ssl, r);
}
} while (--sanity > 0 && r == -1 && ssl_err == SSL_ERROR_WANT_WRITE);
if (ssl_err) {
r = ssl_err * -1;
}
return r; return r;
} }
...@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh) ...@@ -570,6 +580,12 @@ void ws_destroy(wsh_t *wsh)
wsh->down = 2; wsh->down = 2;
if (wsh->write_buffer) {
free(wsh->write_buffer);
wsh->write_buffer = NULL;
wsh->write_buffer_len = 0;
}
if (wsh->ssl) { if (wsh->ssl) {
int code; int code;
do { do {
...@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes) ...@@ -818,6 +834,8 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
{ {
uint8_t hdr[14] = { 0 }; uint8_t hdr[14] = { 0 };
size_t hlen = 2; size_t hlen = 2;
uint8_t *bp;
ssize_t raw_ret = 0;
if (wsh->down) { if (wsh->down) {
return -1; return -1;
...@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes) ...@@ -848,12 +866,25 @@ ssize_t ws_write_frame(wsh_t *wsh, ws_opcode_t oc, void *data, size_t bytes)
*u64 = htonl(bytes); *u64 = htonl(bytes);
} }
if (ws_raw_write(wsh, (void *) &hdr[0], hlen) != (ssize_t)hlen) { if (wsh->write_buffer_len < (hlen + bytes + 1)) {
return -1; void *tmp;
wsh->write_buffer_len = hlen + bytes + 1;
if ((tmp = realloc(wsh->write_buffer, wsh->write_buffer_len))) {
wsh->write_buffer = tmp;
} else {
abort();
}
} }
bp = (uint8_t *) wsh->write_buffer;
memcpy(bp, (void *) &hdr[0], hlen);
memcpy(bp + hlen, data, bytes);
raw_ret = ws_raw_write(wsh, bp, (hlen + bytes));
if (ws_raw_write(wsh, data, bytes) != (ssize_t)bytes) { if (raw_ret != (ssize_t) (hlen + bytes)) {
return -2; return raw_ret;
} }
return bytes; return bytes;
......
src/mod/endpoints/mod_verto/ws.h
浏览文件 @ 6c80281c
...@@ -89,6 +89,8 @@ typedef struct wsh_s { ...@@ -89,6 +89,8 @@ typedef struct wsh_s {
int secure_established; int secure_established;
int logical_established; int logical_established;
int x; int x;
void *write_buffer;
size_t write_buffer_len;
} wsh_t; } wsh_t;
ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc); ssize_t ws_send_buf(wsh_t *wsh, ws_opcode_t oc);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论