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
genskel: improvements and bug fixs
[src/app-framework-binder.git]
/
src
/
afb-context.c
diff --git
a/src/afb-context.c
b/src/afb-context.c
index
87346b5
..
81f21ff
100644
(file)
--- a/
src/afb-context.c
+++ b/
src/afb-context.c
@@
-20,6
+20,7
@@
#include <assert.h>
#include <stdlib.h>
#include <assert.h>
#include <stdlib.h>
+#include <stdint.h>
#include "afb-session.h"
#include "afb-context.h"
#include "afb-session.h"
#include "afb-context.h"
@@
-33,7
+34,6
@@
static void init_context(struct afb_context *context, struct afb_session *sessio
context->flags = 0;
context->super = NULL;
context->api_key = NULL;
context->flags = 0;
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) {
@@
-51,8
+51,11
@@
void afb_context_init(struct afb_context *context, struct afb_session *session,
void afb_context_subinit(struct afb_context *context, struct afb_context *super)
{
void afb_context_subinit(struct afb_context *context, struct afb_context *super)
{
- *context = *super;
+ context->session = super->session;
+ context->flags = 0;
context->super = super;
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 afb_context_connect(struct afb_context *context, const char *uuid, const char *token)
@@
-78,12
+81,9
@@
void afb_context_disconnect(struct afb_context *context)
afb_session_new_token (context->session);
context->refreshed = 1;
}
afb_session_new_token (context->session);
context->refreshed = 1;
}
- if (context->loa_changing && !context->loa_changed) {
- afb_session_set_LOA (context->session, context->loa_out);
- context->loa_changed = 1;
- }
if (context->closing && !context->closed) {
if (context->closing && !context->closed) {
- afb_session_close(context->session);
+ afb_context_change_loa(context, 0);
+ afb_context_set(context, NULL, NULL);
context->closed = 1;
}
afb_session_unref(context->session);
context->closed = 1;
}
afb_session_unref(context->session);
@@
-104,6
+104,11
@@
const char *afb_context_sent_token(struct afb_context *context)
return afb_session_token(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 || context->super)
const char *afb_context_sent_uuid(struct afb_context *context)
{
if (context->session == NULL || context->closing || context->super)
@@
-113,26
+118,27
@@
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*))
+{
+ assert(context->session != NULL);
+ return afb_session_cookie(context->session, context->api_key, make_value, free_value);
+}
+
void *afb_context_get(struct afb_context *context)
{
assert(context->session != NULL);
return afb_session_get_cookie(context->session, context->api_key);
}
void *afb_context_get(struct afb_context *context)
{
assert(context->session != NULL);
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*))
{
{
- int rc;
assert(context->session != NULL);
assert(context->session != NULL);
- rc = afb_session_set_cookie(context->session, context->api_key, value, free_value);
- (void)rc; /* TODO */
+ return afb_session_set_cookie(context->session, context->api_key, value, free_value);
}
void afb_context_close(struct afb_context *context)
{
}
void afb_context_close(struct afb_context *context)
{
- if (context->super)
- afb_context_close(context->super);
- else
- context->closing = 1;
+ context->closing = 1;
}
void afb_context_refresh(struct afb_context *context)
}
void afb_context_refresh(struct afb_context *context)
@@
-154,32
+160,36
@@
int afb_context_check(struct afb_context *context)
int afb_context_check_loa(struct afb_context *context, unsigned loa)
{
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 afb_context_get_loa(context) >= loa;
}
}
-
int afb_context_change_loa(struct afb_context *context, unsigned loa
)
+
static inline void *loa_key(struct afb_context *context
)
{
{
- if (context->super)
- return afb_context_change_loa(context, loa);
+ return (void*)(1+(intptr_t)(context->api_key));
+}
+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)
return 0;
if (!context->validated || loa > 7)
return 0;
- if (loa == context->loa_in && !context->loa_changed)
- context->loa_changing = 0;
- else {
- context->loa_out = loa & 7;
- context->loa_changing = 1;
- context->loa_changed = 0;
- }
- return 1;
+ return 0 <= afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL);
}
unsigned afb_context_get_loa(struct afb_context *context)
{
}
unsigned afb_context_get_loa(struct afb_context *context)
{
- return context->loa_changing || context->loa_changed ? context->loa_out : context->loa_in;
+ assert(context->session != NULL);
+ return ptr2loa(afb_session_get_cookie(context->session, loa_key(context)));
}
}