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

diff --git a/src/session.c b/src/session.c
index a5a00406..d08ca759 100644
--- a/src/session.c
+++ b/src/session.c
@@ -2,515 +2,417 @@
  * Copyright (C) 2015 "IoT.bzh"
  * Author "Fulup Ar Foll"
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Reference: 
- * https://github.com/json-c/json-c/blob/master/linkhash.c
- * https://github.com/json-c/json-c/blob/master/linkhash.h
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
-#include "local-def.h"
-#include <dirent.h>
-#include <string.h>
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#define AFB_SESSION_JTYPE "AFB_session"
-#define AFB_SESSION_JLIST "AFB_sessions"
-#define AFB_SESSION_JINFO "AFB_infos"
-
-
-#define AFB_CURRENT_SESSION "active-session"  // file link name within sndcard dir
-#define AFB_DEFAULT_SESSION "current-session" // should be in sync with UI
-
+#include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
+#include <uuid/uuid.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <json-c/json.h>
+
+#include "session.h"
+#include "verbose.h"
+
+#define NOW (time(NULL))
+
+struct client_value
+{
+	void *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;
+	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]
+static struct {
+  pthread_mutex_t mutex;          // declare a mutex to protect hash table
+  struct AFB_clientCtx **store;          // sessions store
+  int count;                      // current number of sessions
+  int max;
+  int timeout;
+  int apicount;
+  const char *initok;
+} sessions;
 
-static struct lh_table *clientCtxs=NULL;    // let's use JsonObject Hashtable to Store Sessions
+// Free context [XXXX Should be protected again memory abort XXXX]
+static void ctxUuidFreeCB (struct AFB_clientCtx *client)
+{
+	int idx;
 
+	// If application add a handle let's free it now
+	assert (client->values != NULL);
 
-// verify we can read/write in session dir
-PUBLIC AFB_error sessionCheckdir (AFB_session *session) {
+	// Free client handle with a standard Free function, with app callback or ignore it
+	for (idx=0; idx < sessions.apicount; idx ++)
+		ctxClientValueSet(client, idx, NULL, NULL);
+}
 
-   int err;
+// 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 (strlen(initok) >= sizeof(sessions.store[0]->token)) {
+		ERROR("initial token '%s' too long (max length 36)", initok);
+		exit(1);
+	}
+	sessions.initok = initok;
+}
 
-   // in case session dir would not exist create one
-   if (verbose) fprintf (stderr, "AFB:notice checking session dir [%s]\n", session->config->sessiondir);
-   mkdir(session->config->sessiondir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+static struct AFB_clientCtx *ctxStoreSearch (const char* uuid)
+{
+    int  idx;
+    struct AFB_clientCtx *client;
 
-   // change for session directory
-   err = chdir(session->config->sessiondir);
-   if (err) {
-     fprintf(stderr,"AFB: Fail to chdir to %s error=%s\n", session->config->sessiondir, strerror(err));
-     return err;
-   }
+    assert (uuid != NULL);
 
-   // verify we can write session in directory
-   json_object *dummy= json_object_new_object();
-   json_object_object_add (dummy, "checked"  , json_object_new_int (getppid()));
-   err = json_object_to_file ("./AFB-probe.json", dummy);
-   if (err < 0) return err;
+    pthread_mutex_lock(&sessions.mutex);
 
-   return AFB_SUCCESS;
-}
+    for (idx=0; idx < sessions.max; idx++) {
+	client = sessions.store[idx];
+        if (client && (0 == strcmp (uuid, client->uuid)))
+		goto found;
+    }
+    client = NULL;
 
-// let's return only sessions files
-STATIC int fileSelect (const struct dirent *entry) {
-   return (strstr (entry->d_name, ".afb") != NULL);
+found:
+    pthread_mutex_unlock(&sessions.mutex);
+    return client;
 }
 
-STATIC  json_object *checkCardDirExit (AFB_session *session, AFB_request *request ) {
-    int  sessionDir, cardDir;
+static int ctxStoreDel (struct AFB_clientCtx *client)
+{
+    int idx;
+    int status;
 
-    // card name should be more than 3 character long !!!!
-    if (strlen (request->plugin) < 3) {
-       return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->plugin));
-    }
+    assert (client != NULL);
 
-    // open session directory
-    sessionDir = open (session->config->sessiondir, O_DIRECTORY);
-    if (sessionDir < 0) {
-          return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir)));
-    }
+    pthread_mutex_lock(&sessions.mutex);
 
