X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=9504fdbe71835e4eca7c007b6fa8282bc1bec2cf;hb=520bbafb30ce49b94b7825ff553d8cb5bda6d612;hp=131d80c173fa6ae16d9a661a5d189df5913d3e11;hpb=f629aad464ea5595aeea9ada8b32d412628c3c2f;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index 131d80c1..9504fdbe 100644 --- a/src/session.c +++ b/src/session.c @@ -30,6 +30,8 @@ #include #include +#include "afb-apis.h" +#include "session.h" // Session UUID are store in a simple array [for 10 sessions this should be enough] static struct { @@ -45,22 +47,16 @@ static const char key_token[] = "token"; // 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; + int idx, cnt; // If application add a handle let's free it now if (client->contexts != NULL) { + cnt = afb_apis_count(); // Free client handle with a standard Free function, with app callback or ignore it - for (idx=0; client->plugins[idx] != NULL; idx ++) { + for (idx=0; idx < cnt; 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); + afb_apis_free_context(idx, client->contexts[idx]); } } } @@ -150,7 +146,7 @@ static AFB_error ctxStoreAdd (AFB_clientCtx *client) } // Check if context timeout or not -static int ctxStoreToOld (AFB_clientCtx *ctx, int timeout) +static int ctxStoreTooOld (AFB_clientCtx *ctx, int timeout) { int res; time_t now = time(NULL); @@ -166,15 +162,15 @@ void ctxStoreGarbage (const int timeout) // 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) && (ctxStoreToOld(ctx, timeout))) { + ctx = sessions.store[idx]; + if ((ctx != NULL) && (ctxStoreTooOld(ctx, timeout))) { ctxStoreDel (ctx); } } } // This function will return exiting client context or newly created client context -AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) +AFB_clientCtx *ctxClientGet (AFB_request *request) { AFB_clientCtx *clientCtx=NULL; const char *uuid; @@ -201,14 +197,11 @@ AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) clientCtx = ctxStoreSearch (uuid); if (clientCtx) { - if (ctxStoreToOld (clientCtx, request->config->cntxTimeout)) { + if (ctxStoreTooOld (clientCtx, request->config->cntxTimeout)) { // this session is too old let's delete it ctxStoreDel (clientCtx); clientCtx = NULL; } else { - request->context=clientCtx->contexts[idx]; - request->handle = clientCtx->plugins[idx]->handle; - request->uuid= uuid; return clientCtx; } } @@ -217,8 +210,7 @@ AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) // 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->contexts = calloc (1, (unsigned)request->config->pluginCount * (sizeof (void*))); - clientCtx->plugins = request->plugins; + clientCtx->contexts = calloc ((unsigned)afb_apis_count(), sizeof (void*)); } uuid_generate(newuuid); // create a new UUID @@ -232,11 +224,6 @@ AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) free (clientCtx); return NULL; } - - // if (verbose) fprintf (stderr, "ctxClientGet New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp); - request->context = clientCtx->contexts[idx]; - request->handle = clientCtx->plugins[idx]->handle; - request->uuid=clientCtx->uuid; return clientCtx; } @@ -256,7 +243,7 @@ AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request) return AFB_FALSE; // compare current token with previous one - if ((0 == strcmp (token, clientCtx->token)) && (!ctxStoreToOld (clientCtx, request->config->cntxTimeout))) { + if ((0 == strcmp (token, clientCtx->token)) && (!ctxStoreTooOld (clientCtx, request->config->cntxTimeout))) { return AFB_SUCCESS; } @@ -338,303 +325,3 @@ AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request) return AFB_SUCCESS; } - - - - - - - - - - - - - - - - - - - - - - -#if defined(ALLOWS_SESSION_FILES) - -#define AFB_SESSION_JTYPE "AFB_session" -#define AFB_SESSION_JLIST "AFB_sessions.hash" -#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 - -// let's return only sessions.hash files -static int fileSelect (const struct dirent *entry) { - return (strstr (entry->d_name, ".afb") != NULL); -} - -static json_object *checkCardDirExit (AFB_session *session, AFB_request *request ) { - int sessionDir, cardDir; - - // card name should be more than 3 character long !!!! - if (strlen (request->prefix) < 3) { - return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->prefix)); - } - - // 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))); - } - - // create session sndcard directory if it does not exit - cardDir = openat (sessionDir, request->prefix, O_DIRECTORY); - if (cardDir < 0) { - 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->prefix, strerror(cardDir))); - } - } - close (sessionDir); - return NULL; -} - -// 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)); -} - -// verify we can read/write in session dir -AFB_error sessionCheckdir (AFB_session *session) { - - int err; - - // 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); - - // 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; - } - - // 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; - - return AFB_SUCCESS; -} - -// create a session in current directory -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.hash 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->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->prefix, strerror(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(); - 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]); - } - - // free scandir structure - free(namelist); - - // 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); - - return (ajgResponse); -} - -// Load Json session object from disk -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.hash does not exist create it - response = checkCardDirExit (session, request); - if (response != NULL) return response; - - // add name and file extension to session name - 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); - strncat (filename, ".afb", sizeof(filename)); - - // just upload json object and return without any further processing - jsonSession = json_object_from_file (filename); - - if (jsonSession == NULL) return (jsonNewMessage (AFB_EMPTY,"File [%s] not found", filename)); - - // 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)); - } - - // 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)); - } - - // create a link to keep track of last uploaded session for this card - if (!defsession) makeSessionLink (request->prefix, name); - - return (jsonSession); -} - -// push Json session object to disk -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.hash 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->prefix, 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->type == AFB_POST_JSON) { - static json_object *info, *jtype; - const char *ajglabel; - - // 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->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->prefix, 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->prefix, 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; -} -#endif -