afb-session: Add timeout features for sessions

[src/app-framework-binder.git] / src / afb-context.c

diff --git a/src/afb-context.c b/src/afb-context.c
index 9f5ddd3..c2649a4 100644 (file)
--- 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)
@@ -60,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);
@@ -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_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, closure, replace);
+}
+
 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)