Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add credential data to xreq
[src/app-framework-binder.git]
/
src
/
afb-context.c
diff --git
a/src/afb-context.c
b/src/afb-context.c
index
a7010db
..
174ac16
100644
(file)
--- a/
src/afb-context.c
+++ b/
src/afb-context.c
@@
-1,6
+1,7
@@
/*
/*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2016
, 2017
"IoT.bzh"
* Author "Fulup Ar Foll"
* Author "Fulup Ar Foll"
+ * Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,134
+21,160
@@
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
-#include "session.h"
+#include "
afb-
session.h"
#include "afb-context.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;
{
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;
+ context->loa_in = afb_session_get_LOA(session) & 7;
/* check the token */
if (token != 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;
}
}
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 = *super;
+ context->super = super;
}
int afb_context_connect(struct afb_context *context, const char *uuid, const char *token)
{
int created;
}
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, &created);
if (session == NULL)
return -1;
init_context(context, session, token);
if (created) {
context->created = 1;
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)
{
}
return 0;
}
void afb_context_disconnect(struct afb_context *context)
{
- if (context->session
!= NULL
) {
+ if (context->session
&& !context->super
) {
if (context->refreshing && !context->refreshed) {
if (context->refreshing && !context->refreshed) {
-
ctxTokenNew
(context->session);
+
afb_session_new_token
(context->session);
context->refreshed = 1;
}
if (context->loa_changing && !context->loa_changed) {
context->refreshed = 1;
}
if (context->loa_changing && !context->loa_changed) {
-
ctxClientSet
LOA (context->session, context->loa_out);
+
afb_session_set_
LOA (context->session, context->loa_out);
context->loa_changed = 1;
}
if (context->closing && !context->closed) {
context->loa_changed = 1;
}
if (context->closing && !context->closed) {
-
ctxClientC
lose(context->session);
+
afb_session_c
lose(context->session);
context->closed = 1;
}
context->closed = 1;
}
-
ctxClientU
nref(context->session);
+
afb_session_u
nref(context->session);
context->session = NULL;
}
}
const char *afb_context_sent_token(struct afb_context *context)
{
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) {
return NULL;
if (!context->refreshing)
return NULL;
if (!context->refreshed) {
-
ctxTokenNew
(context->session);
+
afb_session_new_token
(context->session);
context->refreshed = 1;
}
context->refreshed = 1;
}
- return
ctxClientGetT
oken(context->session);
+ return
afb_session_t
oken(context->session);
}
const char *afb_context_sent_uuid(struct afb_context *context)
{
}
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 NULL;
if (!context->created)
return NULL;
- return
ctxClientGetU
uid(context->session);
+ return
afb_session_u
uid(context->session);
}
void *afb_context_get(struct afb_context *context)
{
assert(context->session != NULL);
}
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*))
{
}
void afb_context_set(struct afb_context *context, void *value, void (*free_value)(void*))
{
+ int rc;
assert(context->session != NULL);
assert(context->session != NULL);
- return ctxClientValueSet(context->session, context->api_index, value, free_value);
+ rc = afb_session_set_cookie(context->session, context->api_key, value, free_value);
+ (void)rc; /* TODO */
}
void afb_context_close(struct afb_context *context)
{
}
void afb_context_close(struct afb_context *context)
{
- context->closing = 1;
+ if (context->super)
+ afb_context_close(context->super);
+ else
+ context->closing = 1;
}
void afb_context_refresh(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;
+ }
}
int afb_context_check(struct afb_context *context)
{
}
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->validated;
}
int afb_context_check_loa(struct afb_context *context, unsigned loa)
{
+ if (context->super)
+ return afb_context_check_loa(context->super, loa);
return context->loa_in >= loa;
}
return context->loa_in >= loa;
}
-
void
afb_context_change_loa(struct afb_context *context, unsigned loa)
+
int
afb_context_change_loa(struct afb_context *context, unsigned loa)
{
{
- assert(context->validated);
+ if (context->super)
+ return afb_context_change_loa(context, loa);
+
+ if (!context->validated || loa > 7)
+ return 0;
- if (loa == context->loa_in)
+ if (loa == context->loa_in
&& !context->loa_changed
)
context->loa_changing = 0;
else {
context->loa_changing = 0;
else {
- context->loa_changing = 1;
context->loa_out = loa & 7;
context->loa_out = loa & 7;
+ context->loa_changing = 1;
+ context->loa_changed = 0;
}
}
+ return 1;
}
}