-   // create session sndcard directory if it does not exit
-    cardDir = openat (sessionDir, request->plugin,  O_DIRECTORY);
-    if (cardDir < 0) {
-          cardDir  = mkdirat (sessionDir, request->plugin, O_RDWR | S_IRWXU | S_IRGRP);
-          if (cardDir < 0) {
-              return (jsonNewMessage (AFB_FAIL,"Fail to create directory [%s/%s] error=%s", session->config->sessiondir, request->plugin, strerror(cardDir)));
-          }
+    for (idx=0; idx < sessions.max; idx++) {
+        if (sessions.store[idx] == client) {
+	        sessions.store[idx] = NULL;
+        	sessions.count--;
+	        status = 1;
+		goto deleted;
+	}
     }
-    close (sessionDir);
-    return NULL;
+    status = 0;
+deleted:
+    pthread_mutex_unlock(&sessions.mutex);
+    return status;
 }
 
-// create a session in current directory
-PUBLIC json_object *sessionList (AFB_session *session, AFB_request *request) {
-    json_object *sessionsJ, *ajgResponse;
-    struct stat fstat;
-    struct dirent **namelist;
-    int  count, sessionDir;
-
-    // if directory for card's sessions does not exist create it
-    ajgResponse = checkCardDirExit (session, request);
-    if (ajgResponse != NULL) return ajgResponse;
-
-    // open session directory
-    sessionDir = open (session->config->sessiondir, O_DIRECTORY);
-    if (sessionDir < 0) {
-          return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir)));
-    }
-
-    count = scandirat (sessionDir, request->plugin, &namelist, fileSelect, alphasort);
-    close (sessionDir);
-
-    if (count < 0) {
-        return (jsonNewMessage (AFB_FAIL,"Fail to scan sessions directory [%s/%s] error=%s", session->config->sessiondir, request->plugin, strerror(sessionDir)));
-    }
-    if (count == 0) return (jsonNewMessage (AFB_EMPTY,"[%s] no session at [%s]", request->plugin, session->config->sessiondir));
-
-    // loop on each session file, retrieve its date and push it into json response object
-    sessionsJ = json_object_new_array();
-    while (count--) {
-         json_object *sessioninfo;
-         char timestamp [64];
-         char *filename;
-
-         // extract file name and last modification date
-         filename = namelist[count]->d_name;
-         printf("%s\n", filename);
-         stat(filename,&fstat);
-         strftime (timestamp, sizeof(timestamp), "%c", localtime (&fstat.st_mtime));
-         filename[strlen(filename)-4] = '\0'; // remove .afb extension from filename
-
-         // create an object by session with last update date
-         sessioninfo = json_object_new_object();
-         json_object_object_add (sessioninfo, "date" , json_object_new_string (timestamp));
-         json_object_object_add (sessioninfo, "session" , json_object_new_string (filename));
-         json_object_array_add (sessionsJ, sessioninfo);
-
-         free(namelist[count]);
-    }
+static int ctxStoreAdd (struct AFB_clientCtx *client)
+{
+    int idx;
+    int status;
 
-    // free scandir structure
-    free(namelist);
+    assert (client != NULL);
 
-    // everything is OK let's build final response
-    ajgResponse = json_object_new_object();
-    json_object_object_add (ajgResponse, "jtype" , json_object_new_string (AFB_SESSION_JLIST));
-    json_object_object_add (ajgResponse, "status"  , jsonNewStatus(AFB_SUCCESS));
-    json_object_object_add (ajgResponse, "data"    , sessionsJ);
+    pthread_mutex_lock(&sessions.mutex);
 
-    return (ajgResponse);
+    for (idx=0; idx < sessions.max; idx++) {
+        if (NULL == sessions.store[idx]) {
+        	sessions.store[idx] = client;
+	        sessions.count++;
+        	status = 1;
+		goto added;
+	}
+    }
+    status = 0;
+added:
+    pthread_mutex_unlock(&sessions.mutex);
+    return status;
 }
 
