X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=22e50cfc5075a8400c9657fdf4718d951d62f9c1;hb=7b97a7f27578d7f4ce7cc994e5df303ac5d9c886;hp=46db9cea5d555f0ae2577ad0970d4e7796b245c6;hpb=def39ec22797c5cd40b7f0bf97df6007c62b3f7d;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index 46db9cea..22e50cfc 100644 --- a/src/session.c +++ b/src/session.c @@ -64,9 +64,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) { @@ -83,21 +92,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) @@ -170,7 +178,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 @@ -181,17 +197,17 @@ static void ctxStoreCleanUp (time_t now) // Loop on Sessions Table and remove anything that is older than timeout for (idx=0; idx < sessions.max; idx++) { - ctx = sessions.store[idx]; + ctx = ctxClientAddRef(sessions.store[idx]); if (ctx != NULL && ctxStoreTooOld(ctx, now)) { ctxClientClose (ctx); } + ctxClientUnref(ctx); } } // 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; @@ -222,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); } @@ -262,6 +277,7 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx) --clientCtx->refcount; if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) { ctxStoreDel (clientCtx); + free(clientCtx); } } } @@ -270,8 +286,12 @@ 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); + } } // Sample Generic Ping Debug API @@ -281,7 +301,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) @@ -293,23 +313,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) { @@ -331,11 +348,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) @@ -351,16 +373,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; } @@ -373,18 +402,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;