afb-systemd: Isolate systemd main entries

[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 d5355ff..0049c50 100644 (file)
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -36,7 +36,7 @@
 
 #include <afb/afb-event.h>
 
-#include "afb-common.h"
+#include "afb-systemd.h"
 
 #include "afb-session.h"
 #include "afb-cred.h"
@@ -481,13 +481,13 @@ static void record_session(struct afb_stub_ws *stubws, struct afb_session *sessi
        while ((s = *prv)) {
                if (s->session == session)
                        return;
-               if (afb_session_is_active(s->session))
-                       prv = &s->next;
-               else {
+               if (afb_session_is_closed(s->session)) {
                        *prv = s->next;
-                       afb_session_addref(s->session);
+                       afb_session_unref(s->session);
                        free(s);
                }
+               else
+                       prv = &s->next;
        }
 
        /* create */
@@ -533,6 +533,8 @@ static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
                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);
@@ -649,10 +651,12 @@ static void on_hangup(void *closure)
 {
        struct afb_stub_ws *stubws = closure;
 
+       afb_stub_ws_addref(stubws);
        if (stubws->on_hangup)
                stubws->on_hangup(stubws);
 
        release_sessions(stubws);
+       afb_stub_ws_unref(stubws);
 }
 
 /*****************************************************/
@@ -666,9 +670,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(afb_common_get_event_loop(), fd, &client_itf, stubws);
+                       stubws->proto = afb_proto_ws_create_client(afb_systemd_get_event_loop(), fd, &client_itf, stubws);
                else
-                       stubws->proto = afb_proto_ws_create_server(afb_common_get_event_loop(), fd, &server_itf, stubws);
+                       stubws->proto = afb_proto_ws_create_server(afb_systemd_get_event_loop(), fd, &server_itf, stubws);
                if (stubws->proto != NULL) {
                        strcpy(stubws->apiname, apiname);
                        stubws->apiset = afb_apiset_addref(apiset);
@@ -705,7 +709,8 @@ 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);
+               if (stubws->listener)
+                       afb_evt_listener_unref(stubws->listener);
                release_sessions(stubws);
                afb_proto_ws_unref(stubws->proto);
                afb_cred_unref(stubws->cred);