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

diff --git a/src/session.c b/src/session.c
index 87e92376..ddff2c3e 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");
@@ -38,22 +38,15 @@ struct client_value
 	void (*free_value)(void*);
 };
 
-struct afb_event_listener_list
-{
-	struct afb_event_listener_list *next;
-	struct afb_event_listener listener;
-	int refcount;
-};
-
 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
 	char token[37];       // short term authentication of remote client
 	struct client_value *values;
-	struct afb_event_listener_list *listeners;
 };
 
 // Session UUID are store in a simple array [for 10 sessions this should be enough]
@@ -64,10 +57,17 @@ static struct {
   int max;
   int timeout;
   int apicount;
-  const char *initok;
-  struct afb_event_listener_list *listeners;
+  char initok[37];
 } 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 +84,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)
@@ -197,31 +196,11 @@ 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)
+static struct AFB_clientCtx *new_context (const char *uuid, int timeout, time_t now)
 {
-	uuid_t newuuid;
 	struct AFB_clientCtx *clientCtx;
-	time_t now;
 
-	/* cleaning */
-	now = NOW;
-	ctxStoreCleanUp (now);
-
-	/* search for an existing one not too old */
-	if (uuid != NULL) {
-		if (strlen(uuid) >= sizeof clientCtx->uuid) {
-			errno = EINVAL;
-			goto error;
-		}
-		clientCtx = ctxStoreSearch(uuid);
-		if (clientCtx != NULL) {
-			*created = 0;
-			goto found;
-		}
-	}
-
-	/* returns a new one */
+	/* allocates a new one */
         clientCtx = calloc(1, sizeof(struct AFB_clientCtx) + ((unsigned)sessions.apicount * sizeof(*clientCtx->values)));
 	if (clientCtx == NULL) {
 		errno = ENOMEM;
@@ -231,9 +210,12 @@ 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 {
+		if (strlen(uuid) >= sizeof clientCtx->uuid) {
+			errno = EINVAL;
+			goto error2;
+		}
 		strcpy(clientCtx->uuid, uuid);
 	}
 
@@ -244,11 +226,9 @@ struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created)
 		errno = ENOMEM;
 		goto error2;
 	}
-	*created = 1;
 
-found:
 	clientCtx->access = now;
-	clientCtx->refcount++;
+	clientCtx->refcount = 1;
 	return clientCtx;
 
 error2:
@@ -257,6 +237,48 @@ error:
 	return NULL;
 }
 
+struct AFB_clientCtx *ctxClientCreate (const char *uuid, int timeout)
+{
+	time_t now;
+
+	/* cleaning */
+	now = NOW;
+	ctxStoreCleanUp (now);
+
+	/* search for an existing one not too old */
+	if (uuid != NULL && ctxStoreSearch(uuid) != NULL) {
+		errno = EEXIST;
+		return NULL;
+	}
+
+	return new_context(uuid, timeout, now);
+}
+
+// This function will return exiting client context or newly created client context
+struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created)
+{
+	struct AFB_clientCtx *clientCtx;
+	time_t now;
+
+	/* cleaning */
+	now = NOW;
+	ctxStoreCleanUp (now);
+
+	/* search for an existing one not too old */
+	if (uuid != NULL) {
+		clientCtx = ctxStoreSearch(uuid);
+		if (clientCtx != NULL) {
+			*created = 0;
+			clientCtx->access = now;
+			clientCtx->refcount++;
+			return clientCtx;
+		}
+	}
+
+	*created = 1;
+	return new_context(uuid, sessions.timeout, now);
+}
+
 struct AFB_clientCtx *ctxClientAddRef(struct AFB_clientCtx *clientCtx)
 {
 	if (clientCtx != NULL)
@@ -271,6 +293,7 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx)
 		--clientCtx->refcount;
        		if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) {
 			ctxStoreDel (clientCtx);
+			free(clientCtx);
 		}
 	}
 }
@@ -279,8 +302,14 @@ 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);
+       		if (clientCtx->refcount == 0) {
+			ctxStoreDel (clientCtx);
+			free(clientCtx);
+		}
+	}
 }
 
 // Sample Generic Ping Debug API
@@ -302,125 +331,37 @@ 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;
 }
 
-static int add_listener(struct afb_event_listener_list **head, struct afb_event_listener listener)
-{
-	struct afb_event_listener_list *iter, **prv;
-
-	prv = head;
-	for (;;) {
-		iter = *prv;
-		if (iter == NULL) {
-			iter = calloc(1, sizeof *iter);
-			if (iter == NULL) {
-				errno = ENOMEM;
-				return -1;
-			}
-			iter->listener = listener;
-			iter->refcount = 1;
-			*prv = iter;
-			return 0;
-		}
-		if (iter->listener.itf == listener.itf && iter->listener.closure == listener.closure) {
-			iter->refcount++;
-			return 0;
-		}
-		prv = &iter->next;
-	}
-}
-
-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 = head;
-	for (;;) {
-		iter = *prv;
-		if (iter == NULL)
-			return;
-		if (iter->listener.itf == listener.itf && iter->listener.closure == listener.closure) {
-			if (!--iter->refcount) {
-				*prv = iter->next;
-				free(iter);
-			}
-			return;
-		}
-		prv = &iter->next;
-	}
-}
-
-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)
+const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx)
 {
-	struct afb_event_listener_list *iter;
-	int result;
-
-	result = 0;
-	iter = head;
-	while (iter != NULL) {
-		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;
-	}
-
-	return result;
+	assert(clientCtx != NULL);
+	return clientCtx->uuid;
 }
 
-int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx)
 {
-	long idx;
-	time_t now;
-	int result;
-
-	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 = ctxClientAddRef(sessions.store[idx]);
-			if (clientCtx != NULL && ctxIsActive(clientCtx, now)) {
-				clientCtx = ctxClientAddRef(clientCtx);
-				result += send(clientCtx->listeners, event, object);
-			}
-			ctxClientUnref(clientCtx);
-		}
-	}
-	return result;
+	assert(clientCtx != NULL);
+	return clientCtx->token;
 }
 
-const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx)
+unsigned ctxClientGetLOA (struct AFB_clientCtx *clientCtx)
 {
 	assert(clientCtx != NULL);
-	return clientCtx->uuid;
+	return clientCtx->loa;
 }
 
-const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx)
+void ctxClientSetLOA (struct AFB_clientCtx *clientCtx, unsigned loa)
 {
 	assert(clientCtx != NULL);
-	return clientCtx->token;
+	clientCtx->loa = loa;
 }
 
 void *ctxClientValueGet(struct AFB_clientCtx *clientCtx, int index)
@@ -439,6 +380,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);
 }