mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-09 14:36:48 +00:00
chan_websocket.c: Change payload references to command instead.
Some of the tests in process_text_message() were still comparing to the websocket message payload instead of the "command" string. Resolves: #1525
This commit is contained in:
@@ -577,7 +577,7 @@ static int process_text_message(struct websocket_pvt *instance,
|
|||||||
instance->leftover_len = 0;
|
instance->leftover_len = 0;
|
||||||
AST_LIST_UNLOCK(&instance->frame_queue);
|
AST_LIST_UNLOCK(&instance->frame_queue);
|
||||||
|
|
||||||
} else if (ast_strings_equal(payload, REPORT_QUEUE_DRAINED)) {
|
} else if (ast_strings_equal(command, REPORT_QUEUE_DRAINED)) {
|
||||||
if (instance->passthrough) {
|
if (instance->passthrough) {
|
||||||
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
||||||
ast_channel_name(instance->channel), command);
|
ast_channel_name(instance->channel), command);
|
||||||
@@ -609,7 +609,7 @@ static int process_text_message(struct websocket_pvt *instance,
|
|||||||
ast_free(status);
|
ast_free(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (ast_strings_equal(payload, PAUSE_MEDIA)) {
|
} else if (ast_strings_equal(command, PAUSE_MEDIA)) {
|
||||||
if (instance->passthrough) {
|
if (instance->passthrough) {
|
||||||
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
||||||
ast_channel_name(instance->channel), command);
|
ast_channel_name(instance->channel), command);
|
||||||
@@ -619,7 +619,7 @@ static int process_text_message(struct websocket_pvt *instance,
|
|||||||
instance->queue_paused = 1;
|
instance->queue_paused = 1;
|
||||||
AST_LIST_UNLOCK(&instance->frame_queue);
|
AST_LIST_UNLOCK(&instance->frame_queue);
|
||||||
|
|
||||||
} else if (ast_strings_equal(payload, CONTINUE_MEDIA)) {
|
} else if (ast_strings_equal(command, CONTINUE_MEDIA)) {
|
||||||
if (instance->passthrough) {
|
if (instance->passthrough) {
|
||||||
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
ast_debug(4, "%s: WebSocket in passthrough mode. Ignoring %s command.\n",
|
||||||
ast_channel_name(instance->channel), command);
|
ast_channel_name(instance->channel), command);
|
||||||
|
Reference in New Issue
Block a user