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

diff --git a/src/afb-context.c b/src/afb-context.c
index 87346b5d..e9c73de5 100644
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <stdint.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->loa_in = afb_session_get_LOA(session) & 7;
 
 	/* check the token */
 	if (token != NULL) {
@@ -78,12 +78,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);
@@ -113,6 +110,12 @@ const char *afb_context_sent_uuid(struct afb_context *context)
 	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);
@@ -129,10 +132,7 @@ void afb_context_set(struct afb_context *context, void *value, void (*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)
@@ -154,32 +154,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 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 (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)
 {
-	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)));
 }