diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-02-11 16:52:55 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-02-11 16:52:55 +0000 |
| commit | 137c4b0778928040dff81f15b770211ee1ead320 (patch) | |
| tree | ea094ab1134e7fd99571857eb1f9e951e8950b52 /res | |
| parent | 49161d8df80925ff674204d288ba491876530715 (diff) | |
res_http_websocket: websocket write timeout fails to fully disconnect
When writing to a websocket if a timeout occurred the underlying socket did not
get closed/disconnected. This patch makes sure the websocket gets disconnected
on a write timeout. Also a notice is logged stating that the websocket was
disconnected.
ASTERISK-24701 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/4412/
........
Merged revisions 431669 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 431670 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/ari/ari_websockets.c | 20 | ||||
| -rw-r--r-- | res/res_http_websocket.c | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/res/ari/ari_websockets.c b/res/ari/ari_websockets.c index ff0a53c4f..683f00e19 100644 --- a/res/ari/ari_websockets.c +++ b/res/ari/ari_websockets.c @@ -100,6 +100,16 @@ struct ast_json *ast_ari_websocket_session_read( { RAII_VAR(struct ast_json *, message, NULL, ast_json_unref); + if (ast_websocket_fd(session->ws_session) < 0) { + return NULL; + } + + + if (ast_websocket_fd(session->ws_session) <= 0) { + return NULL; + } + + while (!message) { int res; char *payload; @@ -127,7 +137,7 @@ struct ast_json *ast_ari_websocket_session_read( switch (opcode) { case AST_WEBSOCKET_OPCODE_CLOSE: - ast_debug(1, "WebSocket closed by peer\n"); + ast_debug(1, "WebSocket closed\n"); return NULL; case AST_WEBSOCKET_OPCODE_TEXT: message = ast_json_load_buf(payload, payload_len, NULL); @@ -173,8 +183,12 @@ int ast_ari_websocket_session_write(struct ast_ari_websocket_session *session, } ast_debug(3, "Examining ARI event: \n%s\n", str); - return ast_websocket_write(session->ws_session, - AST_WEBSOCKET_OPCODE_TEXT, str, strlen(str)); + if (ast_websocket_write(session->ws_session, + AST_WEBSOCKET_OPCODE_TEXT, str, strlen(str))) { + ast_log(LOG_NOTICE, "Problem occurred during websocket write, websocket closed\n"); + return -1; + } + return 0; } void ari_handle_websocket(struct ast_websocket_server *ws_server, diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c index 4930bcc42..d1beae6c2 100644 --- a/res/res_http_websocket.c +++ b/res/res_http_websocket.c @@ -307,11 +307,15 @@ int AST_OPTIONAL_API_NAME(ast_websocket_write)(struct ast_websocket *session, en } if (ast_careful_fwrite(session->f, session->fd, frame, header_size, session->timeout)) { ao2_unlock(session); + /* 1011 - server terminating connection due to not being able to fulfill the request */ + ast_websocket_close(session, 1011); return -1; } if (ast_careful_fwrite(session->f, session->fd, payload, actual_length, session->timeout)) { ao2_unlock(session); + /* 1011 - server terminating connection due to not being able to fulfill the request */ + ast_websocket_close(session, 1011); return -1; } fflush(session->f); |