/*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#define _GNU_SOURCE
-#define NO_PLUGIN_VERBOSE_MACRO
-
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <pthread.h>
#include <json-c/json.h>
-#include <systemd/sd-event.h>
-
-#include <afb/afb-req-itf.h>
-#include "afb-common.h"
+#include <afb/afb-event-x2.h>
#include "afb-session.h"
#include "afb-cred.h"
-#include "afb-ws.h"
-#include "afb-msg-json.h"
#include "afb-api.h"
#include "afb-apiset.h"
+#include "afb-proto-ws.h"
#include "afb-stub-ws.h"
#include "afb-context.h"
#include "afb-evt.h"
#include "afb-xreq.h"
+#include "afb-token.h"
+#include "afb-error-text.h"
#include "verbose.h"
+#include "fdev.h"
#include "jobs.h"
+#include "u16id.h"
struct afb_stub_ws;
-/************** constants for protocol definition *************************/
-
-#define CHAR_FOR_CALL 'C'
-#define CHAR_FOR_ANSWER_SUCCESS 'T'
-#define CHAR_FOR_ANSWER_FAIL 'F'
-#define CHAR_FOR_EVT_BROADCAST '*'
-#define CHAR_FOR_EVT_ADD '+'
-#define CHAR_FOR_EVT_DEL '-'
-#define CHAR_FOR_EVT_PUSH '!'
-#define CHAR_FOR_EVT_SUBSCRIBE 'S'
-#define CHAR_FOR_EVT_UNSUBSCRIBE 'U'
-#define CHAR_FOR_SUBCALL_CALL 'B'
-#define CHAR_FOR_SUBCALL_REPLY 'R'
-#define CHAR_FOR_DESCRIBE 'D'
-#define CHAR_FOR_DESCRIPTION 'd'
-
-/******************* handling subcalls *****************************/
-
/**
- * Structure on server side for recording pending
- * subcalls.
- */
-struct server_subcall
-{
- struct server_subcall *next; /**< next subcall for the client */
- uint32_t subcallid; /**< the subcallid */
- void (*callback)(void*, int, struct json_object*); /**< callback on completion */
- void *closure; /**< closure of the callback */
-};
-
-/**
- * Structure for sending back replies on client side
- */
-struct client_subcall
-{
- struct afb_stub_ws *stubws; /**< stub descriptor */
- uint32_t subcallid; /**< subcallid for the reply */
-};
-
-/*
- * structure for recording calls on client side
- */
-struct client_call {
- struct client_call *next; /* the next call */
- struct afb_stub_ws *stubws; /* the stub_ws */
- struct afb_xreq *xreq; /* the request handle */
- uint32_t msgid; /* the message identifier */
-};
-
-/*
- * structure for a ws request
+ * structure for a ws request: requests on server side
*/
struct server_req {
- struct afb_xreq xreq; /* the xreq */
- struct afb_stub_ws *stubws; /* the client of the request */
- uint32_t msgid; /* the incoming request msgid */
+ struct afb_xreq xreq; /**< the xreq */
+ struct afb_stub_ws *stubws; /**< the client of the request */
+ struct afb_proto_ws_call *call; /**< the incoming call */
};
-/*
- * structure for recording events on client side
- */
-struct client_event
-{
- struct client_event *next;
- struct afb_event event;
- int eventid;
- int refcount;
-};
-
-/*
- * structure for recording describe requests
- */
-struct client_describe
-{
- struct client_describe *next;
- struct afb_stub_ws *stubws;
- struct jobloop *jobloop;
- struct json_object *result;
- uint32_t descid;
-};
-
-/*
+/**
* structure for jobs of describing
*/
struct server_describe
{
struct afb_stub_ws *stubws;
- uint32_t descid;
+ struct afb_proto_ws_describe *describe;
};
-/******************* client description part for server *****************************/
+/******************* stub description for client or servers ******************/
struct afb_stub_ws
{
- /* count of references */
- int refcount;
-
- /* file descriptor */
- int fd;
-
- /* resource control */
- pthread_mutex_t mutex;
-
- /* websocket */
- struct afb_ws *ws;
-
- /* listener for events (server side) */
- struct afb_evt_listener *listener;
-
- /* event replica (client side) */
- struct client_event *events;
-
- /* emitted calls (client side) */
- struct client_call *calls;
-
- /* credentials (server side) */
- struct afb_cred *cred;
-
- /* pending subcalls (server side) */
- struct server_subcall *subcalls;
-
- /* pending description (client side) */
- struct client_describe *describes;
+ /* protocol */
+ struct afb_proto_ws *proto;
/* apiset */
struct afb_apiset *apiset;
- /* the api name */
- char apiname[1];
-};
-
-/******************* common useful tools **********************************/
-
-/**
- * translate a pointer to some integer
- * @param ptr the pointer to translate
- * @return an integer
- */
-static inline uint32_t ptr2id(void *ptr)
-{
- return (uint32_t)(((intptr_t)ptr) >> 6);
-}
+ /* on hangup callback */
+ void (*on_hangup)(struct afb_stub_ws *);
-/******************* serialisation part **********************************/
+ union {
+ /* server side */
+ struct {
+ /* listener for events */
+ struct afb_evt_listener *listener;
-struct readbuf
-{
- char *head, *end;
-};
+ /* sessions */
+ struct server_session *sessions;
-#define WRITEBUF_COUNT_MAX 32
-struct writebuf
-{
- struct iovec iovec[WRITEBUF_COUNT_MAX];
- uint32_t uints[WRITEBUF_COUNT_MAX];
- int count;
-};
+ /* credentials of the client */
+ struct afb_cred *cred;
-static char *readbuf_get(struct readbuf *rb, uint32_t length)
-{
- char *before = rb->head;
- char *after = before + length;
- if (after > rb->end)
- return 0;
- rb->head = after;
- return before;
-}
+ /* event from server */
+ struct u16id2bool *event_flags;
-static int readbuf_char(struct readbuf *rb, char *value)
-{
- if (rb->head >= rb->end)
- return 0;
- *value = *rb->head++;
- return 1;
-}
+ /* transmitted sessions */
+ struct u16id2ptr *session_proxies;
-static int readbuf_uint32(struct readbuf *rb, uint32_t *value)
-{
- char *after = rb->head + sizeof *value;
- if (after > rb->end)
- return 0;
- memcpy(value, rb->head, sizeof *value);
- rb->head = after;
- *value = le32toh(*value);
- return 1;
-}
+ /* transmitted tokens */
+ struct u16id2ptr *token_proxies;
+ };
-static int readbuf_string(struct readbuf *rb, const char **value, size_t *length)
-{
- uint32_t len;
- if (!readbuf_uint32(rb, &len) || !len)
- return 0;
- if (length)
- *length = (size_t)(len - 1);
- return (*value = readbuf_get(rb, len)) != NULL && rb->head[-1] == 0;
-}
+ /* client side */
+ struct {
+ /* event from server */
+ struct u16id2ptr *event_proxies;
-static int readbuf_object(struct readbuf *rb, struct json_object **object)
-{
- const char *string;
- struct json_object *o;
- int rc = readbuf_string(rb, &string, NULL);
- if (rc) {
- o = json_tokener_parse(string);
- if (o == NULL && strcmp(string, "null"))
- o = json_object_new_string(string);
- *object = o;
- }
- return rc;
-}
+ /* transmitted sessions */
+ struct u16id2bool *session_flags;
-static int writebuf_put(struct writebuf *wb, const void *value, size_t length)
-{
- int i = wb->count;
- if (i == WRITEBUF_COUNT_MAX)
- return 0;
- wb->iovec[i].iov_base = (void*)value;
- wb->iovec[i].iov_len = length;
- wb->count = i + 1;
- return 1;
-}
+ /* transmitted tokens */
+ struct u16id2bool *token_flags;
-static int writebuf_char(struct writebuf *wb, char value)
-{
- int i = wb->count;
- if (i == WRITEBUF_COUNT_MAX)
- return 0;
- *(char*)&wb->uints[i] = value;
- wb->iovec[i].iov_base = &wb->uints[i];
- wb->iovec[i].iov_len = 1;
- wb->count = i + 1;
- return 1;
-}
+ /* robustify */
+ struct {
+ struct fdev *(*reopen)(void*);
+ void *closure;
+ void (*release)(void*);
+ } robust;
+ };
+ };
-static int writebuf_uint32(struct writebuf *wb, uint32_t value)
-{
- int i = wb->count;
- if (i == WRITEBUF_COUNT_MAX)
- return 0;
- wb->uints[i] = htole32(value);
- wb->iovec[i].iov_base = &wb->uints[i];
- wb->iovec[i].iov_len = sizeof wb->uints[i];
- wb->count = i + 1;
- return 1;
-}
+ /* count of references */
+ unsigned refcount;
-static int writebuf_string_length(struct writebuf *wb, const char *value, size_t length)
-{
- uint32_t len = (uint32_t)++length;
- return (size_t)len == length && len && writebuf_uint32(wb, len) && writebuf_put(wb, value, length);
-}
+ /* type of the stub: 0=server, 1=client */
+ uint8_t is_client;
-static int writebuf_string(struct writebuf *wb, const char *value)
-{
- return writebuf_string_length(wb, value, strlen(value));
-}
+ /* the api name */
+ char apiname[];
+};
-static int writebuf_object(struct writebuf *wb, struct json_object *object)
-{
- const char *string = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
- return string != NULL && writebuf_string(wb, string);
-}
+static struct afb_proto_ws *afb_stub_ws_create_proto(struct afb_stub_ws *stubws, struct fdev *fdev, uint8_t server);
/******************* ws request part for server *****************/
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
afb_context_disconnect(&wreq->xreq.context);
- afb_cred_unref(wreq->xreq.cred);
json_object_put(wreq->xreq.json);
+ afb_proto_ws_call_unref(wreq->call);
afb_stub_ws_unref(wreq->stubws);
free(wreq);
}
-static void server_req_success_cb(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+static void server_req_reply_cb(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
{
int rc;
- struct writebuf wb = { .count = 0 };
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- if (writebuf_char(&wb, CHAR_FOR_ANSWER_SUCCESS)
- && writebuf_uint32(&wb, wreq->msgid)
- && writebuf_uint32(&wb, (uint32_t)wreq->xreq.context.flags)
- && writebuf_string(&wb, info ? : "")
- && writebuf_object(&wb, obj)) {
- rc = afb_ws_binary_v(wreq->stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- goto success;
- }
- ERROR("error while sending success");
-success:
+ rc = afb_proto_ws_call_reply(wreq->call, obj, error, info);
+ if (rc < 0)
+ ERROR("error while sending reply");
json_object_put(obj);
}
-static void server_req_fail_cb(struct afb_xreq *xreq, const char *status, const char *info)
+static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
{
int rc;
- struct writebuf wb = { .count = 0 };
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- if (writebuf_char(&wb, CHAR_FOR_ANSWER_FAIL)
- && writebuf_uint32(&wb, wreq->msgid)
- && writebuf_uint32(&wb, (uint32_t)wreq->xreq.context.flags)
- && writebuf_string(&wb, status)
- && writebuf_string(&wb, info ? : "")) {
- rc = afb_ws_binary_v(wreq->stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- return;
- }
- ERROR("error while sending fail");
-}
-
-static void server_req_subcall_cb(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
-{
- int rc;
- struct writebuf wb = { .count = 0 };
- struct server_subcall *sc, *osc;
- struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- struct afb_stub_ws *stubws = wreq->stubws;
-
- sc = malloc(sizeof *sc);
- if (!sc) {
- callback(cb_closure, 1, afb_msg_json_internal_error());
- } else {
- sc->callback = callback;
- sc->closure = cb_closure;
-
- pthread_mutex_unlock(&stubws->mutex);
- sc->subcallid = ptr2id(sc);
- do {
- sc->subcallid++;
- osc = stubws->subcalls;
- while(osc && osc->subcallid != sc->subcallid)
- osc = osc->next;
- } while (osc);
- sc->next = stubws->subcalls;
- stubws->subcalls = sc;
- pthread_mutex_unlock(&stubws->mutex);
-
- if (writebuf_char(&wb, CHAR_FOR_SUBCALL_CALL)
- && writebuf_uint32(&wb, wreq->msgid)
- && writebuf_uint32(&wb, sc->subcallid)
- && writebuf_string(&wb, api)
- && writebuf_string(&wb, verb)
- && writebuf_object(&wb, args)) {
- rc = afb_ws_binary_v(wreq->stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- return;
- }
- ERROR("error while sending fail");
- }
-}
-
-static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event event)
-{
- int rc, rc2;
- struct writebuf wb = { .count = 0 };
- struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
-
- rc = afb_evt_add_watch(wreq->stubws->listener, event);
+ rc = afb_evt_listener_watch_x2(wreq->stubws->listener, event);
+ if (rc >= 0)
+ rc = afb_proto_ws_call_subscribe(wreq->call, afb_evt_event_x2_id(event));
if (rc < 0)
- return rc;
-
- if (writebuf_char(&wb, CHAR_FOR_EVT_SUBSCRIBE)
- && writebuf_uint32(&wb, wreq->msgid)
- && writebuf_uint32(&wb, (uint32_t)afb_evt_event_id(event))
- && writebuf_string(&wb, afb_evt_event_name(event))) {
- rc2 = afb_ws_binary_v(wreq->stubws->ws, wb.iovec, wb.count);
- if (rc2 >= 0)
- goto success;
- }
- ERROR("error while subscribing event");
-success:
+ ERROR("error while subscribing event");
return rc;
}
-static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event event)
+static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
{
- int rc, rc2;
- struct writebuf wb = { .count = 0 };
+ int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- if (writebuf_char(&wb, CHAR_FOR_EVT_UNSUBSCRIBE)
- && writebuf_uint32(&wb, wreq->msgid)
- && writebuf_uint32(&wb, (uint32_t)afb_evt_event_id(event))
- && writebuf_string(&wb, afb_evt_event_name(event))) {
- rc2 = afb_ws_binary_v(wreq->stubws->ws, wb.iovec, wb.count);
- if (rc2 >= 0)
- goto success;
- }
- ERROR("error while subscribing event");
-success:
- rc = afb_evt_remove_watch(wreq->stubws->listener, event);
+ rc = afb_proto_ws_call_unsubscribe(wreq->call, afb_evt_event_x2_id(event));
+ if (rc < 0)
+ ERROR("error while unsubscribing event");
return rc;
}
static const struct afb_xreq_query_itf server_req_xreq_itf = {
- .success = server_req_success_cb,
- .fail = server_req_fail_cb,
+ .reply = server_req_reply_cb,
.unref = server_req_destroy_cb,
- .subcall = server_req_subcall_cb,
.subscribe = server_req_subscribe_cb,
.unsubscribe = server_req_unsubscribe_cb
};
/******************* client part **********************************/
-/* search a memorized call */
-static struct client_call *client_call_search(struct afb_stub_ws *stubws, uint32_t msgid)
+static struct afb_proto_ws *client_get_proto(struct afb_stub_ws *stubws)
{
- struct client_call *call;
+ struct fdev *fdev;
+ struct afb_proto_ws *proto;
- call = stubws->calls;
- while (call != NULL && call->msgid != msgid)
- call = call->next;
-
- return call;
+ proto = stubws->proto;
+ if (proto == NULL && stubws->robust.reopen) {
+ fdev = stubws->robust.reopen(stubws->robust.closure);
+ if (fdev != NULL)
+ proto = afb_stub_ws_create_proto(stubws, fdev, 0);
+ }
+ return proto;
}
-/* search the event */
-static struct client_event *client_event_search(struct afb_stub_ws *stubws, uint32_t eventid, const char *name)
+static int client_make_ids(struct afb_stub_ws *stubws, struct afb_proto_ws *proto, struct afb_context *context, uint16_t *sessionid, uint16_t *tokenid)
{
- struct client_event *ev;
-
- ev = stubws->events;
- while (ev != NULL && (ev->eventid != eventid || 0 != strcmp(afb_evt_event_name(ev->event), name)))
- ev = ev->next;
-
- return ev;
-}
+ int rc, rc2;
+ uint16_t sid, tid;
+ rc = 0;
-/* allocates and init the memorizing call */
-static struct client_call *client_call_make(struct afb_stub_ws *stubws, struct afb_xreq *xreq)
-{
- struct client_call *call;
-
- call = malloc(sizeof *call);
- if (call != NULL) {
- afb_xreq_addref(xreq);
- call->xreq = xreq;
- call->msgid = ptr2id(call);
- while(client_call_search(stubws, call->msgid) != NULL)
- call->msgid++;
- call->stubws = stubws;
- call->next = stubws->calls;
- stubws->calls = call;
+ /* get the session */
+ if (!context->session)
+ sid = 0;
+ else {
+ sid = afb_session_id(context->session);
+ rc2 = u16id2bool_set(&stubws->session_flags, sid, 1);
+ if (rc2 < 0)
+ rc = rc2;
+ else if (rc2 == 0)
+ rc = afb_proto_ws_client_session_create(proto, sid, afb_session_uuid(context->session));
}
- return call;
-}
-/* free and release the memorizing call */
-static void client_call_destroy(struct client_call *call)
-{
- struct client_call **prv;
-
- prv = &call->stubws->calls;
- while (*prv != NULL) {
- if (*prv == call) {
- *prv = call->next;
- break;
+ /* get the token */
+ if (!context->token)
+ tid = 0;
+ else {
+ tid = afb_token_id(context->token);
+ rc2 = u16id2bool_set(&stubws->token_flags, tid, 1);
+ if (rc2 < 0)
+ rc = rc2;
+ else if (rc2 == 0) {
+ rc2 = afb_proto_ws_client_token_create(proto, tid, afb_token_string(context->token));
+ if (rc2 < 0)
+ rc = rc2;
}
- prv = &(*prv)->next;
}
- afb_xreq_unref(call->xreq);
- free(call);
-}
-
-/* get event data from the message */
-static int client_msg_event_read(struct readbuf *rb, uint32_t *eventid, const char **name)
-{
- return readbuf_uint32(rb, eventid) && readbuf_string(rb, name, NULL);
+ *sessionid = sid;
+ *tokenid = tid;
+ return rc;
}
-/* get event from the message */
-static int client_msg_event_get(struct afb_stub_ws *stubws, struct readbuf *rb, struct client_event **ev)
+/* on call, propagate it to the ws service */
+static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
{
- const char *name;
- uint32_t eventid;
+ int rc;
+ struct afb_stub_ws *stubws = closure;
+ struct afb_proto_ws *proto;
+ uint16_t sessionid;
+ uint16_t tokenid;
- /* get event data from the message */
- if (!client_msg_event_read(rb, &eventid, &name)) {
- ERROR("Invalid message");
- return 0;
+ proto = client_get_proto(stubws);
+ if (proto == NULL) {
+ afb_xreq_reply(xreq, NULL, afb_error_text_disconnected, NULL);
+ return;
}
- /* check conflicts */
- *ev = client_event_search(stubws, eventid, name);
- if (*ev == NULL) {
- ERROR("event %s not found", name);
- return 0;
+ rc = client_make_ids(stubws, proto, &xreq->context, &sessionid, &tokenid);
+ if (rc >= 0) {
+ afb_xreq_unhooked_addref(xreq);
+ rc = afb_proto_ws_client_call(
+ proto,
+ xreq->request.called_verb,
+ afb_xreq_json(xreq),
+ sessionid,
+ tokenid,
+ xreq,
+ xreq_on_behalf_cred_export(xreq));
+ }
+ if (rc < 0) {
+ afb_xreq_reply(xreq, NULL, afb_error_text_internal_error, "can't send message");
+ afb_xreq_unhooked_unref(xreq);
}
-
- return 1;
}
-/* get event from the message */
-static int client_msg_call_get(struct afb_stub_ws *stubws, struct readbuf *rb, struct client_call **call)
+/* get the description */
+static void client_api_describe_cb(void * closure, void (*describecb)(void *, struct json_object *), void *clocb)
{
- uint32_t msgid;
-
- /* get event data from the message */
- if (!readbuf_uint32(rb, &msgid)) {
- ERROR("Invalid message");
- return 0;
- }
-
- /* get the call */
- *call = client_call_search(stubws, msgid);
- if (*call == NULL) {
- ERROR("message not found");
- return 0;
- }
+ struct afb_stub_ws *stubws = closure;
+ struct afb_proto_ws *proto;
- return 1;
+ proto = client_get_proto(stubws);
+ if (proto)
+ afb_proto_ws_client_describe(proto, describecb, clocb);
+ else
+ describecb(clocb, NULL);
}
-/* read a subscrition message */
-static int client_msg_subscription_get(struct afb_stub_ws *stubws, struct readbuf *rb, struct client_call **call, struct client_event **ev)
-{
- return client_msg_call_get(stubws, rb, call) && client_msg_event_get(stubws, rb, ev);
-}
+/******************* server part: manage events **********************************/
-/* adds an event */
-static void client_event_create(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_event_add_cb(void *closure, const char *event, uint16_t eventid)
{
- size_t offset;
- const char *name;
- uint32_t eventid;
- struct client_event *ev;
-
- /* get event data from the message */
- offset = client_msg_event_read(rb, &eventid, &name);
- if (offset == 0) {
- ERROR("Invalid message");
- return;
- }
-
- /* check conflicts */
- ev = client_event_search(stubws, eventid, name);
- if (ev != NULL) {
- ev->refcount++;
- return;
- }
+ int rc;
+ struct afb_stub_ws *stubws = closure;
- /* no conflict, try to add it */
- ev = malloc(sizeof *ev);
- if (ev != NULL) {
- ev->event = afb_evt_create_event(name);
- if (ev->event.closure == NULL)
- free(ev);
- else {
- ev->refcount = 1;
- ev->eventid = eventid;
- ev->next = stubws->events;
- stubws->events = ev;
- return;
+ if (stubws->proto != NULL) {
+ rc = u16id2bool_set(&stubws->event_flags, eventid, 1);
+ if (rc == 0) {
+ rc = afb_proto_ws_server_event_create(stubws->proto, eventid, event);
+ if (rc < 0)
+ u16id2bool_set(&stubws->event_flags, eventid, 0);
}
}
- ERROR("can't create event %s, out of memory", name);
-}
-
-/* removes an event */
-static void client_event_drop(struct afb_stub_ws *stubws, struct readbuf *rb)
-{
- struct client_event *ev, **prv;
-
- /* retrieves the event */
- if (!client_msg_event_get(stubws, rb, &ev))
- return;
-
- /* decrease the reference count */
- if (--ev->refcount)
- return;
-
- /* unlinks the event */
- prv = &stubws->events;
- while (*prv != ev)
- prv = &(*prv)->next;
- *prv = ev->next;
-
- /* destroys the event */
- afb_event_drop(ev->event);
- free(ev);
}
-/* subscribes an event */
-static void client_event_subscribe(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_event_remove_cb(void *closure, const char *event, uint16_t eventid)
{
- struct client_event *ev;
- struct client_call *call;
+ struct afb_stub_ws *stubws = closure;
- if (client_msg_subscription_get(stubws, rb, &call, &ev)) {
- /* subscribe the request from the event */
- if (afb_xreq_subscribe(call->xreq, ev->event) < 0)
- ERROR("can't subscribe: %m");
+ if (stubws->proto != NULL) {
+ if (u16id2bool_set(&stubws->event_flags, eventid, 0))
+ afb_proto_ws_server_event_remove(stubws->proto, eventid);
}
}
-/* unsubscribes an event */
-static void client_event_unsubscribe(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_event_push_cb(void *closure, const char *event, uint16_t eventid, struct json_object *object)
{
- struct client_event *ev;
- struct client_call *call;
+ struct afb_stub_ws *stubws = closure;
- if (client_msg_subscription_get(stubws, rb, &call, &ev)) {
- /* unsubscribe the request from the event */
- if (afb_xreq_unsubscribe(call->xreq, ev->event) < 0)
- ERROR("can't unsubscribe: %m");
- }
+ if (stubws->proto != NULL && u16id2bool_get(stubws->event_flags, eventid))
+ afb_proto_ws_server_event_push(stubws->proto, eventid, object);
+ json_object_put(object);
}
-/* receives broadcasted events */
-static void client_event_broadcast(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_event_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
{
- struct json_object *object;
- const char *event;
+ struct afb_stub_ws *stubws = closure;
- if (readbuf_string(rb, &event, NULL) && readbuf_object(rb, &object))
- afb_evt_broadcast(event, object);
- else
- ERROR("unreadable broadcasted event");
+ if (stubws->proto != NULL)
+ afb_proto_ws_server_event_broadcast(stubws->proto, event, object, uuid, hop);
+ json_object_put(object);
}
-/* pushs an event */
-static void client_event_push(struct afb_stub_ws *stubws, struct readbuf *rb)
+/*****************************************************/
+
+static void client_on_reply_cb(void *closure, void *request, struct json_object *object, const char *error, const char *info)
{
- struct client_event *ev;
- struct json_object *object;
+ struct afb_xreq *xreq = request;
- if (client_msg_event_get(stubws, rb, &ev) && readbuf_object(rb, &object))
- afb_event_push(ev->event, object);
- else
- ERROR("unreadable push event");
+ afb_xreq_reply(xreq, object, error, info);
+ afb_xreq_unhooked_unref(xreq);
}
-static void client_reply_success(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void client_on_event_create_cb(void *closure, uint16_t event_id, const char *event_name)
{
- struct client_call *call;
- struct json_object *object;
- const char *info;
- uint32_t flags;
-
- /* retrieve the message data */
- if (!client_msg_call_get(stubws, rb, &call))
- return;
-
- if (readbuf_uint32(rb, &flags)
- && readbuf_string(rb, &info, NULL)
- && readbuf_object(rb, &object)) {
- call->xreq->context.flags = (unsigned)flags;
- afb_xreq_success(call->xreq, object, *info ? info : NULL);
- } else {
- /* failing to have the answer */
- afb_xreq_fail(call->xreq, "error", "ws error");
+ struct afb_stub_ws *stubws = closure;
+ struct afb_event_x2 *event;
+ int rc;
+
+ /* check conflicts */
+ event = afb_evt_event_x2_create(event_name);
+ if (event == NULL)
+ ERROR("can't create event %s, out of memory", event_name);
+ else {
+ rc = u16id2ptr_add(&stubws->event_proxies, event_id, event);
+ if (rc < 0) {
+ ERROR("can't record event %s", event_name);
+ afb_evt_event_x2_unref(event);
+ }
}
- client_call_destroy(call);
}
-static void client_reply_fail(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void client_on_event_remove_cb(void *closure, uint16_t event_id)
{
- struct client_call *call;
- const char *info, *status;
- uint32_t flags;
-
- /* retrieve the message data */
- if (!client_msg_call_get(stubws, rb, &call))
- return;
+ struct afb_stub_ws *stubws = closure;
+ struct afb_event_x2 *event;
+ int rc;
- if (readbuf_uint32(rb, &flags)
- && readbuf_string(rb, &status, NULL)
- && readbuf_string(rb, &info, NULL)) {
- call->xreq->context.flags = (unsigned)flags;
- afb_xreq_fail(call->xreq, status, *info ? info : NULL);
- } else {
- /* failing to have the answer */
- afb_xreq_fail(call->xreq, "error", "ws error");
- }
- client_call_destroy(call);
+ rc = u16id2ptr_drop(&stubws->event_proxies, event_id, (void**)&event);
+ if (rc == 0 && event)
+ afb_evt_event_x2_unref(event);
}
-/* send a subcall reply */
-static void client_send_subcall_reply(struct client_subcall *subcall, int iserror, json_object *object)
+static void client_on_event_subscribe_cb(void *closure, void *request, uint16_t event_id)
{
+ struct afb_stub_ws *stubws = closure;
+ struct afb_xreq *xreq = request;
+ struct afb_event_x2 *event;
int rc;
- struct writebuf wb = { .count = 0 };
- char ie = (char)!!iserror;
-
- if (!writebuf_char(&wb, CHAR_FOR_SUBCALL_REPLY)
- || !writebuf_uint32(&wb, subcall->subcallid)
- || !writebuf_char(&wb, ie)
- || !writebuf_object(&wb, object)) {
- /* write error ? */
- return;
- }
- rc = afb_ws_binary_v(subcall->stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- return;
- ERROR("error while sending subcall reply");
+ rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+ if (rc < 0 || !event || afb_xreq_subscribe(xreq, event) < 0)
+ ERROR("can't subscribe: %m");
}
-/* callback for subcall reply */
-static void client_subcall_reply_cb(void *closure, int iserror, json_object *object)
+static void client_on_event_unsubscribe_cb(void *closure, void *request, uint16_t event_id)
{
- client_send_subcall_reply(closure, iserror, object);
- free(closure);
+ struct afb_stub_ws *stubws = closure;
+ struct afb_xreq *xreq = request;
+ struct afb_event_x2 *event;
+ int rc;
+
+ rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+ if (rc < 0 || !event || afb_xreq_unsubscribe(xreq, event) < 0)
+ ERROR("can't unsubscribe: %m");
}
-/* received a subcall request */
-static void client_subcall(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void client_on_event_push_cb(void *closure, uint16_t event_id, struct json_object *data)
{
- struct client_subcall *subcall;
- struct client_call *call;
- const char *api, *verb;
- uint32_t subcallid;
- struct json_object *object;
-
- subcall = malloc(sizeof *subcall);
- if (!subcall)
- return;
+ struct afb_stub_ws *stubws = closure;
+ struct afb_event_x2 *event;
+ int rc;
- /* retrieve the message data */
- if (!client_msg_call_get(stubws, rb, &call))
- return;
+ rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+ if (rc >= 0 && event)
+ rc = afb_evt_event_x2_push(event, data);
+ else
+ ERROR("unreadable push event");
+ if (rc <= 0)
+ afb_proto_ws_client_event_unexpected(stubws->proto, event_id);
+}
- if (readbuf_uint32(rb, &subcallid)
- && readbuf_string(rb, &api, NULL)
- && readbuf_string(rb, &verb, NULL)
- && readbuf_object(rb, &object)) {
- subcall->stubws = stubws;
- subcall->subcallid = subcallid;
- afb_xreq_subcall(call->xreq, api, verb, object, client_subcall_reply_cb, subcall);
- }
+static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data, const uuid_binary_t uuid, uint8_t hop)
+{
+ afb_evt_rebroadcast(event_name, data, uuid, hop);
}
-/* pushs an event */
-static void client_on_description(struct afb_stub_ws *stubws, struct readbuf *rb)
+/*****************************************************/
+
+static struct afb_session *server_add_session(struct afb_stub_ws *stubws, uint16_t sessionid, const char *sessionstr)
{
- uint32_t descid;
- struct client_describe *desc;
- struct json_object *object;
+ struct afb_session *session;
+ int rc, created;
- if (!readbuf_uint32(rb, &descid))
- ERROR("unreadable description");
+ session = afb_session_get(sessionstr, AFB_SESSION_TIMEOUT_DEFAULT, &created);
+ if (session == NULL)
+ ERROR("can't create session %s, out of memory", sessionstr);
else {
- desc = stubws->describes;
- while (desc && desc->descid != descid)
- desc = desc->next;
- if (desc == NULL)
- ERROR("unexpected description");
- else {
- if (readbuf_object(rb, &object))
- desc->result = object;
- else
- ERROR("bad description");
- jobs_leave(desc->jobloop);
+ afb_session_set_autoclose(session, 1);
+ rc = u16id2ptr_add(&stubws->session_proxies, sessionid, session);
+ if (rc < 0) {
+ ERROR("can't record session %s", sessionstr);
+ afb_session_unref(session);
+ session = NULL;
}
}
+ return session;
}
-/* callback when receiving binary data */
-static void client_on_binary(void *closure, char *data, size_t size)
+static void server_on_session_create_cb(void *closure, uint16_t sessionid, const char *sessionstr)
{
- if (size > 0) {
- struct afb_stub_ws *stubws = closure;
- struct readbuf rb = { .head = data, .end = data + size };
-
- pthread_mutex_lock(&stubws->mutex);
- switch (*rb.head++) {
- case CHAR_FOR_ANSWER_SUCCESS: /* success */
- client_reply_success(stubws, &rb);
- break;
- case CHAR_FOR_ANSWER_FAIL: /* fail */
- client_reply_fail(stubws, &rb);
- break;
- case CHAR_FOR_EVT_BROADCAST: /* broadcast */
- client_event_broadcast(stubws, &rb);
- break;
- case CHAR_FOR_EVT_ADD: /* creates the event */
- client_event_create(stubws, &rb);
- break;
- case CHAR_FOR_EVT_DEL: /* drops the event */
- client_event_drop(stubws, &rb);
- break;
- case CHAR_FOR_EVT_PUSH: /* pushs the event */
- client_event_push(stubws, &rb);
- break;
- case CHAR_FOR_EVT_SUBSCRIBE: /* subscribe event for a request */
- client_event_subscribe(stubws, &rb);
- break;
- case CHAR_FOR_EVT_UNSUBSCRIBE: /* unsubscribe event for a request */
- client_event_unsubscribe(stubws, &rb);
- break;
- case CHAR_FOR_SUBCALL_CALL: /* subcall */
- client_subcall(stubws, &rb);
- break;
- case CHAR_FOR_DESCRIPTION: /* description */
- client_on_description(stubws, &rb);
- break;
- default: /* unexpected message */
- /* TODO: close the connection */
- break;
- }
- pthread_mutex_unlock(&stubws->mutex);
- }
- free(data);
+ struct afb_stub_ws *stubws = closure;
+
+ server_add_session(stubws, sessionid, sessionstr);
}
-/* on call, propagate it to the ws service */
-static void client_call_cb(void * closure, struct afb_xreq *xreq)
+static void server_on_session_remove_cb(void *closure, uint16_t sessionid)
{
- int rc;
- struct client_call *call;
- struct writebuf wb = { .count = 0 };
- const char *raw;
- size_t szraw;
struct afb_stub_ws *stubws = closure;
+ struct afb_session *session;
+ int rc;
+
+ rc = u16id2ptr_drop(&stubws->event_proxies, sessionid, (void**)&session);
+ if (rc == 0 && session)
+ afb_session_unref(session);
+}
- pthread_mutex_lock(&stubws->mutex);
+static void server_on_token_create_cb(void *closure, uint16_t tokenid, const char *tokenstr)
+{
+ struct afb_stub_ws *stubws = closure;
+ struct afb_token *token;
+ int rc;
- /* create the recording data */
- call = client_call_make(stubws, xreq);
- if (call == NULL) {
- afb_xreq_fail_f(xreq, "error", "out of memory");
- goto end;
+ rc = afb_token_get(&token, tokenstr);
+ if (rc < 0)
+ ERROR("can't create token %s, out of memory", tokenstr);
+ else {
+ rc = u16id2ptr_add(&stubws->token_proxies, tokenid, token);
+ if (rc < 0) {
+ ERROR("can't record token %s", tokenstr);
+ afb_token_unref(token);
+ }
}
-
- /* creates the call message */
- raw = afb_xreq_raw(xreq, &szraw);
- if (raw == NULL)
- goto internal_error;
- if (!writebuf_char(&wb, CHAR_FOR_CALL)
- || !writebuf_uint32(&wb, call->msgid)
- || !writebuf_uint32(&wb, (uint32_t)xreq->context.flags)
- || !writebuf_string(&wb, xreq->verb)
- || !writebuf_string(&wb, afb_session_uuid(xreq->context.session))
- || !writebuf_string_length(&wb, raw, szraw))
- goto overflow;
-
- /* send */
- rc = afb_ws_binary_v(stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- goto end;
-
- afb_xreq_fail(xreq, "error", "websocket sending error");
- goto clean_call;
-
-internal_error:
- afb_xreq_fail(xreq, "error", "internal: raw is NULL!");
- goto clean_call;
-
-overflow:
- afb_xreq_fail(xreq, "error", "overflow: size doesn't match 32 bits!");
-
-clean_call:
- client_call_destroy(call);
-end:
- pthread_mutex_unlock(&stubws->mutex);
}
-static void client_send_describe_cb(int signum, void *closure, struct jobloop *jobloop)
+static void server_on_token_remove_cb(void *closure, uint16_t tokenid)
{
- struct client_describe *desc = closure;
- struct writebuf wb = { .count = 0 };
-
- if (!signum) {
- /* record the jobloop */
- desc->jobloop = jobloop;
-
- /* send */
- if (writebuf_char(&wb, CHAR_FOR_DESCRIBE)
- && writebuf_uint32(&wb, desc->descid)
- && afb_ws_binary_v(desc->stubws->ws, wb.iovec, wb.count) >= 0)
- return;
- }
- jobs_leave(jobloop);
+ struct afb_stub_ws *stubws = closure;
+ struct afb_token *token;
+ int rc;
+
+ rc = u16id2ptr_drop(&stubws->event_proxies, tokenid, (void**)&token);
+ if (rc == 0 && token)
+ afb_token_unref(token);
}
-/* get the description */
-static struct json_object *client_describe_cb(void * closure)
+static void server_on_event_unexpected_cb(void *closure, uint16_t eventid)
{
- struct client_describe desc, *d;
struct afb_stub_ws *stubws = closure;
- /* fill in stack the description of the task */
- pthread_mutex_lock(&stubws->mutex);
- desc.result = NULL;
- desc.descid = ptr2id(&desc);
- d = stubws->describes;
- while (d) {
- if (d->descid != desc.descid)
- d = d->next;
- else {
- desc.descid++;
- d = stubws->describes;
- }
- }
- desc.stubws = stubws;
- desc.next = stubws->describes;
- stubws->describes = &desc;
- pthread_mutex_unlock(&stubws->mutex);
-
- /* synchronous job: send the request and wait its result */
- jobs_enter(NULL, 0, client_send_describe_cb, &desc);
-
- /* unlink and send the result */
- pthread_mutex_lock(&stubws->mutex);
- d = stubws->describes;
- if (d == &desc)
- stubws->describes = desc.next;
- else {
- while (d) {
- if (d->next != &desc)
- d = d->next;
- else {
- d->next = desc.next;
- d = NULL;
- }
- }
- }
- pthread_mutex_unlock(&stubws->mutex);
- return desc.result;
+ afb_evt_listener_unwatch_id(stubws->listener, eventid);
}
-/******************* client description part for server *****************************/
-
-/* on call, propagate it to the ws service */
-static void server_on_call(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, uint16_t sessionid, uint16_t tokenid, const char *user_creds)
{
+ struct afb_stub_ws *stubws = closure;
struct server_req *wreq;
- char *cverb;
- const char *uuid, *verb;
- uint32_t flags, msgid;
- size_t lenverb;
- struct json_object *object;
+ struct afb_session *session;
+ struct afb_token *token;
+ int rc;
afb_stub_ws_addref(stubws);
- /* reads the call message data */
- if (!readbuf_uint32(rb, &msgid)
- || !readbuf_uint32(rb, &flags)
- || !readbuf_string(rb, &verb, &lenverb)
- || !readbuf_string(rb, &uuid, NULL)
- || !readbuf_object(rb, &object))
- goto overflow;
+ /* get tokens and sessions */
+ rc = u16id2ptr_get(stubws->session_proxies, sessionid, (void**)&session);
+ if (rc < 0) {
+ if (sessionid != 0)
+ goto no_session;
+ session = server_add_session(stubws, sessionid, NULL);
+ if (!session)
+ goto out_of_memory;
+ }
+ if (!tokenid || u16id2ptr_get(stubws->token_proxies, tokenid, (void**)&token) < 0)
+ token = NULL;
/* create the request */
- wreq = malloc(++lenverb + sizeof *wreq);
+ wreq = malloc(sizeof *wreq);
if (wreq == NULL)
goto out_of_memory;
afb_xreq_init(&wreq->xreq, &server_req_xreq_itf);
wreq->stubws = stubws;
- wreq->msgid = msgid;
- cverb = (char*)&wreq[1];
- memcpy(cverb, verb, lenverb);
+ wreq->call = call;
/* init the context */
- if (afb_context_connect(&wreq->xreq.context, uuid, NULL) < 0)
- goto unconnected;
- wreq->xreq.context.flags = flags;
+ afb_context_init(&wreq->xreq.context, session, token, stubws->cred);
+ afb_context_on_behalf_import(&wreq->xreq.context, user_creds);
/* makes the call */
- wreq->xreq.cred = afb_cred_addref(stubws->cred);
- wreq->xreq.api = stubws->apiname;
- wreq->xreq.verb = cverb;
- wreq->xreq.json = object;
+ wreq->xreq.request.called_api = stubws->apiname;
+ wreq->xreq.request.called_verb = verb;
+ wreq->xreq.json = args;
afb_xreq_process(&wreq->xreq, stubws->apiset);
return;
-unconnected:
- free(wreq);
out_of_memory:
- json_object_put(object);
-overflow:
+no_session:
+ json_object_put(args);
afb_stub_ws_unref(stubws);
+ afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL);
+ afb_proto_ws_call_unref(call);
}
-/* on subcall reply */
-static void server_on_subcall_reply(struct afb_stub_ws *stubws, struct readbuf *rb)
+static void server_on_description_cb(void *closure, struct json_object *description)
{
- char iserror;
- uint32_t subcallid;
- struct json_object *object;
- struct server_subcall *sc, **psc;
-
- /* reads the call message data */
- if (!readbuf_uint32(rb, &subcallid)
- || !readbuf_char(rb, &iserror)
- || !readbuf_object(rb, &object)) {
- /* TODO bad protocol */
- return;
- }
-
- /* search the subcall and unlink it */
- pthread_mutex_lock(&stubws->mutex);
- psc = &stubws->subcalls;
- while ((sc = *psc) && sc->subcallid != subcallid)
- psc = &sc->next;
- if (!sc) {
- pthread_mutex_unlock(&stubws->mutex);
- /* TODO subcall not found */
- } else {
- *psc = sc->next;
- pthread_mutex_unlock(&stubws->mutex);
- sc->callback(sc->closure, (int)iserror, object);
- free(sc);
- }
- json_object_put(object);
+ struct afb_proto_ws_describe *describe = closure;
+ afb_proto_ws_describe_put(describe, description);
+ json_object_put(description);
}
-static void server_send_description(struct afb_stub_ws *stubws, uint32_t descid, struct json_object *descobj)
-{
- struct writebuf wb = { .count = 0 };
-
- if (!writebuf_char(&wb, CHAR_FOR_DESCRIPTION)
- || !writebuf_uint32(&wb, descid)
- || !writebuf_object(&wb, descobj)
- || afb_ws_binary_v(stubws->ws, wb.iovec, wb.count) < 0)
- ERROR("can't send description");
-}
-static void server_describe_job(int signum, void *closure)
+static void server_on_describe_cb(void *closure, struct afb_proto_ws_describe *describe)
{
- struct afb_api api;
- struct json_object *obj;
- struct server_describe *desc = closure;
-
- /* get the description if possible */
- obj = NULL;
- if (!signum
- && !afb_apiset_get(desc->stubws->apiset, desc->stubws->apiname, &api)
- && api.itf->describe) {
- obj = api.itf->describe(api.closure);
- }
+ struct afb_stub_ws *stubws = closure;
- /* send it */
- server_send_description(desc->stubws, desc->descid, obj);
- json_object_put(obj);
- afb_stub_ws_unref(desc->stubws);
- free(desc);
+ afb_apiset_describe(stubws->apiset, stubws->apiname, server_on_description_cb, describe);
}
-/* on describe, propagate it to the ws service */
-static void server_on_describe(struct afb_stub_ws *stubws, struct readbuf *rb)
+/*****************************************************/
+
+static const struct afb_proto_ws_client_itf client_itf =
{
+ .on_reply = client_on_reply_cb,
+ .on_event_create = client_on_event_create_cb,
+ .on_event_remove = client_on_event_remove_cb,
+ .on_event_subscribe = client_on_event_subscribe_cb,
+ .on_event_unsubscribe = client_on_event_unsubscribe_cb,
+ .on_event_push = client_on_event_push_cb,
+ .on_event_broadcast = client_on_event_broadcast_cb,
+};
- uint32_t descid;
- struct server_describe *desc;
-
- /* reads the descid */
- if (readbuf_uint32(rb, &descid)) {
- /* create asynchronous job */
- desc = malloc(sizeof *desc);
- if (desc) {
- desc->descid = descid;
- desc->stubws = stubws;
- afb_stub_ws_addref(stubws);
- if (jobs_queue(NULL, 0, server_describe_job, desc) < 0)
- server_describe_job(0, desc);
- return;
- }
- server_send_description(stubws, descid, NULL);
- }
- ERROR("can't provide description");
-}
+static struct afb_api_itf client_api_itf = {
+ .call = client_api_call_cb,
+ .describe = client_api_describe_cb
+};
-/* callback when receiving binary data */
-static void server_on_binary(void *closure, char *data, size_t size)
+static const struct afb_proto_ws_server_itf server_itf =
{
- if (size > 0) {
- struct readbuf rb = { .head = data, .end = data + size };
- switch (*rb.head++) {
- case CHAR_FOR_CALL:
- server_on_call(closure, &rb);
- break;
- case CHAR_FOR_SUBCALL_REPLY:
- server_on_subcall_reply(closure, &rb);
- break;
- case CHAR_FOR_DESCRIBE:
- server_on_describe(closure, &rb);
- break;
- default: /* unexpected message */
- /* TODO: close the connection */
- break;
- }
- }
- free(data);
-}
+ .on_session_create = server_on_session_create_cb,
+ .on_session_remove = server_on_session_remove_cb,
+ .on_token_create = server_on_token_create_cb,
+ .on_token_remove = server_on_token_remove_cb,
+ .on_call = server_on_call_cb,
+ .on_describe = server_on_describe_cb,
+ .on_event_unexpected = server_on_event_unexpected_cb
+};
-/******************* server part: manage events **********************************/
+/* the interface for events pushing */
+static const struct afb_evt_itf server_event_itf = {
+ .broadcast = server_event_broadcast_cb,
+ .push = server_event_push_cb,
+ .add = server_event_add_cb,
+ .remove = server_event_remove_cb
+};
-static void server_event_send(struct afb_stub_ws *stubws, char order, const char *event, int eventid, const char *data)
-{
- int rc;
- struct writebuf wb = { .count = 0 };
-
- if (writebuf_char(&wb, order)
- && writebuf_uint32(&wb, eventid)
- && writebuf_string(&wb, event)
- && (data == NULL || writebuf_string(&wb, data))) {
- rc = afb_ws_binary_v(stubws->ws, wb.iovec, wb.count);
- if (rc >= 0)
- return;
- }
- ERROR("error while sending %c for event %s", order, event);
-}
+/*****************************************************/
+/*****************************************************/
-static void server_event_add(void *closure, const char *event, int eventid)
+static void release_all_sessions_cb(void*closure, uint16_t id, void *ptr)
{
- server_event_send(closure, CHAR_FOR_EVT_ADD, event, eventid, NULL);
+ struct afb_session *session = ptr;
+ afb_session_unref(session);
}
-static void server_event_remove(void *closure, const char *event, int eventid)
+static void release_all_tokens_cb(void*closure, uint16_t id, void *ptr)
{
- server_event_send(closure, CHAR_FOR_EVT_DEL, event, eventid, NULL);
+ struct afb_token *token = ptr;
+ afb_token_unref(token);
}
-static void server_event_push(void *closure, const char *event, int eventid, struct json_object *object)
+static void release_all_events_cb(void*closure, uint16_t id, void *ptr)
{
- const char *data = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN);
- server_event_send(closure, CHAR_FOR_EVT_PUSH, event, eventid, data ? : "null");
- json_object_put(object);
+ struct afb_event_x2 *eventid = ptr;
+ afb_evt_event_x2_unref(eventid);
}
-static void server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object)
+/* disconnect */
+static void disconnect(struct afb_stub_ws *stubws)
{
- int rc;
- struct afb_stub_ws *stubws = closure;
-
- struct writebuf wb = { .count = 0 };
+ struct u16id2ptr *i2p;
+ struct u16id2bool *i2b;
- if (writebuf_char(&wb, CHAR_FOR_EVT_BROADCAST) && writebuf_string(&wb, event) && writebuf_object(&wb, object)) {
- rc = afb_ws_binary_v(stubws->ws, wb.iovec, wb.count);
- if (rc < 0)
- ERROR("error while broadcasting event %s", event);
- } else
- ERROR("error while broadcasting event %s", event);
- json_object_put(object);
+ afb_proto_ws_unref(__atomic_exchange_n(&stubws->proto, NULL, __ATOMIC_RELAXED));
+ if (stubws->is_client) {
+ i2p = __atomic_exchange_n(&stubws->event_proxies, NULL, __ATOMIC_RELAXED);
+ if (i2p) {
+ u16id2ptr_forall(i2p, release_all_events_cb, NULL);
+ u16id2ptr_destroy(&i2p);
+ }
+ i2b = __atomic_exchange_n(&stubws->session_flags, NULL, __ATOMIC_RELAXED);
+ u16id2bool_destroy(&i2b);
+ i2b = __atomic_exchange_n(&stubws->token_flags, NULL, __ATOMIC_RELAXED);
+ u16id2bool_destroy(&i2b);
+ } else {
+ afb_evt_listener_unref(__atomic_exchange_n(&stubws->listener, NULL, __ATOMIC_RELAXED));
+ afb_cred_unref(__atomic_exchange_n(&stubws->cred, NULL, __ATOMIC_RELAXED));
+ i2b = __atomic_exchange_n(&stubws->event_flags, NULL, __ATOMIC_RELAXED);
+ u16id2bool_destroy(&i2b);
+ i2p = __atomic_exchange_n(&stubws->session_proxies, NULL, __ATOMIC_RELAXED);
+ if (i2p) {
+ u16id2ptr_forall(i2p, release_all_sessions_cb, NULL);
+ u16id2ptr_destroy(&i2p);
+ }
+ i2p = __atomic_exchange_n(&stubws->token_proxies, NULL, __ATOMIC_RELAXED);
+ if (i2p) {
+ u16id2ptr_forall(i2p, release_all_tokens_cb, NULL);
+ u16id2ptr_destroy(&i2p);
+ }
+ }
}
-/*****************************************************/
-
/* callback when receiving a hangup */
-static void server_on_hangup(void *closure)
+static void on_hangup(void *closure)
{
struct afb_stub_ws *stubws = closure;
- /* close the socket */
- if (stubws->fd >= 0) {
- close(stubws->fd);
- stubws->fd = -1;
+ if (stubws->proto) {
+ afb_stub_ws_addref(stubws);
+ disconnect(stubws);
+ if (stubws->on_hangup)
+ stubws->on_hangup(stubws);
+ afb_stub_ws_unref(stubws);
}
+}
- /* release the client */
- afb_stub_ws_unref(stubws);
+static int enqueue_processing(struct afb_proto_ws *proto, void (*callback)(int signum, void* arg), void *arg)
+{
+ return jobs_queue(proto, 0, callback, arg);
}
/*****************************************************/
-/* the interface for events pushing */
-static const struct afb_evt_itf server_evt_itf = {
- .broadcast = server_event_broadcast,
- .push = server_event_push,
- .add = server_event_add,
- .remove = server_event_remove
-};
-
-static const struct afb_ws_itf stub_ws_client_ws_itf =
-{
- .on_close = NULL,
- .on_text = NULL,
- .on_binary = client_on_binary,
- .on_error = NULL,
- .on_hangup = NULL
-};
-
-static const struct afb_ws_itf server_ws_itf =
+static struct afb_proto_ws *afb_stub_ws_create_proto(struct afb_stub_ws *stubws, struct fdev *fdev, uint8_t is_client)
{
- .on_close = NULL,
- .on_text = NULL,
- .on_binary = server_on_binary,
- .on_error = NULL,
- .on_hangup = server_on_hangup
-};
+ struct afb_proto_ws *proto;
-static struct afb_api_itf ws_api_itf = {
- .call = client_call_cb,
- .describe = client_describe_cb
-};
+ stubws->proto = proto = is_client
+ ? afb_proto_ws_create_client(fdev, &client_itf, stubws)
+ : afb_proto_ws_create_server(fdev, &server_itf, stubws);
+ if (proto) {
+ afb_proto_ws_on_hangup(proto, on_hangup);
+ afb_proto_ws_set_queuing(proto, enqueue_processing);
+ }
-/*****************************************************/
+ return proto;
+}
-static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struct afb_apiset *apiset, const struct afb_ws_itf *itf)
+static struct afb_stub_ws *afb_stub_ws_create(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset, uint8_t is_client)
{
struct afb_stub_ws *stubws;
- stubws = calloc(1, sizeof *stubws + strlen(apiname));
+ stubws = calloc(1, sizeof *stubws + 1 + strlen(apiname));
if (stubws == NULL)
errno = ENOMEM;
else {
- fcntl(fd, F_SETFD, FD_CLOEXEC);
- fcntl(fd, F_SETFL, O_NONBLOCK);
- stubws->ws = afb_ws_create(afb_common_get_event_loop(), fd, itf, stubws);
- if (stubws->ws != NULL) {
- stubws->fd = fd;
+ if (afb_stub_ws_create_proto(stubws, fdev, is_client)) {
+ stubws->refcount = 1;
+ stubws->is_client = is_client;
strcpy(stubws->apiname, apiname);
stubws->apiset = afb_apiset_addref(apiset);
- stubws->refcount = 1;
- stubws->subcalls = NULL;
return stubws;
}
free(stubws);
}
+ fdev_unref(fdev);
return NULL;
}
-struct afb_stub_ws *afb_stub_ws_create_client(int fd, const char *apiname, struct afb_apiset *apiset)
+struct afb_stub_ws *afb_stub_ws_create_client(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset)
{
- struct afb_api afb_api;
- struct afb_stub_ws *stubws;
-
- stubws = afb_stub_ws_create(fd, apiname, apiset, &stub_ws_client_ws_itf);
- if (stubws) {
- afb_api.closure = stubws;
- afb_api.itf = &ws_api_itf;
- if (afb_apiset_add(apiset, stubws->apiname, afb_api) >= 0)
- return stubws;
- afb_stub_ws_unref(stubws);
- }
- return NULL;
-
+ return afb_stub_ws_create(fdev, apiname, apiset, 1);
}
-struct afb_stub_ws *afb_stub_ws_create_server(int fd, const char *apiname, struct afb_apiset *apiset)
+struct afb_stub_ws *afb_stub_ws_create_server(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset)
{
struct afb_stub_ws *stubws;
- stubws = afb_stub_ws_create(fd, apiname, apiset, &server_ws_itf);
+ stubws = afb_stub_ws_create(fdev, apiname, apiset, 0);
if (stubws) {
- stubws->cred = afb_cred_create_for_socket(fd);
- stubws->listener = afb_evt_listener_create(&server_evt_itf, stubws);
+ stubws->cred = afb_cred_create_for_socket(fdev_fd(fdev));
+ stubws->listener = afb_evt_listener_create(&server_event_itf, stubws);
if (stubws->listener != NULL)
return stubws;
afb_stub_ws_unref(stubws);
void afb_stub_ws_unref(struct afb_stub_ws *stubws)
{
- struct server_subcall *sc, *nsc;
-
- if (!__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
- afb_evt_listener_unref(stubws->listener);
- afb_ws_destroy(stubws->ws);
- nsc = stubws->subcalls;
- while (nsc) {
- sc= nsc;
- nsc = sc->next;
- sc->callback(sc->closure, 1, NULL);
- free(sc);
+ if (stubws && !__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
+
+ if (stubws->is_client) {
+ stubws->robust.reopen = NULL;
+ if (stubws->robust.release)
+ stubws->robust.release(stubws->robust.closure);
}
- afb_cred_unref(stubws->cred);
+
+ disconnect(stubws);
afb_apiset_unref(stubws->apiset);
free(stubws);
}
__atomic_add_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED);
}
+void afb_stub_ws_set_on_hangup(struct afb_stub_ws *stubws, void (*on_hangup)(struct afb_stub_ws*))
+{
+ stubws->on_hangup = on_hangup;
+}
+
+const char *afb_stub_ws_name(struct afb_stub_ws *stubws)
+{
+ return stubws->apiname;
+}
+
+struct afb_api_item afb_stub_ws_client_api(struct afb_stub_ws *stubws)
+{
+ struct afb_api_item api;
+
+ assert(stubws->is_client); /* check client */
+ api.closure = stubws;
+ api.itf = &client_api_itf;
+ api.group = stubws; /* serialize for reconnections */
+ return api;
+}
+
+int afb_stub_ws_client_add(struct afb_stub_ws *stubws, struct afb_apiset *apiset)
+{
+ return afb_apiset_add(apiset, stubws->apiname, afb_stub_ws_client_api(stubws));
+}
+
+void afb_stub_ws_client_robustify(struct afb_stub_ws *stubws, struct fdev *(*reopen)(void*), void *closure, void (*release)(void*))
+{
+ assert(stubws->is_client); /* check client */
+
+ if (stubws->robust.release)
+ stubws->robust.release(stubws->robust.closure);
+
+ stubws->robust.reopen = reopen;
+ stubws->robust.closure = closure;
+ stubws->robust.release = release;
+}
Code Review / src / app-framework-binder.git / blobdiff