X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=4cdaa6f7f8dfb41aa24f72d4178a2b8d0594c7af;hb=7c67e966b8292961ca748e47d18ff437214cec1c;hp=759ee90e5a7d049188a38c291ad79ff56bd193ac;hpb=7b42076a77b81e205ecc704c3bb7538716567487;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 759ee90e..4cdaa6f7 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-2019 "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"
@@ -49,12 +50,19 @@ void afb_context_init(struct afb_context *context, struct afb_session *session,
 	init_context(context, afb_session_addref(session), token);
 }
 
+void afb_context_init_validated(struct afb_context *context, struct afb_session *session)
+{
+	afb_context_init(context, session, NULL);
+	context->validated = 1;
+}
+
 void afb_context_subinit(struct afb_context *context, struct afb_context *super)
 {
 	context->session = super->session;
 	context->flags = 0;
 	context->super = super;
 	context->api_key = NULL;
+	context->token = NULL;
 	context->validated = super->validated;
 }
 
@@ -63,24 +71,27 @@ 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);
 	if (created) {
 		context->created = 1;
-		/* context->refreshing = 1; */
 	}
 	return 0;
 }
 
+int afb_context_connect_validated(struct afb_context *context, const char *uuid)
+{
+	int rc = afb_context_connect(context, uuid, NULL);
+	if (!rc)
+		context->validated = 1;
+	return rc;
+}
+
 void afb_context_disconnect(struct afb_context *context)
 {
 	if (context->session && !context->super) {
-		if (context->refreshing && !context->refreshed) {
-			afb_session_new_token (context->session);
-			context->refreshed = 1;
-		}
 		if (context->closing && !context->closed) {
 			afb_context_change_loa(context, 0);
 			afb_context_set(context, NULL, NULL);
@@ -91,19 +102,6 @@ void afb_context_disconnect(struct afb_context *context)
 	}
 }
 
-const char *afb_context_sent_token(struct afb_context *context)
-{
-	if (context->session == NULL || context->closing || context->super)
-		return NULL;
-	if (!context->refreshing)
-		return NULL;
-	if (!context->refreshed) {
-		afb_session_new_token (context->session);
-		context->refreshed = 1;
-	}
-	return afb_session_token(context->session);
-}
-
 const char *afb_context_uuid(struct afb_context *context)
 {
 	return context->session ? afb_session_uuid(context->session) : "";
@@ -141,16 +139,6 @@ void afb_context_close(struct afb_context *context)
 	context->closing = 1;
 }
 
-void afb_context_refresh(struct afb_context *context)
-{
-	if (context->super)
-		afb_context_refresh(context->super);
-	else {
-		assert(context->validated);
-		context->refreshing = 1;
-	}
-}
-
 int afb_context_check(struct afb_context *context)
 {
 	if (context->super)
@@ -180,10 +168,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)
@@ -191,5 +181,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)));
 }
-
-