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
afb-context: Early token change
[src/app-framework-binder.git]
/
src
/
afb-context.c
diff --git
a/src/afb-context.c
b/src/afb-context.c
index
81f21ff
..
3c0b82c
100644
(file)
--- a/
src/afb-context.c
+++ b/
src/afb-context.c
@@
-63,7
+63,7
@@
int afb_context_connect(struct afb_context *context, const char *uuid, const cha
int created;
struct afb_session *session;
int created;
struct afb_session *session;
- session = afb_session_get (uuid, &created);
+ session = afb_session_get (uuid,
AFB_SESSION_TIMEOUT_DEFAULT,
&created);
if (session == NULL)
return -1;
init_context(context, session, token);
if (session == NULL)
return -1;
init_context(context, session, token);
@@
-118,10
+118,10
@@
const char *afb_context_sent_uuid(struct afb_context *context)
return afb_session_uuid(context->session);
}
return afb_session_uuid(context->session);
}
-void *afb_context_
data(struct afb_context *context, void *(*make_value)(void), void (*free_value)(void*)
)
+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);
{
assert(context->session != NULL);
- return afb_session_cookie(context->session, context->api_key, make_value, free_value);
+ return afb_session_cookie(context->session, context->api_key, make_value, free_value
, closure, replace
);
}
void *afb_context_get(struct afb_context *context)
}
void *afb_context_get(struct afb_context *context)
@@
-148,6
+148,10
@@
void afb_context_refresh(struct afb_context *context)
else {
assert(context->validated);
context->refreshing = 1;
else {
assert(context->validated);
context->refreshing = 1;
+ if (!context->refreshed) {
+ afb_session_new_token (context->session);
+ context->refreshed = 1;
+ }
}
}
}
}
@@
-163,9
+167,9
@@
int afb_context_check_loa(struct afb_context *context, unsigned loa)
return afb_context_get_loa(context) >= loa;
}
return afb_context_get_loa(context) >= loa;
}
-static inline void *loa_key(struct afb_context *context)
+static inline
const
void *loa_key(struct afb_context *context)
{
{
- return (void*)(1+(intptr_t)(context->api_key));
+ return (
const
void*)(1+(intptr_t)(context->api_key));
}
static inline void *loa2ptr(unsigned loa)
}
static inline void *loa2ptr(unsigned loa)