X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=11abcd4802ccacc879156163aa6b0b893858c511;hb=4776245dfb0ca70058881bc2059dc992581d041b;hp=9f5ddd3cae915ffc4321becf47716a4a3be9a8d0;hpb=e97aa93b02793018d7d9cad1582748b02493dad2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 9f5ddd3c..11abcd48 100644
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -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)
 {
-	*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)
@@ -79,7 +82,8 @@ void afb_context_disconnect(struct afb_context *context)
 			context->refreshed = 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);
@@ -100,6 +104,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)
@@ -109,26 +118,27 @@ 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);
 	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)
@@ -153,9 +163,9 @@ int afb_context_check_loa(struct afb_context *context, unsigned 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)