X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=16dc836903021bef8cfd9f36bf9ebf496d4ebd84;hb=bf9d05d3ba3c482a75cfa6aedf661f6e51728e3e;hp=d08ca759b3b130833e444da26fbdb7f7b57ee768;hpb=1e8edd92a04281bddc86fff3db5b407943504aed;p=src%2Fapp-framework-binder.git

diff --git a/src/session.c b/src/session.c
index d08ca759..16dc8369 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,6 +48,7 @@ struct afb_event_listener_list
 struct AFB_clientCtx
 {
 	unsigned refcount;
+	unsigned loa;
 	time_t expiration;    // expiration time of the token
 	time_t access;
 	char uuid[37];        // long term authentication of remote client
@@ -64,9 +65,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)
 {
@@ -88,11 +98,15 @@ void ctxStoreInit (int max_session_count, int timeout, const char *initok, int c
 	sessions.max = max_session_count;
 	sessions.timeout = timeout;
 	sessions.apicount = context_count;
-	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)
@@ -165,7 +179,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
@@ -186,7 +208,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;
 
@@ -217,8 +238,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);
 	}
@@ -257,6 +277,7 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx)
 		--clientCtx->refcount;
        		if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) {
 			ctxStoreDel (clientCtx);
+			free(clientCtx);
 		}
 	}
 }
@@ -265,8 +286,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
@@ -276,7 +305,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)
@@ -288,23 +317,20 @@ 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;
 }
 
-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) {
@@ -326,11 +352,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)
@@ -346,16 +377,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;
 	}
 
@@ -368,18 +406,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;
@@ -397,6 +435,18 @@ const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx)
 	return clientCtx->token;
 }
 
+unsigned ctxClientGetLOA (struct AFB_clientCtx *clientCtx)
+{
+	assert(clientCtx != NULL);
+	return clientCtx->loa;
+}
+
+void ctxClientSetLOA (struct AFB_clientCtx *clientCtx, unsigned loa)
+{
+	assert(clientCtx != NULL);
+	clientCtx->loa = loa;
+}
+
 void *ctxClientValueGet(struct AFB_clientCtx *clientCtx, int index)
 {
 	assert(clientCtx != NULL);
@@ -413,6 +463,6 @@ void ctxClientValueSet(struct AFB_clientCtx *clientCtx, int index, void *value,
 	assert(index < sessions.apicount);
 	prev = clientCtx->values[index];
 	clientCtx->values[index] = (struct client_value){.value = value, .free_value = free_value};
-	if (prev.value !=  NULL && prev.free_value != NULL)
+	if (prev.value != NULL && prev.value != value && prev.free_value != NULL)
 		prev.free_value(prev.value);
 }