-// Create a link toward last used sessionname within sndcard directory
-STATIC void makeSessionLink (const char *cardname, const char *sessionname) {
-   char linkname [256], filename [256];
-   int err;
-   // create a link to keep track of last uploaded sessionname for this card
-   strncpy (filename, sessionname, sizeof(filename));
-   strncat (filename, ".afb", sizeof(filename));
-
-   strncpy (linkname, cardname, sizeof(linkname));
-   strncat (linkname, "/", sizeof(filename));
-   strncat (linkname, AFB_CURRENT_SESSION, sizeof(linkname));
-   strncat (linkname, ".afb", sizeof(filename));
-   unlink (linkname); // remove previous link if any
-   err = symlink (filename, linkname);
-   if (err < 0) fprintf (stderr, "Fail to create link %s->%s error=%s\n", linkname, filename, strerror(errno));
+// Check if context timeout or not
+static int ctxStoreTooOld (struct AFB_clientCtx *ctx, time_t now)
+{
+    return ctx->expiration <= now;
 }
 
-// Load Json session object from disk
-PUBLIC json_object *sessionFromDisk (AFB_session *session, AFB_request *request, char *name) {
-    json_object *jsonSession, *jtype, *response;
-    const char *ajglabel;
-    char filename [256];
-    int defsession;
-
-    if (name == NULL) {
-        return  (jsonNewMessage (AFB_FATAL,"session name missing &session=MySessionName"));
-    }
-
-    // check for current session request
-    defsession = (strcmp (name, AFB_DEFAULT_SESSION) ==0);
-
-    // if directory for card's sessions does not exist create it
-    response = checkCardDirExit (session, request);
-    if (response != NULL) return response;
+// Loop on every entry and remove old context sessions.hash
+static void ctxStoreCleanUp (time_t now)
+{
+	struct AFB_clientCtx *ctx;
+	long idx;
+
+	// Loop on Sessions Table and remove anything that is older than timeout
+	for (idx=0; idx < sessions.max; idx++) {
+		ctx = sessions.store[idx];
+		if (ctx != NULL && ctxStoreTooOld(ctx, now)) {
+			ctxClientClose (ctx);
+		}
+	}
+}
 
-    // add name and file extension to session name
-    strncpy (filename, request->plugin, sizeof(filename));
-    strncat (filename, "/", sizeof(filename));
-    if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1);
-    else strncat (filename, name, sizeof(filename)-1);
-    strncat (filename, ".afb", sizeof(filename));
+// 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;
+
+	/* 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;
+		}
+	}
 
-    // just upload json object and return without any further processing
-    jsonSession = json_object_from_file (filename);
+	/* returns a new one */
+        clientCtx = calloc(1, sizeof(struct AFB_clientCtx) + ((unsigned)sessions.apicount * sizeof(*clientCtx->values)));
+	if (clientCtx == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+        clientCtx->values = (void*)(clientCtx + 1);
+
+	/* generate the uuid */
+	if (uuid == NULL) {
+		uuid_generate(newuuid);
+		uuid_unparse_lower(newuuid, clientCtx->uuid);
+	} else {
+		strcpy(clientCtx->uuid, uuid);
+	}
 
-    if (jsonSession == NULL)  return (jsonNewMessage (AFB_EMPTY,"File [%s] not found", filename));
+	/* init the token */
+	strcpy(clientCtx->token, sessions.initok);
+	clientCtx->expiration = now + sessions.timeout;
+	if (!ctxStoreAdd (clientCtx)) {
+		errno = ENOMEM;
+		goto error2;
+	}
+	*created = 1;
 
-    // verify that file is a JSON ALSA session type
-    if (!json_object_object_get_ex (jsonSession, "jtype", &jtype)) {
-        json_object_put   (jsonSession);
-        return  (jsonNewMessage (AFB_EMPTY,"File [%s] 'jtype' descriptor not found", filename));
-    }
+found:
+	clientCtx->access = now;
+	clientCtx->refcount++;
+	return clientCtx;
 
-    // check type value is AFB_SESSION_JTYPE
-    ajglabel = json_object_get_string (jtype);
-    if (strcmp (AFB_SESSION_JTYPE, ajglabel)) {
-       json_object_put   (jsonSession);
-       return  (jsonNewMessage (AFB_FATAL,"File [%s] jtype=[%s] != [%s]", filename, ajglabel, AFB_SESSION_JTYPE));
-    }
+error2:
+	free(clientCtx);
+error:
+	return NULL;
+}
 
-    // create a link to keep track of last uploaded session for this card
-    if (!defsession) makeSessionLink (request->plugin, name);
+struct AFB_clientCtx *ctxClientAddRef(struct AFB_clientCtx *clientCtx)
+{
+	if (clientCtx != NULL)
+		clientCtx->refcount++;
+	return clientCtx;
+}
 
-    return (jsonSession);
+void ctxClientUnref(struct AFB_clientCtx *clientCtx)
+{
+	if (clientCtx != NULL) {
+		assert(clientCtx->refcount != 0);
+		--clientCtx->refcount;
+       		if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) {
+			ctxStoreDel (clientCtx);
+		}
+	}
 }
 
