* 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 <http://www.gnu.org/licenses/>.
- *
- * 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
#include <uuid/uuid.h>
#include <assert.h>
-#include "afb-apis.h"
#include "session.h"
#define NOW (time(NULL))
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)
{
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, int apicount, 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 = apicount;
+ sessions.apicount = context_count;
if (strlen(initok) >= 37) {
fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok);
exit(1);
}
// This function will return exiting client context or newly created client context
-struct AFB_clientCtx *ctxClientGet (const char *uuid)
+struct AFB_clientCtx *ctxClientGetForUuid (const char *uuid)
{
uuid_t newuuid;
struct AFB_clientCtx *clientCtx;
}
/* 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) {
return NULL;
}
+struct AFB_clientCtx *ctxClientGet(struct AFB_clientCtx *clientCtx)
+{
+ if (clientCtx != NULL)
+ clientCtx->refcount++;
+ return clientCtx;
+}
+
void ctxClientPut(struct AFB_clientCtx *clientCtx)
{
if (clientCtx != NULL) {
}
// 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);
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;
+
+ 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);
- // Token is not valid let move level of assurance to zero and free attached client handle
- return 0;
+ return ctxTokenCheckLen(clientCtx, token, strlen(token));
}
// generate a new token and update client context
Code Review / src / app-framework-binder.git / blobdiff