diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-08 06:32:29 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-08 06:32:29 -0600 |
| commit | b6b1d73cb5c6fe45c34b7b6dbc930d555dfc257f (patch) | |
| tree | c8b10b4159e7975896147af83ef9fe25064e3a0e /res/res_http_websocket.c | |
| parent | d680ade35ce0bbc9fae375f2752691ee2f6a77d0 (diff) | |
| parent | 9865e689d2769b38624b01275a4391aa73cba3dd (diff) | |
Merge "General: Avoid implicit conversion to char when changes value to negative." into 13
Diffstat (limited to 'res/res_http_websocket.c')
| -rw-r--r-- | res/res_http_websocket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c index a65fc8ae2..956c52c54 100644 --- a/res/res_http_websocket.c +++ b/res/res_http_websocket.c @@ -291,6 +291,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_remove_protocol)(struct ast_webso /*! \brief Close function for websocket session */ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, uint16_t reason) { + enum ast_websocket_opcode opcode = AST_WEBSOCKET_OPCODE_CLOSE; char frame[4] = { 0, }; /* The header is 2 bytes and the reason code takes up another 2 bytes */ int res; @@ -298,7 +299,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_close)(struct ast_websocket *session, ui return 0; } - frame[0] = AST_WEBSOCKET_OPCODE_CLOSE | 0x80; + frame[0] = opcode | 0x80; frame[1] = 2; /* The reason code is always 2 bytes */ /* If no reason has been specified assume 1000 which is normal closure */ |