-// push Json session object to disk
-PUBLIC json_object * sessionToDisk (AFB_session *session, AFB_request *request, char *name, json_object *jsonSession) {
-   char filename [256];
-   time_t rawtime;
-   struct tm * timeinfo;
-   int err, defsession;
-   static json_object *response;
-
-   // we should have a session name
-   if (name == NULL) return (jsonNewMessage (AFB_FATAL,"session name missing &session=MySessionName"));
-
-   // check for current session request
-   defsession = (strcmp (name, AFB_DEFAULT_SESSION) ==0);
-
-   // if directory for card's sessions does not exist create it
-   response = checkCardDirExit (session, request);
-   if (response != NULL) return response;
-
-   // add cardname and file extension to session name
-   strncpy (filename, request->plugin, sizeof(filename));
-   strncat (filename, "/", sizeof(filename));
-   if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1);
-   else strncat (filename, name, sizeof(filename)-1);
-   strncat (filename, ".afb", sizeof(filename)-1);
-
-
-   json_object_object_add(jsonSession, "jtype", json_object_new_string (AFB_SESSION_JTYPE));
-
-   // add a timestamp and store session on disk
-   time ( &rawtime );  timeinfo = localtime ( &rawtime );
-   // A copy of the string is made and the memory is managed by the json_object
-   json_object_object_add (jsonSession, "timestamp", json_object_new_string (asctime (timeinfo)));
-
-
-   // do we have extra session info ?
-   if (request->post) {
-       static json_object *info, *jtype;
-       const char  *ajglabel;
-
-       // extract session info from args
-       info = json_tokener_parse (request->post);
-       if (!info) {
-            response = jsonNewMessage (AFB_FATAL,"sndcard=%s session=%s invalid json args=%s", request->plugin, name, request->post);
-            goto OnErrorExit;
-       }
-
-       // info is a valid AFB_info type
-       if (!json_object_object_get_ex (info, "jtype", &jtype)) {
-            response = jsonNewMessage (AFB_EMPTY,"sndcard=%s session=%s No 'AFB_pluginT' args=%s", request->plugin, name, request->post);
-            goto OnErrorExit;
-       }
-
-       // check type value is AFB_INFO_JTYPE
-       ajglabel = json_object_get_string (jtype);
-       if (strcmp (AFB_SESSION_JINFO, ajglabel)) {
-              json_object_put   (info); // release info json object
-              response = jsonNewMessage (AFB_FATAL,"File [%s] jtype=[%s] != [%s] data=%s", filename, ajglabel, AFB_SESSION_JTYPE, request->post);
-              goto OnErrorExit;
-       }
-
-       // this is valid info data for our session
-       json_object_object_add (jsonSession, "info", info);
-   }
-
-   // Finally save session on disk
-   err = json_object_to_file (filename, jsonSession);
-   if (err < 0) {
-        response = jsonNewMessage (AFB_FATAL,"Fail save session = [%s] to disk", filename);
-        goto OnErrorExit;
-   }
-
-
-   // create a link to keep track of last uploaded session for this card
-   if (!defsession) makeSessionLink (request->plugin, name);
-
-   // we're donne let's return status message
-   response = jsonNewMessage (AFB_SUCCESS,"Session= [%s] saved on disk", filename);
-   json_object_put (jsonSession);
-   return (response);
-
-OnErrorExit:
-   json_object_put (jsonSession);
-   return response;
+// Free Client Session Context
+void ctxClientClose (struct AFB_clientCtx *clientCtx)
+{
+	assert(clientCtx != NULL);
+        ctxUuidFreeCB (clientCtx);
+	clientCtx->uuid[0] = 0;
 }
 
