int sessionDir, cardDir;
// card name should be more than 3 character long !!!!
- if (strlen (request->plugin) < 3) {
- return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->plugin));
+ if (strlen (request->prefix) < 3) {
+ return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->prefix));
}
// open session directory
}
// create session sndcard directory if it does not exit
- cardDir = openat (sessionDir, request->plugin, O_DIRECTORY);
+ cardDir = openat (sessionDir, request->prefix, O_DIRECTORY);
if (cardDir < 0) {
- cardDir = mkdirat (sessionDir, request->plugin, O_RDWR | S_IRWXU | S_IRGRP);
+ cardDir = mkdirat (sessionDir, request->prefix, 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)));
+ return (jsonNewMessage (AFB_FAIL,"Fail to create directory [%s/%s] error=%s", session->config->sessiondir, request->prefix, strerror(cardDir)));
}
}
close (sessionDir);
return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir)));
}
- count = scandirat (sessionDir, request->plugin, &namelist, fileSelect, alphasort);
+ count = scandirat (sessionDir, request->prefix, &namelist, fileSelect, alphasort);
close (sessionDir);
if (count < 0) {
- return (jsonNewMessage (AFB_FAIL,"Fail to scan sessions.hash directory [%s/%s] error=%s", session->config->sessiondir, request->plugin, strerror(sessionDir)));
+ return (jsonNewMessage (AFB_FAIL,"Fail to scan sessions.hash directory [%s/%s] error=%s", session->config->sessiondir, request->prefix, strerror(sessionDir)));
}
- if (count == 0) return (jsonNewMessage (AFB_EMPTY,"[%s] no session at [%s]", request->plugin, session->config->sessiondir));
+ if (count == 0) return (jsonNewMessage (AFB_EMPTY,"[%s] no session at [%s]", request->prefix, session->config->sessiondir));
// loop on each session file, retrieve its date and push it into json response object
sessionsJ = json_object_new_array();
if (response != NULL) return response;
// add name and file extension to session name
- strncpy (filename, request->plugin, sizeof(filename));
+ strncpy (filename, request->prefix, sizeof(filename));
strncat (filename, "/", sizeof(filename));
if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1);
else strncat (filename, name, sizeof(filename)-1);
}
// create a link to keep track of last uploaded session for this card
- if (!defsession) makeSessionLink (request->plugin, name);
+ if (!defsession) makeSessionLink (request->prefix, name);
return (jsonSession);
}
if (response != NULL) return response;
// add cardname and file extension to session name
- strncpy (filename, request->plugin, sizeof(filename));
+ strncpy (filename, request->prefix, sizeof(filename));
strncat (filename, "/", sizeof(filename));
if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1);
else strncat (filename, name, sizeof(filename)-1);
// extract session info from args
info = json_tokener_parse (request->post->data);
if (!info) {
- response = jsonNewMessage (AFB_FATAL,"sndcard=%s session=%s invalid json args=%s", request->plugin, name, request->post);
+ response = jsonNewMessage (AFB_FATAL,"sndcard=%s session=%s invalid json args=%s", request->prefix, 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);
+ response = jsonNewMessage (AFB_EMPTY,"sndcard=%s session=%s No 'AFB_pluginT' args=%s", request->prefix, name, request->post);
goto OnErrorExit;
}
// create a link to keep track of last uploaded session for this card
- if (!defsession) makeSessionLink (request->plugin, name);
+ if (!defsession) makeSessionLink (request->prefix, name);
// we're donne let's return status message
response = jsonNewMessage (AFB_SUCCESS,"Session= [%s] saved on disk", filename);
// Free context [XXXX Should be protected again memory abort XXXX]
STATIC void ctxUuidFreeCB (AFB_clientCtx *client) {
-
+
+ AFB_plugin **plugins = client->plugins;
+ AFB_freeCtxCB freeCtxCB;
+ int idx;
+
// If application add a handle let's free it now
- if (client->ctx != NULL) {
- int idx;
- AFB_plugin **plugins = client->plugins;
-
+ if (client->contexts != NULL) {
+
// Free client handle with a standard Free function, with app callback or ignore it
- for (idx=0; idx < )
- if (client->plugin->freeCtxCB == NULL) free (client->ctx);
- else if (client->plugin->freeCtxCB != (void*)-1) client->plugin->freeCtxCB(client);
+ for (idx=0; client->plugins[idx] != NULL; idx ++) {
+ if (client->contexts[idx] != NULL) {
+ freeCtxCB = client->plugins[idx]->freeCtxCB;
+ if (freeCtxCB == NULL) free (client->contexts[idx]);
+ else if (freeCtxCB != (void*)-1) freeCtxCB(client->contexts[idx], plugins[idx]->handle, client->uuid);
+ }
+ }
}
}
// Create a new store in RAM, not that is too small it will be automatically extended
PUBLIC void ctxStoreInit (int nbSession) {
- int res;
// let's create as store as hashtable does not have any
- sessions.store = calloc (nbSession+1, sizeof(AFB_clientCtx));
+ sessions.store = calloc (1 + (unsigned)nbSession, sizeof(AFB_clientCtx));
sessions.max=nbSession;
}
if (idx == sessions.max) client=NULL;
else client= sessions.store[idx];
-
pthread_mutex_unlock(&sessions.mutex);
return (client);
int idx;
int status;
if (client == NULL) return (AFB_FAIL);
-
- //fprintf (stderr, "ctxStoreDel request uuid=%s count=%d\n", client->uuid, sessions.count);
pthread_mutex_lock(&sessions.mutex);
if (idx == sessions.max) status=AFB_FAIL;
else {
sessions.count --;
+ ctxUuidFreeCB (sessions.store[idx]);
sessions.store[idx]=NULL;
status=AFB_SUCCESS;
}
- pthread_mutex_unlock(&sessions.mutex);
-
+ pthread_mutex_unlock(&sessions.mutex);
return (status);
-
- // plugin registered a callback let's release semaphore and cleanup now
- if ((client->plugin->freeCtxCB != NULL) && client->ctx) client->plugin->freeCtxCB(client);
}
STATIC AFB_error ctxStoreAdd (AFB_clientCtx *client) {
sessions.store[idx]= client;
}
- pthread_mutex_unlock(&sessions.mutex);
-
+ pthread_mutex_unlock(&sessions.mutex);
return (status);
}
}
// Loop on every entry and remove old context sessions.hash
-PUBLIC int ctxStoreGarbage (const int timeout) {
+PUBLIC void ctxStoreGarbage (const int timeout) {
AFB_clientCtx *ctx;
long idx;
}
// This function will return exiting client context or newly created client context
-PUBLIC AFB_error ctxClientGet (AFB_request *request, int idx) {
- static int cid=0;
+PUBLIC AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) {
AFB_clientCtx *clientCtx=NULL;
const char *uuid;
uuid_t newuuid;
- int ret;
- if (request->config->token == NULL) return AFB_EMPTY;
+ if (request->config->token == NULL) return NULL;
// 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 {
+ char cookie[64];
request->restfull = FALSE;
- uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, COOKIE_NAME);
+ snprintf(cookie, sizeof cookie, "%s-%d", COOKIE_NAME, request->config->httpdPort);
+ uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, cookie);
};
// Warning when no cookie defined MHD_lookup_connection_value may return something !!!
if ((uuid != NULL) && (strnlen (uuid, 10) >= 10)) {
- int search;
// search if client context exist and it not timeout let's use it
clientCtx = ctxStoreSearch (uuid);
ctxStoreDel (clientCtx);
clientCtx=NULL;
} else {
- request->client=clientCtx;
- return (AFB_SUCCESS);
+ request->context=clientCtx->contexts[idx];
+ request->handle = clientCtx->plugins[idx]->handle;
+ request->uuid= uuid;
+ return (clientCtx);
}
}
}
// 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
- clientCtx->ctx = cmalloc (1, request->config->pluginCount * (sizeof (void*)));
+ clientCtx->contexts = calloc (1, (unsigned)request->config->pluginCount * (sizeof (void*)));
+ clientCtx->plugins = request->plugins;
}
uuid_generate(newuuid); // create a new UUID
uuid_unparse_lower(newuuid, clientCtx->uuid);
- clientCtx->cid=cid++; // simple application uniqueID
// if table is full at 50% let's clean it up
if(sessions.count > (sessions.max / 2)) ctxStoreGarbage(request->config->cntxTimeout);
// finally add uuid into hashtable
if (AFB_SUCCESS != ctxStoreAdd (clientCtx)) {
free (clientCtx);
- return(AFB_FAIL);
+ return(NULL);
}
// if (verbose) fprintf (stderr, "ctxClientGet New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp);
- request->client = clientCtx->ctx[idx];
-
- return(AFB_SUCCESS);
+ request->context = clientCtx->contexts[idx];
+ request->handle = clientCtx->plugins[idx]->handle;
+ request->uuid=clientCtx->uuid;
+ return(clientCtx);
}
// Sample Generic Ping Debug API
-PUBLIC AFB_error ctxTokenCheck (AFB_request *request) {
+PUBLIC AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request) {
const char *token;
- if (request->client == NULL) return AFB_EMPTY;
+ if (clientCtx->contexts == 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);
+ if ((token == NULL) || (clientCtx->token == NULL)) return (AFB_FALSE);
// compare current token with previous one
- if ((0 == strcmp (token, request->client->token)) && (!ctxStoreToOld (request->client, request->config->cntxTimeout))) {
+ if ((0 == strcmp (token, clientCtx->token)) && (!ctxStoreToOld (clientCtx, request->config->cntxTimeout))) {
return (AFB_SUCCESS);
}
}
// Free Client Session Context
-PUBLIC AFB_error ctxTokenReset (AFB_request *request) {
- int ret;
- AFB_clientCtx *clientCtx;
+PUBLIC AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request) {
- if (request->client == NULL) return AFB_EMPTY;
+ if (clientCtx == NULL) return AFB_EMPTY;
+ //if (verbose) fprintf (stderr, "ctxClientReset New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp);
// Search for an existing client with the same UUID
- clientCtx = ctxStoreSearch (request->client->uuid);
+ clientCtx = ctxStoreSearch (clientCtx->uuid);
if (clientCtx == NULL) return AFB_FALSE;
// Remove client from table
}
// generate a new token
-PUBLIC AFB_error ctxTokenCreate (AFB_request *request) {
- int oldTnkValid;
- const char *ornew;
+PUBLIC AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request) {
uuid_t newuuid;
const char *token;
- if (request->client == NULL) return AFB_EMPTY;
+ if (clientCtx == NULL) return AFB_EMPTY;
// if config->token!="" then verify that we have the right initial share secret
if (request->config->token[0] != '\0') {
token = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "token");
if (token == NULL) return AFB_UNAUTH;
- // verify that presented initial tokens fit
+ // verify that it fits with initial tokens fit
if (strcmp(request->config->token, token)) return AFB_UNAUTH;
}
// create a UUID as token value
uuid_generate(newuuid);
- uuid_unparse_lower(newuuid, request->client->token);
+ uuid_unparse_lower(newuuid, clientCtx->token);
// keep track of time for session timeout and further clean up
- request->client->timeStamp=time(NULL);
+ clientCtx->timeStamp=time(NULL);
// Token is also store in context but it might be convenient for plugin to access it directly
return (AFB_SUCCESS);
// generate a new token and update client context
-PUBLIC AFB_error ctxTokenRefresh (AFB_request *request) {
- int oldTnkValid;
- const char *oldornew;
+PUBLIC AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request) {
uuid_t newuuid;
- if (request->client == NULL) return AFB_EMPTY;
+ if (clientCtx == NULL) return AFB_EMPTY;
// Check if the old token is valid
- if (ctxTokenCheck (request) != AFB_SUCCESS) return (AFB_FAIL);
+ if (ctxTokenCheck (clientCtx, request) != AFB_SUCCESS) return (AFB_FAIL);
// Old token was valid let's regenerate a new one
uuid_generate(newuuid); // create a new UUID
- uuid_unparse_lower(newuuid, request->client->token);
+ uuid_unparse_lower(newuuid, clientCtx->token);
+
+ // keep track of time for session timeout and further clean up
+ clientCtx->timeStamp=time(NULL);
+
return (AFB_SUCCESS);
}