X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-stub-ws.c;h=e725d5ad6f623af8b8c1218a77c221bebfb0655d;hb=c8558c8a28966110aa3a356f95d3c60afe32b64a;hp=740a8575f1a402acea50d6e771b9e6ecdf0d21cd;hpb=e1b255b4c6486b0d2df5cd8b2aad8b817876ddf2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 740a8575..e725d5ad 100644
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,8 +36,6 @@
 
 #include <afb/afb-event.h>
 
-#include "afb-common.h"
-
 #include "afb-session.h"
 #include "afb-cred.h"
 #include "afb-api.h"
@@ -48,6 +46,7 @@
 #include "afb-evt.h"
 #include "afb-xreq.h"
 #include "verbose.h"
+#include "fdev.h"
 #include "jobs.h"
 
 struct afb_stub_ws;
@@ -481,13 +480,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 */
@@ -499,14 +498,17 @@ static void record_session(struct afb_stub_ws *stubws, struct afb_session *sessi
 	}
 }
 
-static void release_sessions(struct afb_stub_ws *stubws)
+static void release_all_sessions(struct afb_stub_ws *stubws)
 {
-	struct server_session *s;
+	struct server_session *s, *n;
 
-	while((s = stubws->sessions)) {
-		stubws->sessions = s->next;
+	s = stubws->sessions;
+	stubws->sessions = NULL;
+	while(s) {
+		n = s->next;
 		afb_session_unref(s->session);
 		free(s);
+		s = n;
 	}
 }
 
@@ -651,15 +653,17 @@ 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);
+	release_all_sessions(stubws);
+	afb_stub_ws_unref(stubws);
 }
 
 /*****************************************************/
 
-static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struct afb_apiset *apiset, int client)
+static struct afb_stub_ws *afb_stub_ws_create(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset, int client)
 {
 	struct afb_stub_ws *stubws;
 
@@ -668,10 +672,11 @@ 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(fdev, &client_itf, stubws);
 		else
-			stubws->proto = afb_proto_ws_create_server(afb_common_get_event_loop(), fd, &server_itf, stubws);
-		if (stubws->proto != NULL) {
+			stubws->proto = afb_proto_ws_create_server(fdev, &server_itf, stubws);
+
+		if (stubws->proto) {
 			strcpy(stubws->apiname, apiname);
 			stubws->apiset = afb_apiset_addref(apiset);
 			stubws->refcount = 1;
@@ -680,21 +685,22 @@ static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struc
 		}
 		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)
 {
-	return afb_stub_ws_create(fd, apiname, apiset, 1);
+	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, 0);
+	stubws = afb_stub_ws_create(fdev, apiname, apiset, 0);
 	if (stubws) {
-		stubws->cred = afb_cred_create_for_socket(fd);
+		stubws->cred = afb_cred_create_for_socket(fdev_fd(fdev));
 		stubws->listener = afb_evt_listener_create(&server_evt_itf, stubws);
 		if (stubws->listener != NULL)
 			return stubws;
@@ -707,8 +713,9 @@ 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);
+		if (stubws->listener)
+			afb_evt_listener_unref(stubws->listener);
+		release_all_sessions(stubws);
 		afb_proto_ws_unref(stubws->proto);
 		afb_cred_unref(stubws->cred);
 		afb_apiset_unref(stubws->apiset);