X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-context.c;h=3c0b82c161df77204416b20a7cc7ee90c0918244;hb=6e7f3d28a2d08a8976fdd9c586b4cbddcaeb37bd;hp=81f21ff466fc4c9962d9a9083e6c04de3536c2aa;hpb=febbd43b65c6b0d480b076ead8a078979b8b3603;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-context.c b/src/afb-context.c
index 81f21ff4..3c0b82c1 100644
--- a/src/afb-context.c
+++ b/src/afb-context.c
@@ -63,7 +63,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);
@@ -118,10 +118,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)
@@ -148,6 +148,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;
+		}
 	}
 }
 
@@ -163,9 +167,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)