diff options
| author | George Joseph <gjoseph@digium.com> | 2018-04-16 11:12:30 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-16 11:12:30 -0500 |
| commit | 38dae51b788cd7f9f69c88573d6ce769c80f07f0 (patch) | |
| tree | 0e38f24c92f437b0c3be19c3522eae816cace726 /res/res_pjsip_transport_websocket.c | |
| parent | 267e007c28663690e8ad48487be2f4a7ec78e926 (diff) | |
| parent | 237d341bbd08168ca7b7bffd190125c032b57f39 (diff) | |
Merge "res_pjsip.c: Split ast_sip_push_task_synchronous() to fit expectations."
Diffstat (limited to 'res/res_pjsip_transport_websocket.c')
| -rw-r--r-- | res/res_pjsip_transport_websocket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c index 974b15087..633594359 100644 --- a/res/res_pjsip_transport_websocket.c +++ b/res/res_pjsip_transport_websocket.c @@ -377,7 +377,7 @@ static void websocket_cb(struct ast_websocket *session, struct ast_variable *par create_data.ws_session = session; - if (ast_sip_push_task_synchronous(serializer, transport_create, &create_data)) { + if (ast_sip_push_task_wait_serializer(serializer, transport_create, &create_data)) { ast_log(LOG_ERROR, "Could not create WebSocket transport.\n"); ast_taskprocessor_unreference(serializer); ast_websocket_unref(session); @@ -396,13 +396,13 @@ static void websocket_cb(struct ast_websocket *session, struct ast_variable *par } if (opcode == AST_WEBSOCKET_OPCODE_TEXT || opcode == AST_WEBSOCKET_OPCODE_BINARY) { - ast_sip_push_task_synchronous(serializer, transport_read, &read_data); + ast_sip_push_task_wait_serializer(serializer, transport_read, &read_data); } else if (opcode == AST_WEBSOCKET_OPCODE_CLOSE) { break; } } - ast_sip_push_task_synchronous(serializer, transport_shutdown, transport); + ast_sip_push_task_wait_serializer(serializer, transport_shutdown, transport); ast_taskprocessor_unreference(serializer); ast_websocket_unref(session); |