#include "afb-xreq.h"
#include "afb-context.h"
#include "afb-evt.h"
+#include "afb-token.h"
#include "systemd.h"
#include "verbose.h"
struct afb_wsreq;
/* predeclaration of websocket callbacks */
-static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1);
-static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg);
-static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid, struct json_object *object);
+static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1);
+static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
+static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object);
+static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop);
/* predeclaration of wsreq callbacks */
static void wsreq_destroy(struct afb_xreq *xreq);
static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info);
+static int wsreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event);
+static int wsreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event);
/* declaration of websocket structure */
struct afb_ws_json1
void (*cleanup)(void*);
void *cleanup_closure;
struct afb_session *session;
+ struct afb_token *token;
struct afb_evt_listener *listener;
struct afb_wsj1 *wsj1;
struct afb_cred *cred;
/* interface for afb_ws_json1 / afb_wsj1 */
static struct afb_wsj1_itf wsj1_itf = {
- .on_hangup = (void*)aws_on_hangup,
- .on_call = (void*)aws_on_call
+ .on_hangup = aws_on_hangup_cb,
+ .on_call = aws_on_call_cb
};
/* interface for xreq */
const struct afb_xreq_query_itf afb_ws_json1_xreq_itf = {
.reply = wsreq_reply,
+ .subscribe = wsreq_subscribe,
+ .unsubscribe = wsreq_unsubscribe,
.unref = wsreq_destroy
};
/* the interface for events */
static const struct afb_evt_itf evt_itf = {
- .broadcast = (void*)aws_on_event,
- .push = (void*)aws_on_event
+ .broadcast = aws_on_broadcast_cb,
+ .push = aws_on_push_cb
};
/***************************************************************
result->cleanup = cleanup;
result->cleanup_closure = cleanup_closure;
result->session = afb_session_addref(context->session);
+ result->token = afb_token_addref(context->token);
result->new_session = context->created != 0;
if (result->session == NULL)
goto error2;
afb_wsj1_unref(result->wsj1);
error3:
afb_session_unref(result->session);
+ afb_token_unref(result->token);
error2:
free(result);
error:
afb_wsj1_unref(ws->wsj1);
if (ws->cleanup != NULL)
ws->cleanup(ws->cleanup_closure);
+ afb_token_unref(ws->token);
afb_session_unref(ws->session);
afb_cred_unref(ws->cred);
afb_apiset_unref(ws->apiset);
}
}
-static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
+static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1)
{
+ struct afb_ws_json1 *ws = closure;
afb_ws_json1_unref(ws);
}
-static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
+static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
{
+ struct afb_ws_json1 *ws = closure;
struct afb_wsreq *wsreq;
DEBUG("received websocket request for %s/%s: %s", api, verb, afb_wsj1_msg_object_s(msg));
wsreq->xreq.request.called_verb = verb;
wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
wsreq->aws = afb_ws_json1_addref(ws);
- wsreq->xreq.listener = wsreq->aws->listener;
/* emits the call */
afb_xreq_process(&wsreq->xreq, ws->apiset);
}
-static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object)
+static void aws_on_event(struct afb_ws_json1 *aws, const char *event, struct json_object *object)
{
afb_wsj1_send_event_j(aws->wsj1, event, afb_msg_json_event(event, object));
}
+static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object)
+{
+ aws_on_event(closure, event, object);
+}
+
+static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
+{
+ aws_on_event(closure, event, afb_msg_json_event(event, object));
+}
+
/***************************************************************
****************************************************************
**
ERROR("Can't send reply: %m");
}
+static int wsreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
+{
+ struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
+
+ return afb_evt_event_x2_add_watch(wsreq->aws->listener, event);
+}
+
+static int wsreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
+{
+ struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
+
+ return afb_evt_event_x2_remove_watch(wsreq->aws->listener, event);
+}
+