X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=6057e69dd72fba402f3a020525117c44467c8936;hb=29ae81fa15c6080fd27929f4cc78e1289cb920e9;hp=c2649a485bbc01232c650e29246ad20baa4e1a4b;hpb=31075cdfdc15bb7474e96051d7f19135227f3e15;p=src%2Fapp-framework-binder.git diff --git a/src/afb-context.c b/src/afb-context.c index c2649a48..6057e69d 100644 --- a/src/afb-context.c +++ b/src/afb-context.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016, 2017 "IoT.bzh" + * Copyright (C) 2015-2019 "IoT.bzh" * Author "Fulup Ar Foll" * Author José Bollo * @@ -21,6 +21,7 @@ #include #include #include +#include #include "afb-session.h" #include "afb-context.h" @@ -49,12 +50,19 @@ void afb_context_init(struct afb_context *context, struct afb_session *session, init_context(context, afb_session_addref(session), token); } +void afb_context_init_validated(struct afb_context *context, struct afb_session *session) +{ + afb_context_init(context, session, NULL); + context->validated = 1; +} + 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->token = NULL; context->validated = super->validated; } @@ -74,6 +82,14 @@ int afb_context_connect(struct afb_context *context, const char *uuid, const cha return 0; } +int afb_context_connect_validated(struct afb_context *context, const char *uuid) +{ + int rc = afb_context_connect(context, uuid, NULL); + if (!rc) + context->validated = 1; + return rc; +} + void afb_context_disconnect(struct afb_context *context) { if (context->session && !context->super) { @@ -148,6 +164,10 @@ void afb_context_refresh(struct afb_context *context) else { assert(context->validated); context->refreshing = 1; + if (!context->refreshed) { + afb_session_new_token (context->session); + context->refreshed = 1; + } } } @@ -180,10 +200,12 @@ static inline unsigned ptr2loa(void *ptr) int afb_context_change_loa(struct afb_context *context, unsigned loa) { - if (!context->validated || loa > 7) - return 0; + if (!context->validated || loa > 7) { + errno = EINVAL; + return -1; + } - return 0 <= afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL); + return afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL); } unsigned afb_context_get_loa(struct afb_context *context) @@ -191,5 +213,3 @@ unsigned afb_context_get_loa(struct afb_context *context) assert(context->session != NULL); return ptr2loa(afb_session_get_cookie(context->session, loa_key(context))); } - -