#include <pthread.h>
#include <json-c/json.h>
-#include <systemd/sd-event.h>
#include <afb/afb-event.h>
int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- rc = afb_evt_add_watch(wreq->stubws->listener, event);
+ rc = afb_evt_eventid_add_watch(wreq->stubws->listener, event);
if (rc >= 0)
- rc = afb_proto_ws_call_subscribe(wreq->call, afb_evt_event_fullname(event), afb_evt_event_id(event));
+ rc = afb_proto_ws_call_subscribe(wreq->call, afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
if (rc < 0)
ERROR("error while subscribing event");
return rc;
int rc, rc2;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
- rc = afb_proto_ws_call_unsubscribe(wreq->call, afb_evt_event_fullname(event), afb_evt_event_id(event));
- rc2 = afb_evt_remove_watch(wreq->stubws->listener, event);
+ rc = afb_proto_ws_call_unsubscribe(wreq->call, afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
+ rc2 = afb_evt_eventid_remove_watch(wreq->stubws->listener, event);
if (rc >= 0 && rc2 < 0)
rc = rc2;
if (rc < 0)
struct client_event *ev;
ev = stubws->events;
- while (ev != NULL && (ev->id != eventid || 0 != strcmp(afb_evt_event_fullname(ev->eventid), name)))
+ while (ev != NULL && (ev->id != eventid || 0 != strcmp(afb_evt_eventid_fullname(ev->eventid), name)))
ev = ev->next;
return ev;
{
struct afb_stub_ws *stubws = closure;
- afb_proto_ws_client_call(stubws->proto, xreq->verb, afb_xreq_json(xreq), afb_session_uuid(xreq->context.session), xreq);
+ afb_proto_ws_client_call(stubws->proto, xreq->request.verb, afb_xreq_json(xreq), afb_session_uuid(xreq->context.session), xreq);
afb_xreq_unhooked_addref(xreq);
}
/* no conflict, try to add it */
ev = malloc(sizeof *ev);
if (ev != NULL) {
- ev->eventid = afb_evt_create_event(event_name);
+ ev->eventid = afb_evt_eventid_create(event_name);
if (ev->eventid != NULL) {
ev->refcount = 1;
ev->id = event_id;
*prv = ev->next;
/* destroys the event */
- afb_evt_event_unref(ev->eventid);
+ afb_evt_eventid_unref(ev->eventid);
free(ev);
}
/* check conflicts */
ev = client_event_search(stubws, event_id, event_name);
if (ev)
- afb_evt_push(ev->eventid, data);
+ afb_evt_eventid_push(ev->eventid, data);
else
ERROR("unreadable push event");
}
afb_evt_broadcast(event_name, data);
}
-static void client_subcall_reply_cb(void *closure, int status, json_object *object)
+static void client_subcall_reply_cb(void *closure, int status, json_object *object, struct afb_request *request)
{
struct afb_proto_ws_subcall *subcall = closure;
afb_proto_ws_subcall_reply(subcall, status, object);
/* init the context */
if (afb_context_connect(&wreq->xreq.context, sessionid, NULL) < 0)
goto unconnected;
+ wreq->xreq.context.validated = 1;
/* makes the call */
wreq->xreq.cred = afb_cred_addref(stubws->cred);
- wreq->xreq.api = stubws->apiname;
- wreq->xreq.verb = verb;
+ wreq->xreq.request.api = stubws->apiname;
+ wreq->xreq.request.verb = verb;
wreq->xreq.json = args;
afb_xreq_process(&wreq->xreq, stubws->apiset);
return;
while (ev) {
nxt = ev->next;
- afb_evt_event_unref(ev->eventid);
+ afb_evt_eventid_unref(ev->eventid);
free(ev);
ev = nxt;
}
errno = ENOMEM;
else {
if (client)
- stubws->proto = afb_proto_ws_create_client(fd, &client_itf, stubws);
+ stubws->proto = afb_proto_ws_create_client(afb_common_get_event_loop(), fd, &client_itf, stubws);
else
- stubws->proto = afb_proto_ws_create_server(fd, &server_itf, stubws);
+ stubws->proto = afb_proto_ws_create_server(afb_common_get_event_loop(), fd, &server_itf, stubws);
if (stubws->proto != NULL) {
strcpy(stubws->apiname, apiname);
stubws->apiset = afb_apiset_addref(apiset);