X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=3e08808faef926006ca55493db0f38fb765ffcb1;hb=04b1757467bcb4e287dd1c34d5a21f76705340d6;hp=11f535b3f87a9d543f91a460a234c63cd068cda0;hpb=83ce3b29a598141f8f28afde655beb07ec78c312;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index 11f535b3..3e08808f 100644 --- a/src/session.c +++ b/src/session.c @@ -2,22 +2,17 @@ * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Reference: - * http://stackoverflow.com/questions/25971505/how-to-delete-element-from-hsearch + * http://www.apache.org/licenses/LICENSE-2.0 * + * 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. */ #define _GNU_SOURCE @@ -28,8 +23,8 @@ #include #include #include +#include -#include "afb-apis.h" #include "session.h" #define NOW (time(NULL)) @@ -45,6 +40,20 @@ static struct { const char *initok; } sessions; +void *afb_context_get(struct afb_context *actx) +{ + return actx->context; +} + +void afb_context_set(struct afb_context *actx, void *context, void (*free_context)(void*)) +{ +fprintf(stderr, "afb_context_set(%p,%p) was (%p,%p)\n",context, free_context, actx->context, actx->free_context); + if (actx->context != NULL && actx->free_context != NULL) + actx->free_context(actx->context); + actx->context = context; + actx->free_context = free_context; +} + // Free context [XXXX Should be protected again memory abort XXXX] static void ctxUuidFreeCB (struct AFB_clientCtx *client) { @@ -54,22 +63,18 @@ static void ctxUuidFreeCB (struct AFB_clientCtx *client) assert (client->contexts != NULL); // Free client handle with a standard Free function, with app callback or ignore it - for (idx=0; idx < sessions.apicount; idx ++) { - if (client->contexts[idx] != NULL) { - afb_apis_free_context(idx, client->contexts[idx]); - client->contexts[idx] = NULL; - } - } + for (idx=0; idx < sessions.apicount; idx ++) + afb_context_set(&client->contexts[idx], NULL, NULL); } // Create a new store in RAM, not that is too small it will be automatically extended -void ctxStoreInit (int nbSession, int timeout, const char *initok) +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)nbSession, sizeof(struct AFB_clientCtx)); - sessions.max = nbSession; + sessions.store = calloc (1 + (unsigned)max_session_count, sizeof(struct AFB_clientCtx)); + sessions.max = max_session_count; sessions.timeout = timeout; - sessions.apicount = afb_apis_count(); + sessions.apicount = context_count; if (strlen(initok) >= 37) { fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok); exit(1); @@ -109,7 +114,7 @@ static int ctxStoreDel (struct AFB_clientCtx *client) for (idx=0; idx < sessions.max; idx++) { if (sessions.store[idx] == client) { - sessions.store[idx]=NULL; + sessions.store[idx] = NULL; sessions.count--; status = 1; goto deleted; @@ -134,7 +139,7 @@ static int ctxStoreAdd (struct AFB_clientCtx *client) for (idx=0; idx < sessions.max; idx++) { if (NULL == sessions.store[idx]) { - sessions.store[idx]= client; + sessions.store[idx] = client; sessions.count++; status = 1; goto added; @@ -184,17 +189,19 @@ struct AFB_clientCtx *ctxClientGetForUuid (const char *uuid) } /* mimic old behaviour */ +/* +TODO remove? not remove? if (sessions.initok == NULL) return NULL; - +*/ /* check the uuid if given */ - if (uuid != NULL && 1 + strlen(uuid) >= sizeof clientCtx->uuid) + if (uuid != NULL && strlen(uuid) >= sizeof clientCtx->uuid) return NULL; /* returns a new one */ clientCtx = calloc(1, sizeof(struct AFB_clientCtx)); // init NULL clientContext if (clientCtx != NULL) { - clientCtx->contexts = calloc ((unsigned)sessions.apicount, sizeof (void*)); + clientCtx->contexts = calloc ((unsigned)sessions.apicount, sizeof(*clientCtx->contexts)); if (clientCtx->contexts != NULL) { /* generate the uuid */ if (uuid == NULL) { @@ -243,7 +250,7 @@ void ctxClientClose (struct AFB_clientCtx *clientCtx) } // Sample Generic Ping Debug API -int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) +int ctxTokenCheckLen (struct AFB_clientCtx *clientCtx, const char *token, size_t length) { assert(clientCtx != NULL); assert(token != NULL); @@ -252,13 +259,20 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) if (ctxStoreTooOld (clientCtx, NOW)) return 0; - if (!clientCtx->token[0] || 0 == strcmp (token, clientCtx->token)) { - clientCtx->created = 1; /* creates by default */ - return 1; - } + if (clientCtx->token[0] && (length >= sizeof(clientCtx->token) || strncmp (token, clientCtx->token, length) || clientCtx->token[length])) + return 0; - // Token is not valid let move level of assurance to zero and free attached client handle - return 0; + clientCtx->created = 1; /* creates by default */ + return 1; +} + +// Sample Generic Ping Debug API +int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) +{ + assert(clientCtx != NULL); + assert(token != NULL); + + return ctxTokenCheckLen(clientCtx, token, strlen(token)); } // generate a new token and update client context @@ -276,3 +290,95 @@ void ctxTokenNew (struct AFB_clientCtx *clientCtx) clientCtx->expiration = NOW + sessions.timeout; } +struct afb_event_sender_list +{ + struct afb_event_sender_list *next; + struct afb_event_sender sender; + int refcount; +}; + +int ctxClientEventSenderAdd(struct AFB_clientCtx *clientCtx, struct afb_event_sender sender) +{ + struct afb_event_sender_list *iter, **prv; + + prv = &clientCtx->senders; + for (;;) { + iter = *prv; + if (iter == NULL) { + iter = calloc(1, sizeof *iter); + if (iter == NULL) { + errno = ENOMEM; + return -1; + } + iter->sender = sender; + iter->refcount = 1; + *prv = iter; + return 0; + } + if (iter->sender.itf == sender.itf && iter->sender.closure == sender.closure) { + iter->refcount++; + return 0; + } + prv = &iter->next; + } +} + +void ctxClientEventSenderRemove(struct AFB_clientCtx *clientCtx, struct afb_event_sender sender) +{ + struct afb_event_sender_list *iter, **prv; + + prv = &clientCtx->senders; + for (;;) { + iter = *prv; + if (iter == NULL) + return; + if (iter->sender.itf == sender.itf && iter->sender.closure == sender.closure) { + if (!--iter->refcount) { + *prv = iter->next; + free(iter); + } + return; + } + prv = &iter->next; + } +} + +static int send(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object) +{ + struct afb_event_sender_list *iter; + int result; + + result = 0; + iter = clientCtx->senders; + while (iter != NULL) { + iter->sender.itf->send(iter->sender.closure, event, object); + result++; + iter = iter->next; + } + + return result; +} + +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 = ctxClientGet(clientCtx); + result += send(clientCtx, event, object); + ctxClientPut(clientCtx); + } + } + } + return result; +} +