X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=6b3d6e9dae02abbce41a7442b3e13a0aa30be22b;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=83ce5733ca3b75edc7025a960e01bb79701afd06;hpb=ce8de8236b96dc771d3af3094e04e797e75767af;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 83ce5733..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>
  *
@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <errno.h>
 
 #include "afb-session.h"
 #include "afb-context.h"
@@ -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);
@@ -79,7 +83,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 +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)
@@ -109,10 +119,10 @@ 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*))
+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);
+	return afb_session_cookie(context->session, context->api_key, make_value, free_value, closure, replace);
 }
 
 void *afb_context_get(struct afb_context *context)
@@ -121,20 +131,15 @@ void *afb_context_get(struct afb_context *context)
 	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)
@@ -144,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;
+		}
 	}
 }
 
@@ -159,9 +168,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)
@@ -176,10 +185,12 @@ static inline unsigned ptr2loa(void *ptr)
 
 int afb_context_change_loa(struct afb_context *context, unsigned loa)
 {
-	if (!context->validated || loa > 7)
-		return 0;
+	if (!context->validated || loa > 7) {
+		errno = EINVAL;
+		return -1;
+	}
 
-	return 0 <= afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL);
+	return afb_session_set_cookie(context->session, loa_key(context), loa2ptr(loa), NULL);
 }
 
 unsigned afb_context_get_loa(struct afb_context *context)
@@ -187,5 +198,3 @@ unsigned afb_context_get_loa(struct afb_context *context)
 	assert(context->session != NULL);
 	return ptr2loa(afb_session_get_cookie(context->session, loa_key(context)));
 }
-
-