X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=326b16af067777cd792a580851f31bf9dd754f05;hb=146f95b776c7a424e672b27386fbb8392bc0ffb7;hp=336dfd7005e6b17b28970787926e31d470316d1a;hpb=423d86c6032c0a27f790a3766abd0c855726eab1;p=src%2Fapp-framework-binder.git

diff --git a/src/session.c b/src/session.c
index 336dfd70..326b16af 100644
--- a/src/session.c
+++ b/src/session.c
@@ -64,10 +64,18 @@ static struct {
   int max;
   int timeout;
   int apicount;
-  const char *initok;
+  char initok[37];
   struct afb_event_listener_list *listeners;
 } sessions;
 
+/* generate a uuid */
+static void new_uuid(char uuid[37])
+{
+	uuid_t newuuid;
+	uuid_generate(newuuid);
+	uuid_unparse_lower(newuuid, uuid);
+}
+
 // Free context [XXXX Should be protected again memory abort XXXX]
 static void ctxUuidFreeCB (struct AFB_clientCtx *client)
 {
@@ -84,21 +92,20 @@ 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)) {
+	if (initok == NULL)
+		/* without token, a secret is made to forbid creation of sessions */
+		new_uuid(sessions.initok);
+	else if (strlen(initok) < sizeof(sessions.store[0]->token))
+		strcpy(sessions.initok, initok);
+	else {
 		ERROR("initial token '%s' too long (max length 36)", initok);
 		exit(1);
 	}
-	sessions.initok = initok;
 }
 
 static struct AFB_clientCtx *ctxStoreSearch (const char* uuid)
@@ -200,7 +207,6 @@ static void ctxStoreCleanUp (time_t now)
 // This function will return exiting client context or newly created client context
 struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created)
 {
-	uuid_t newuuid;
 	struct AFB_clientCtx *clientCtx;
 	time_t now;
 
@@ -231,8 +237,7 @@ struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created)
 
 	/* generate the uuid */
 	if (uuid == NULL) {
-		uuid_generate(newuuid);
-		uuid_unparse_lower(newuuid, clientCtx->uuid);
+		new_uuid(clientCtx->uuid);
 	} else {
 		strcpy(clientCtx->uuid, uuid);
 	}
@@ -271,6 +276,7 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx)
 		--clientCtx->refcount;
        		if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) {
 			ctxStoreDel (clientCtx);
+			free(clientCtx);
 		}
 	}
 }
@@ -279,8 +285,16 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx)
 void ctxClientClose (struct AFB_clientCtx *clientCtx)
 {
 	assert(clientCtx != NULL);
-        ctxUuidFreeCB (clientCtx);
-	clientCtx->uuid[0] = 0;
+	if (clientCtx->uuid[0] != 0) {
+		clientCtx->uuid[0] = 0;
+	        ctxUuidFreeCB (clientCtx);
+		while(clientCtx->listeners != NULL)
+			ctxClientEventListenerRemove(clientCtx, clientCtx->listeners->listener);
+       		if (clientCtx->refcount == 0) {
+			ctxStoreDel (clientCtx);
+			free(clientCtx);
+		}
+	}
 }
 
 // Sample Generic Ping Debug API
@@ -302,13 +316,10 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
 // generate a new token and update client context
 void ctxTokenNew (struct AFB_clientCtx *clientCtx)
 {
-	uuid_t newuuid;
-
 	assert(clientCtx != NULL);
 
 	// Old token was valid let's regenerate a new one
-	uuid_generate(newuuid);         // create a new UUID
-	uuid_unparse_lower(newuuid, clientCtx->token);
+	new_uuid(clientCtx->token);
 
 	// keep track of time for session timeout and further clean up
 	clientCtx->expiration = NOW + sessions.timeout;
@@ -378,8 +389,10 @@ static int send(struct afb_event_listener_list *head, const char *event, struct
 	result = 0;
 	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;
 	}