X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-proto-ws.c;h=1f7039e6731a7b0e73d6fbdc1f0f5eaf3b495647;hb=refs%2Fchanges%2F71%2F19971%2F1;hp=c079bf69884dd5bcad9dbf89790fc723f91a5e64;hpb=e39610f8c9b2e6bbb8a460f7d7ccccbc5161b4ed;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-proto-ws.c b/src/afb-proto-ws.c
index c079bf69..1f7039e6 100644
--- a/src/afb-proto-ws.c
+++ b/src/afb-proto-ws.c
@@ -35,7 +35,6 @@
 #include "afb-ws.h"
 #include "afb-msg-json.h"
 #include "afb-proto-ws.h"
-#include "jobs.h"
 #include "fdev.h"
 
 struct afb_proto_ws;
@@ -89,7 +88,7 @@ For the purpose of handling events the server can:
 struct client_call {
 	struct client_call *next;	/* the next call */
 	struct afb_proto_ws *protows;	/* the proto_ws */
-	void *request;
+	void *request;			/* the request closure */
 	uint32_t callid;		/* the message identifier */
 };
 
@@ -160,7 +159,7 @@ struct afb_proto_ws
 	void (*on_hangup)(void *closure);
 
 	/* queuing facility for processing messages */
-	int (*queuing)(void (*process)(int s, void *c), void *closure);
+	int (*queuing)(struct afb_proto_ws *proto, void (*process)(int s, void *c), void *closure);
 };
 
 /******************* streaming objects **********************************/
@@ -347,7 +346,7 @@ static void queue_message_processing(struct afb_proto_ws *protows, char *data, s
 			binary->rb.head = data;
 			binary->rb.end = data + size;
 			if (!protows->queuing
-			 || protows->queuing(processing, binary) < 0)
+			 || protows->queuing(protows, processing, binary) < 0)
 				processing(0, binary);
 			return;
 		}
@@ -936,8 +935,18 @@ static void on_hangup(void *closure)
 {
 	struct afb_proto_ws *protows = closure;
 	struct client_describe *cd, *ncd;
+	struct client_call *call, *ncall;
+
+	ncd = __atomic_exchange_n(&protows->describes, NULL, __ATOMIC_RELAXED);
+	ncall = __atomic_exchange_n(&protows->calls, NULL, __ATOMIC_RELAXED);
+
+	while (ncall) {
+		call= ncall;
+		ncall = call->next;
+		protows->client_itf->on_reply(protows->closure, call->request, NULL, "disconnected", "server hung up");
+		free(call);
+	}
 
-	ncd = protows->describes;
 	while (ncd) {
 		cd= ncd;
 		ncd = cd->next;
@@ -1012,7 +1021,7 @@ struct afb_proto_ws *afb_proto_ws_create_server(struct fdev *fdev, const struct
 
 void afb_proto_ws_unref(struct afb_proto_ws *protows)
 {
-	if (!__atomic_sub_fetch(&protows->refcount, 1, __ATOMIC_RELAXED)) {
+	if (protows && !__atomic_sub_fetch(&protows->refcount, 1, __ATOMIC_RELAXED)) {
 		afb_proto_ws_hangup(protows);
 		afb_ws_destroy(protows->ws);
 		pthread_mutex_destroy(&protows->mutex);
@@ -1045,7 +1054,7 @@ void afb_proto_ws_on_hangup(struct afb_proto_ws *protows, void (*on_hangup)(void
 	protows->on_hangup = on_hangup;
 }
 
-void afb_proto_ws_set_queuing(struct afb_proto_ws *protows, int (*queuing)(void (*)(int,void*), void*))
+void afb_proto_ws_set_queuing(struct afb_proto_ws *protows, int (*queuing)(struct afb_proto_ws*, void (*)(int,void*), void*))
 {
 	protows->queuing = queuing;
 }