afb-session: Refactor and test unit

[src/app-framework-binder.git] / src / afb-stub-ws.c

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 7637f22..1647592 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -33,7 +33,6 @@
 #include <pthread.h>
 
 #include <json-c/json.h>
-#include <systemd/sd-event.h>
 
 #include <afb/afb-event.h>
 
@@ -126,6 +125,15 @@ struct server_describe
        struct afb_proto_ws_describe *describe;
 };
 
+/*
+ * structure for recording sessions
+ */
+struct server_session
+{
+       struct server_session *next;
+       struct afb_session *session;
+};
+
 /******************* stub description for client or servers ******************/
 
 struct afb_stub_ws
@@ -148,6 +156,9 @@ struct afb_stub_ws
        /* credentials (server side) */
        struct afb_cred *cred;
 
+       /* sessions (server side) */
+       struct server_session *sessions;
+
        /* apiset */
        struct afb_apiset *apiset;
 
@@ -461,6 +472,46 @@ static void on_subcall(void *closure, struct afb_proto_ws_subcall *subcall, void
 
 /*****************************************************/
 
+static void record_session(struct afb_stub_ws *stubws, struct afb_session *session)
+{
+       struct server_session *s, **prv;
+
+       /* search */
+       prv = &stubws->sessions;
+       while ((s = *prv)) {
+               if (s->session == session)
+                       return;
+               if (afb_session_is_closed(s->session)) {
+                       *prv = s->next;
+                       afb_session_unref(s->session);
+                       free(s);
+               }
+               else
+                       prv = &s->next;
+       }
+
+       /* create */
+       s = malloc(sizeof *s);
+       if (s) {
+               s->session = afb_session_addref(session);
+               s->next = stubws->sessions;
+               stubws->sessions = s;
+       }
+}
+
+static void release_sessions(struct afb_stub_ws *stubws)
+{
+       struct server_session *s;
+
+       while((s = stubws->sessions)) {
+               stubws->sessions = s->next;
+               afb_session_unref(s->session);
+               free(s);
+       }
+}
+
+/*****************************************************/
+
 static void on_call(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, const char *sessionid)
 {
        struct afb_stub_ws *stubws = closure;
@@ -480,6 +531,10 @@ static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
        /* init the context */
        if (afb_context_connect(&wreq->xreq.context, sessionid, NULL) < 0)
                goto unconnected;
+       wreq->xreq.context.validated = 1;
+       record_session(stubws, wreq->xreq.context.session);
+       if (wreq->xreq.context.created)
+               afb_session_set_autoclose(wreq->xreq.context.session, 1);
 
        /* makes the call */
        wreq->xreq.cred = afb_cred_addref(stubws->cred);
@@ -598,6 +653,8 @@ static void on_hangup(void *closure)
 
        if (stubws->on_hangup)
                stubws->on_hangup(stubws);
+
+       release_sessions(stubws);
 }
 
 /*****************************************************/
@@ -611,9 +668,9 @@ static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struc
                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);
@@ -651,6 +708,7 @@ void afb_stub_ws_unref(struct afb_stub_ws *stubws)
        if (!__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
                drop_all_events(stubws);
                afb_evt_listener_unref(stubws->listener);
+               release_sessions(stubws);
                afb_proto_ws_unref(stubws->proto);
                afb_cred_unref(stubws->cred);
                afb_apiset_unref(stubws->apiset);