+// Sample Generic Ping Debug API
+int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
+{
+	assert(clientCtx != NULL);
+	assert(token != NULL);
 
-// Function to handle Cookies and Client session context it relies on json low level
-// linked list functionalities https://github.com/json-c/json-c/blob/master/linkhash.c
+	// compare current token with previous one
+	if (ctxStoreTooOld (clientCtx, NOW))
+		return 0;
 
-// Hash client UUID before storing in table
-STATIC unsigned long ctxUuidHashCB (const void *k1) {
-    unsigned long hash;
-    
-    AFB_clientCtx *ctx = (AFB_clientCtx*) k1;
-    hash = lh_char_hash(ctx->uuid);
-    return (hash);    
-}
+	if (clientCtx->token[0] && strcmp (token, clientCtx->token) != 0)
+		return 0;
 
-// Compare client UUIDs within table
-STATIC int ctxUuidCompCB (const void *k1, const void *k2) {
-    int res;    
-    AFB_clientCtx *ctx1 = (AFB_clientCtx*) k1;
-    AFB_clientCtx *ctx2 = (AFB_clientCtx*) k2;
-    
-    res = lh_char_equal(ctx1->uuid, ctx2->uuid);
-    return (res);    
+	return 1;
 }
 
-// Free context [XXXX Should be protected again memory abort XXXX]
-STATIC void ctxUuidFreeCB (struct lh_entry *entry) {
-    AFB_clientCtx *ctx = (AFB_clientCtx*) entry->v;
-
-    // If application add a handle let's free it now
-    if (ctx->handle != NULL) {
-        
-        // Free client handle with a standard Free function, with app callback or ignore it
-        if (ctx->freeHandleCB == NULL) free (ctx->handle); 
-        else if (ctx->freeHandleCB != (void*)-1) ctx->freeHandleCB(ctx->handle); 
-    }
-    free ((void*)entry->v);
-}
+// generate a new token and update client context
+void ctxTokenNew (struct AFB_clientCtx *clientCtx)
+{
+	uuid_t newuuid;
 
-// Create a new store in RAM, not that is too small it will be automatically extended
-STATIC struct lh_table *ctxStoreCreate (int nbSession) {
-   lh_table *table; 
-    
-   // function will exit process in case of error !!! 
-   table=lh_table_new (nbSession, "CtxClient", ctxUuidFreeCB, ctxUuidHashCB, ctxUuidCompCB);
-   return (table);
-}
+	assert(clientCtx != NULL);
 
-// Check if context timeout or not
-STATIC int ctxStoreToOld (const void *k1, int timeout) {
-    int res;    
-    AFB_clientCtx *ctx = (AFB_clientCtx*) k1;
+	// Old token was valid let's regenerate a new one
+	uuid_generate(newuuid);         // create a new UUID
+	uuid_unparse_lower(newuuid, clientCtx->token);
 
-    res = ((ctx->timeStamp + timeout) < time(NULL));
-    return (res);    
+	// keep track of time for session timeout and further clean up
+	clientCtx->expiration = NOW + sessions.timeout;
 }
 
-// Loop on every entry and remove old context sessions
-PUBLIC int ctxStoreGarbage (struct lh_table *lht, const int timeout) {
-    struct lh_entry *c;
-    
-    // Loop on every entry within table
-    for(c = lht->head; c != NULL; c = c->next) {
-        if(lht->free_fn) {
-            if(c->k == LH_EMPTY) return lht->count;
-            if(c->k != LH_FREED &&  ctxStoreToOld(c->v, timeout)) lh_table_delete_entry (lht, c);
+int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+{
+	struct afb_event_listener_list *iter, **prv;
+
+	prv = &clientCtx->listeners;
+	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;
 	}
-    }
-  
-    // return current size after cleanup
-    return (lht->count);
 }
 
-// This function will return exiting client context or newly created client context
-PUBLIC AFB_error ctxClientGet (AFB_request *request) {
-  static int cid=0;
-  AFB_clientCtx *clientCtx=NULL;
-  const char *uuid;
-  uuid_t newuuid;
-  int ret;
-  
-    if (request->config->token == NULL) return AFB_EMPTY;
-  
-    // if client session store is null create it
-    if (clientCtxs == NULL) {
-       clientCtxs= ctxStoreCreate(CTX_NBCLIENTS);
-    }
+void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+{
+	struct afb_event_listener_list *iter, **prv;
+
+	prv = &clientCtx->listeners;
+	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;
+	}
+}
 
-    // Check if client as a context or not inside the URL
-    uuid  = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "uuid");
-       
-    // if UUID in query we're restfull with no cookies otherwise check for cookie
-    if (uuid != NULL) request->restfull = TRUE;
-    else {
-        request->restfull = FALSE;
-        uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, COOKIE_NAME);  
-    };
-    
-    
-    if (uuid != NULL)   {
-        // search if client context exist and it not timeout let's use it
-	if ((lh_table_lookup_ex (clientCtxs, uuid, (void**) &clientCtx)) 
-                && ! ctxStoreToOld (clientCtx, request->config->cntxTimeout)) {
-                request->client=clientCtx;
-                if (verbose) fprintf (stderr, "ctxClientGet Old uuid=[%s] token=[%s] timestamp=%d\n"
-                             ,request->client->uuid, request->client->token, request->client->timeStamp);
-                return;            
-        }
-    }
+static int send(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+{
+	struct afb_event_listener_list *iter;
+	int result;
+
+	result = 0;
+	iter = clientCtx->listeners;
+	while (iter != NULL) {
+		iter->listener.itf->send(iter->listener.closure, event, json_object_get(object));
+		result++;
+		iter = iter->next;
+	}
 
-    
-    // we have no session let's create one otherwise let's clean any exiting values
-    if (clientCtx == NULL) clientCtx = calloc(1, sizeof(AFB_clientCtx)); // init NULL clientContext
-    uuid_generate(newuuid);         // create a new UUID
-    uuid_unparse_lower(newuuid, clientCtx->uuid);
-    clientCtx->cid=cid++;
-        
-    // if table is full at 50% let's clean it up
-    if(clientCtxs->count > (clientCtxs->size*0.5)) ctxStoreGarbage(clientCtxs, request->config->cntxTimeout);
-    
-    // finally add uuid into hashtable
-    ret=lh_table_insert (clientCtxs, (void*)clientCtx->uuid, clientCtx);
-    if (ret < 0) return (AFB_FAIL);
-    
-    if (verbose) fprintf (stderr, "ctxClientGet New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp);      
-    request->client = clientCtx;
-
-    return (AFB_SUCCESS);
+	return result;
 }
 
-// Sample Generic Ping Debug API
-PUBLIC AFB_error ctxTokenCheck (AFB_request *request) {
-    const char *token;
-    
-    if (request->client == NULL) return AFB_EMPTY;
-    
-    // this time have to extract token from query list
-    token = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "token");
-    
-    // if not token is providing we refuse the exchange
-    if ((token == NULL) || (request->client->token == NULL)) return (AFB_FALSE);
-    
-    // compare current token with previous one
-    if ((0 == strcmp (token, request->client->token)) && (!ctxStoreToOld (request->client, request->config->cntxTimeout))) {
-       return (AFB_SUCCESS);
-    }
-    
-    // Token is not valid let move level of assurance to zero and free attached client handle
-    return (AFB_FAIL);
+int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+{
+	long idx;
+	time_t now;
+	int result;
+
+	if (clientCtx != NULL)
+		result = send(clientCtx, event, object);
+	else {
+		result = 0;
+		now = NOW;
+		for (idx=0; idx < sessions.max; idx++) {
+			clientCtx = sessions.store[idx];
+			if (clientCtx != NULL && !ctxStoreTooOld(clientCtx, now)) {
+				clientCtx = ctxClientAddRef(clientCtx);
+				result += send(clientCtx, event, object);
+				ctxClientUnref(clientCtx);
+			}
+		}
+	}
+	return result;
 }
 
-// Free Client Session Context
-PUBLIC AFB_error ctxTokenReset (AFB_request *request) {
-    struct lh_entry* entry;
-    int ret;
-
-    if (request->client == NULL) return AFB_EMPTY;
-
-    entry = lh_table_lookup_entry (clientCtxs, request->client->uuid);
-    if (entry == NULL) return AFB_FALSE;
-    
-    lh_table_delete_entry (clientCtxs, entry);
- 
-    return (AFB_SUCCESS);
+const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx)
+{
+	assert(clientCtx != NULL);
+	return clientCtx->uuid;
 }
 
-// generate a new token
-PUBLIC AFB_error ctxTokenCreate (AFB_request *request) {
-    int oldTnkValid;
-    const char *ornew;
-    uuid_t newuuid;
-
-    if (request->client == NULL) return AFB_EMPTY;
-
-    // create a UUID as token value
-    uuid_generate(newuuid); 
-    uuid_unparse_lower(newuuid, request->client->token);
-    
-    // keep track of time for session timeout and further clean up
-    request->client->timeStamp=time(NULL); 
-    
-    // Token is also store in context but it might be convenient for plugin to access it directly
-    return (AFB_SUCCESS);
+const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx)
+{
+	assert(clientCtx != NULL);
+	return clientCtx->token;
 }
 
-
-// generate a new token and update client context
-PUBLIC AFB_error ctxTokenRefresh (AFB_request *request) {
-    int oldTnkValid;
-    const char *oldornew;
-    uuid_t newuuid;
-
-    if (request->client == NULL) return AFB_EMPTY;
-    
-    // Check if the old token is valid
-    oldTnkValid= ctxTokenCheck (request);
-    
-    // if token is not valid let check for query argument "oldornew"
-    if (!oldTnkValid) {
-        oldornew = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "oldornew");
-        if (oldornew != NULL) oldTnkValid= TRUE;
-    }
-   
-    // No existing token and no request to create one
-    if (oldTnkValid != TRUE) return AFB_WARNING;
-
-    return (ctxTokenCreate (request));
+void *ctxClientValueGet(struct AFB_clientCtx *clientCtx, int index)
+{
+	assert(clientCtx != NULL);
+	assert(index >= 0);
+	assert(index < sessions.apicount);
+	return clientCtx->values[index].value;
 }
 
+void ctxClientValueSet(struct AFB_clientCtx *clientCtx, int index, void *value, void (*free_value)(void*))
+{
+	struct client_value prev;
+	assert(clientCtx != NULL);
+	assert(index >= 0);
+	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)
+		prev.free_value(prev.value);
+}