kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_http_websocket: Debug write lengths."

Browse Source
This commit is contained in:
Joshua Colp
2015-08-06 04:52:10 -05:00
committed by Gerrit Code Review
parent 7351d33a1f c63316eec1
commit 8a48c9e6cb
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/ari/ari_websockets.c
View File

@@ -174,7 +174,7 @@ int ast_ari_websocket_session_write(struct ast_ari_websocket_session *session,
return -1;
}
ast_debug(3, "Examining ARI event: \n%s\n", str);
ast_debug(3, "Examining ARI event (length %zu): \n%s\n", strlen(str), str);
if (ast_websocket_write_string(session->ws_session, str)) {
ast_log(LOG_NOTICE, "Problem occurred during websocket write, websocket closed\n");
return -1;

23
res/res_http_websocket.c
View File

@@ -300,6 +300,24 @@ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, ui
return res;
}
static const char *opcode_map[] = {
[AST_WEBSOCKET_OPCODE_CONTINUATION] = "continuation",
[AST_WEBSOCKET_OPCODE_TEXT] = "text",
[AST_WEBSOCKET_OPCODE_BINARY] = "binary",
[AST_WEBSOCKET_OPCODE_CLOSE] = "close",
[AST_WEBSOCKET_OPCODE_PING] = "ping",
[AST_WEBSOCKET_OPCODE_PONG] = "pong",
};
static const char *websocket_opcode2str(enum ast_websocket_opcode opcode)
{
if (opcode < AST_WEBSOCKET_OPCODE_CONTINUATION ||
opcode > AST_WEBSOCKET_OPCODE_PONG) {
return "<unknown>";
} else {
return opcode_map[opcode];
}
}
/*! \brief Write function for websocket traffic */
int AST_OPTIONAL_API_NAME(ast_websocket_write)(struct ast_websocket *session, enum ast_websocket_opcode opcode, char *payload, uint64_t actual_length)
@@ -308,6 +326,9 @@ int AST_OPTIONAL_API_NAME(ast_websocket_write)(struct ast_websocket *session, en
char *frame;
uint64_t length;
ast_debug(3, "Writing websocket %s frame, length %" PRIu64 "\n",
websocket_opcode2str(opcode), actual_length);
if (actual_length < 126) {
length = actual_length;
} else if (actual_length < (1 << 16)) {
@@ -1372,6 +1393,8 @@ int AST_OPTIONAL_API_NAME(ast_websocket_write_string)
{
uint64_t len = strlen(buf);
ast_debug(3, "Writing websocket string of length %" PRIu64 "\n", len);
/* We do not pass strlen(buf) to ast_websocket_write() directly because the
* size_t returned by strlen() may not require the same storage size
* as the uint64_t that ast_websocket_write() uses. This normally