X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=6b3d6e9dae02abbce41a7442b3e13a0aa30be22b;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=a7010dbb1c516d7974ba999e1bb3ec3208e23fbf;hpb=ad9cee7d6e86ba4497ffb09b4acb3b2c07b42a12;p=src%2Fapp-framework-binder.git diff --git a/src/afb-context.c b/src/afb-context.c index a7010dbb..6b3d6e9d 100644 --- a/src/afb-context.c +++ b/src/afb-context.c @@ -1,6 +1,7 @@ /* - * Copyright (C) 2015, 2016 "IoT.bzh" + * Copyright (C) 2015-2018 "IoT.bzh" * Author "Fulup Ar Foll" + * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,102 +20,121 @@ #include #include +#include +#include -#include "session.h" +#include "afb-session.h" #include "afb-context.h" -static void init_context(struct afb_context *context, struct AFB_clientCtx *session, const char *token) +static void init_context(struct afb_context *context, struct afb_session *session, const char *token) { assert(session != NULL); /* reset the context for the session */ context->session = session; context->flags = 0; - context->api_index = -1; - context->loa_in = ctxClientGetLOA(session) & 7; + context->super = NULL; + context->api_key = NULL; /* check the token */ if (token != NULL) { - if (ctxTokenCheck(session, token)) + if (afb_session_check_token(session, token)) context->validated = 1; else context->invalidated = 1; } } -void afb_context_init(struct afb_context *context, struct AFB_clientCtx *session, const char *token) +void afb_context_init(struct afb_context *context, struct afb_session *session, const char *token) { - init_context(context, ctxClientAddRef(session), token); + init_context(context, afb_session_addref(session), token); +} + +void afb_context_subinit(struct afb_context *context, struct afb_context *super) +{ + context->session = super->session; + context->flags = 0; + context->super = super; + context->api_key = NULL; + context->validated = super->validated; } int afb_context_connect(struct afb_context *context, const char *uuid, const char *token) { int created; - struct AFB_clientCtx *session; + struct afb_session *session; - session = ctxClientGetSession (uuid, &created); + session = afb_session_get (uuid, AFB_SESSION_TIMEOUT_DEFAULT, &created); if (session == NULL) return -1; init_context(context, session, token); if (created) { context->created = 1; - context->refreshing = 1; + /* context->refreshing = 1; */ } return 0; } void afb_context_disconnect(struct afb_context *context) { - if (context->session != NULL) { + if (context->session && !context->super) { if (context->refreshing && !context->refreshed) { - ctxTokenNew (context->session); + afb_session_new_token (context->session); context->refreshed = 1; } - if (context->loa_changing && !context->loa_changed) { - ctxClientSetLOA (context->session, context->loa_out); - context->loa_changed = 1; - } if (context->closing && !context->closed) { - ctxClientClose(context->session); + afb_context_change_loa(context, 0); + afb_context_set(context, NULL, NULL); context->closed = 1; } - ctxClientUnref(context->session); + afb_session_unref(context->session); context->session = NULL; } } const char *afb_context_sent_token(struct afb_context *context) { - if (context->session == NULL || context->closing) + if (context->session == NULL || context->closing || context->super) return NULL; if (!context->refreshing) return NULL; if (!context->refreshed) { - ctxTokenNew (context->session); + afb_session_new_token (context->session); context->refreshed = 1; } - return ctxClientGetToken(context->session); + return afb_session_token(context->session); +} + +const char *afb_context_uuid(struct afb_context *context) +{ + return context->session ? afb_session_uuid(context->session) : ""; } const char *afb_context_sent_uuid(struct afb_context *context) { - if (context->session == NULL || context->closing) + if (context->session == NULL || context->closing || context->super) return NULL; if (!context->created) return NULL; - return ctxClientGetUuid(context->session); + return afb_session_uuid(context->session); +} + +void *afb_context_make(struct afb_context *context, int replace, void *(*make_value)(void *closure), void (*free_value)(void *item), void *closure) +{ + assert(context->session != NULL); + return afb_session_cookie(context->session, context->api_key, make_value, free_value, closure, replace); } void *afb_context_get(struct afb_context *context) { assert(context->session != NULL); - return ctxClientValueGet(context->session, context->api_index); + return afb_session_get_cookie(context->session, context->api_key); } -void afb_context_set(struct afb_context *context, void *value, void (*free_value)(void*)) +int afb_context_set(struct afb_context *context, void *value, void (*free_value)(void*)) { assert(context->session != NULL); - return ctxClientValueSet(context->session, context->api_index, value, free_value); + return afb_session_set_cookie(context->session, context->api_key, value, free_value); } void afb_context_close(struct afb_context *context) @@ -124,30 +144,57 @@ void afb_context_close(struct afb_context *context) void afb_context_refresh(struct afb_context *context) { - assert(context->validated); - context->refreshing = 1; + if (context->super) + afb_context_refresh(context->super); + else { + assert(context->validated); + context->refreshing = 1; + if (!context->refreshed) { + afb_session_new_token (context->session); + context->refreshed = 1; + } + } } int afb_context_check(struct afb_context *context) { + if (context->super) + return afb_context_check(context); return context->validated; } int afb_context_check_loa(struct afb_context *context, unsigned loa) { - return context->loa_in >= loa; + return afb_context_get_loa(context) >= loa; } -void afb_context_change_loa(struct afb_context *context, unsigned loa) +static inline const void *loa_key(struct afb_context *context) { - assert(context->validated); + return (const void*)(1+(intptr_t)(context->api_key)); +} - if (loa == context->loa_in) - context->loa_changing = 0; - else { - context->loa_changing = 1; - context->loa_out = loa & 7; - } +static inline void *loa2ptr(unsigned loa) +{ + return (void*)(intptr_t)loa; +} + +static inline unsigned ptr2loa(void *ptr) +{ + return (unsigned)(intptr_t)ptr; } +int afb_context_change_loa(struct afb_context *context, unsigned loa) +{ + if (!context->validated || loa > 7) { + errno = EINVAL; + return -1; + } + + return afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL); +} +unsigned afb_context_get_loa(struct afb_context *context) +{ + assert(context->session != NULL); + return ptr2loa(afb_session_get_cookie(context->session, loa_key(context))); +}