X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=6b3d6e9dae02abbce41a7442b3e13a0aa30be22b;hb=e84fc44c47b42651fef17405f5bc09e5079d4a72;hp=87346b5d20718bb35e3b4fc8a2385e985dbaef0a;hpb=ab4955d02a15b13d5dcfdfe8de1529db6538ac27;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 87346b5d..6b3d6e9d 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-2018 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -20,6 +20,8 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
 
 #include "afb-session.h"
 #include "afb-context.h"
@@ -33,7 +35,6 @@ static void init_context(struct afb_context *context, struct afb_session *sessio
 	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) {
@@ -51,8 +52,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)
 {
-	*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)
@@ -60,7 +64,7 @@ int afb_context_connect(struct afb_context *context, const char *uuid, const cha
 	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);
@@ -78,12 +82,9 @@ void afb_context_disconnect(struct afb_context *context)
 			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) {
-			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);
@@ -104,6 +105,11 @@ const char *afb_context_sent_token(struct afb_context *context)
 	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)
@@ -113,26 +119,27 @@ const char *afb_context_sent_uuid(struct afb_context *context)
 	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 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);
-	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)
 {
-	if (context->super)
-		afb_context_close(context->super);
-	else
-		context->closing = 1;
+	context->closing = 1;
 }
 
 void afb_context_refresh(struct afb_context *context)
@@ -142,6 +149,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;
+		}
 	}
 }
 
@@ -154,32 +165,36 @@ int afb_context_check(struct afb_context *context)
 
 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 const void *loa_key(struct afb_context *context)
 {
-	if (context->super)
-		return afb_context_change_loa(context, loa);
+	return (const void*)(1+(intptr_t)(context->api_key));
+}
+
+static inline void *loa2ptr(unsigned loa)
+{
+	return (void*)(intptr_t)loa;
+}
 
-	if (!context->validated || loa > 7)
-		return 0;
+static inline unsigned ptr2loa(void *ptr)
+{
+	return (unsigned)(intptr_t)ptr;
+}
 
-	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;
+int afb_context_change_loa(struct afb_context *context, unsigned loa)
+{
+	if (!context->validated || loa > 7) {
+		errno = EINVAL;
+		return -1;
 	}
-	return 1;
+
+	return afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL);
 }
 
 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)));
 }
-
-