summaryrefslogtreecommitdiff
path: root/res/res_ari_events.c
diff options
context:
space:
mode:
authorAshley Sanders <asanders@digium.com>2015-07-31 11:27:23 -0500
committerAshley Sanders <asanders@digium.com>2015-07-31 11:28:10 -0500
commitfe804b09b31a1fd43de8d110f025c447aa4a6b62 (patch)
tree0971b1774f098df212816a66bdeed3bb48a5f4fc /res/res_ari_events.c
parent309dd2a4090ccdd1ea31d8d5415a645daddd3883 (diff)
ARI: Channels added to Stasis application during WebSocket creation ...
Prior to ASTERISK-24988, the WebSocket handshake was resolved before Stasis applications were registered. This was done such that the WebSocket would be ready when an application is registered. However, by creating the WebSocket first, the client had the ability to make requests for the Stasis application it thought had been created with the initial handshake request. The inevitable conclusion of this scenario was the cart being put before the horse. ASTERISK-24988 resolved half of the problem by ensuring that the applications were created and registered with Stasis prior to completing the handshake with the client. While this meant that Stasis was ready when the client received the green-light from Asterisk, it also meant that the WebSocket was not yet ready for Stasis to dispatch messages. This patch introduces a message queuing mechanism for delaying messages from Stasis applications while the WebSocket is being constructed. When the ARI event processor receives the message from the WebSocket that it is being created, the event processor instantiates an event session which contains a message queue. It then tries to create and register the requested applications with Stasis. Messages that are dispatched from Stasis between this point and the point at which the event processor is notified the WebSocket is ready, are stashed in the queue. Once the WebSocket has been built, the queue's messages are dispatched in the order in which they were originally received and the queue is concurrently cleared. ASTERISK-25181 #close Reported By: Matt Jordan Change-Id: Iafef7b85a2e0bf78c114db4c87ffc3d16d671a17
Diffstat (limited to 'res/res_ari_events.c')
-rw-r--r--res/res_ari_events.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 454233945..bf33aeaff 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -53,7 +53,8 @@ ASTERISK_REGISTER_FILE()
#define MAX_VALS 128
-static int ast_ari_events_event_websocket_ws_attempted_cb(struct ast_tcptls_session_instance *ser, struct ast_variable *get_params, struct ast_variable *headers)
+static int ast_ari_events_event_websocket_ws_attempted_cb(struct ast_tcptls_session_instance *ser,
+ struct ast_variable *get_params, struct ast_variable *headers, const char *session_id)
{
struct ast_ari_events_event_websocket_args args = {};
int res = 0;
@@ -113,7 +114,7 @@ static int ast_ari_events_event_websocket_ws_attempted_cb(struct ast_tcptls_sess
{}
}
- res = ast_ari_websocket_events_event_websocket_attempted(ser, headers, &args);
+ res = ast_ari_websocket_events_event_websocket_attempted(ser, headers, &args, session_id);
fin: __attribute__((unused))
if (!response) {
@@ -433,6 +434,10 @@ static int load_module(void)
int res = 0;
struct ast_websocket_protocol *protocol;
+ if (ast_ari_websocket_events_event_websocket_init() == -1) {
+ return AST_MODULE_LOAD_FAILURE;
+ }
+
events.ws_server = ast_websocket_server_create();
if (!events.ws_server) {
return AST_MODULE_LOAD_FAILURE;