X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=87e923769260b9c7a2c1f2037638a8e8d75fab46;hb=3b0d4962f64f546474fa033ffa4e3d067194c888;hp=d586e51791b00ddc1df5ef903a2a3ab7d82be274;hpb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;p=src%2Fapp-framework-binder.git

diff --git a/src/session.c b/src/session.c
index d586e517..87e92376 100644
--- a/src/session.c
+++ b/src/session.c
@@ -25,9 +25,10 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <json.h>
+#include <json-c/json.h>
 
 #include "session.h"
+#include "verbose.h"
 
 #define NOW (time(NULL))
 
@@ -64,6 +65,7 @@ static struct {
   int timeout;
   int apicount;
   const char *initok;
+  struct afb_event_listener_list *listeners;
 } sessions;
 
 // Free context [XXXX Should be protected again memory abort XXXX]
@@ -82,13 +84,18 @@ static void ctxUuidFreeCB (struct AFB_clientCtx *client)
 // Create a new store in RAM, not that is too small it will be automatically extended
 void ctxStoreInit (int max_session_count, int timeout, const char *initok, int context_count)
 {
+
 	// let's create as store as hashtable does not have any
 	sessions.store = calloc (1 + (unsigned)max_session_count, sizeof(struct AFB_clientCtx));
 	sessions.max = max_session_count;
 	sessions.timeout = timeout;
 	sessions.apicount = context_count;
+        if (!initok) {
+		ERROR("\"--token=\" parameter is mandatory");
+		exit(1);
+	}
 	if (strlen(initok) >= sizeof(sessions.store[0]->token)) {
-		fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok);
+		ERROR("initial token '%s' too long (max length 36)", initok);
 		exit(1);
 	}
 	sessions.initok = initok;
@@ -145,8 +152,6 @@ static int ctxStoreAdd (struct AFB_clientCtx *client)
 
     assert (client != NULL);
 
-    //fprintf (stderr, "ctxStoreAdd request uuid=%s count=%d\n", client->uuid, sessions.count);
-
     pthread_mutex_lock(&sessions.mutex);
 
     for (idx=0; idx < sessions.max; idx++) {
@@ -166,7 +171,15 @@ added:
 // Check if context timeout or not
 static int ctxStoreTooOld (struct AFB_clientCtx *ctx, time_t now)
 {
-    return ctx->expiration <= now;
+    assert (ctx != NULL);
+    return ctx->expiration < now;
+}
+
+// Check if context is active or not
+static int ctxIsActive (struct AFB_clientCtx *ctx, time_t now)
+{
+    assert (ctx != NULL);
+    return ctx->uuid[0] != 0 && ctx->expiration >= now;
 }
 
 // Loop on every entry and remove old context sessions.hash
@@ -277,7 +290,7 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
 	assert(token != NULL);
 
 	// compare current token with previous one
-	if (ctxStoreTooOld (clientCtx, NOW))
+	if (!ctxIsActive (clientCtx, NOW))
 		return 0;
 
 	if (clientCtx->token[0] && strcmp (token, clientCtx->token) != 0)
@@ -301,11 +314,11 @@ void ctxTokenNew (struct AFB_clientCtx *clientCtx)
 	clientCtx->expiration = NOW + sessions.timeout;
 }
 
-int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+static int add_listener(struct afb_event_listener_list **head, struct afb_event_listener listener)
 {
 	struct afb_event_listener_list *iter, **prv;
 
-	prv = &clientCtx->listeners;
+	prv = head;
 	for (;;) {
 		iter = *prv;
 		if (iter == NULL) {
@@ -327,11 +340,16 @@ int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_
 	}
 }
 
-void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+{
+	return add_listener(clientCtx != NULL ? &clientCtx->listeners : &sessions.listeners, listener);
+}
+
+static void remove_listener(struct afb_event_listener_list **head, struct afb_event_listener listener)
 {
 	struct afb_event_listener_list *iter, **prv;
 
-	prv = &clientCtx->listeners;
+	prv = head;
 	for (;;) {
 		iter = *prv;
 		if (iter == NULL)
@@ -347,16 +365,23 @@ void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_ev
 	}
 }
 
-static int send(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+{
+	remove_listener(clientCtx != NULL ? &clientCtx->listeners : &sessions.listeners, listener);
+}
+
+static int send(struct afb_event_listener_list *head, const char *event, struct json_object *object)
 {
 	struct afb_event_listener_list *iter;
 	int result;
 
 	result = 0;
-	iter = clientCtx->listeners;
+	iter = head;
 	while (iter != NULL) {
-		iter->listener.itf->send(iter->listener.closure, event, json_object_get(object));
-		result++;
+		if (iter->listener.itf->expects == NULL || iter->listener.itf->expects(iter->listener.closure, event)) {
+			iter->listener.itf->send(iter->listener.closure, event, json_object_get(object));
+			result++;
+		}
 		iter = iter->next;
 	}
 
@@ -369,18 +394,18 @@ int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struc
 	time_t now;
 	int result;
 
-	if (clientCtx != NULL)
-		result = send(clientCtx, event, object);
-	else {
-		result = 0;
-		now = NOW;
+	now = NOW;
+	if (clientCtx != NULL) {
+		result = ctxIsActive(clientCtx, now) ? send(clientCtx->listeners, event, object) : 0;
+	} else {
+		result = send(sessions.listeners, event, object);
 		for (idx=0; idx < sessions.max; idx++) {
-			clientCtx = sessions.store[idx];
-			if (clientCtx != NULL && !ctxStoreTooOld(clientCtx, now)) {
+			clientCtx = ctxClientAddRef(sessions.store[idx]);
+			if (clientCtx != NULL && ctxIsActive(clientCtx, now)) {
 				clientCtx = ctxClientAddRef(clientCtx);
-				result += send(clientCtx, event, object);
-				ctxClientUnref(clientCtx);
+				result += send(clientCtx->listeners, event, object);
 			}
+			ctxClientUnref(clientCtx);
 		}
 	}
 	return result;