X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb-req-itf.h;h=a975503dbb61f32bc7ea8d021e0044889fcb73cf;hb=3e775a79aa6ea82f93b2fc03f58ad261a17c73ca;hp=9ced7630d129d2593f49daf66242152137d56d58;hpb=fc19b7d7974f9c64dffc40e180464d595a9805cd;p=src%2Fapp-framework-binder.git

diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index 9ced7630..a975503d 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -15,37 +15,44 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct json_object;
 
 struct afb_arg {
 	const char *name;
 	const char *value;
 	const char *path;
-	size_t size;
 };
 
 struct afb_req_itf {
-	struct afb_arg (*get)(void *data, const char *name);
-	void (*iterate)(void *data, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
-	void (*fail)(void *data, const char *status, const char *info);
-	void (*success)(void *data, struct json_object *obj, const char *info);
-	int (*session_create)(void *data);
-	int (*session_check)(void *data, int refresh);
-	void (*session_close)(void *data);
+	struct json_object *(*json)(void *closure);
+	struct afb_arg (*get)(void *closure, const char *name);
+
+	void (*success)(void *closure, struct json_object *obj, const char *info);
+	void (*fail)(void *closure, const char *status, const char *info);
+
+	const char *(*raw)(void *closure, size_t *size);
+	void (*send)(void *closure, const char *buffer, size_t size);
+
+	void *(*context_get)(void *closure);
+	void (*context_set)(void *closure, void *value, void (*free_value)(void*));
+
+	void (*addref)(void *closure);
+	void (*unref)(void *closure);
 };
 
 struct afb_req {
 	const struct afb_req_itf *itf;
-	void *data;
-	void **context;
+	void *closure;
 };
 
 static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
 {
-	return req.itf->get(req.data, name);
+	return req.itf->get(req.closure, name);
 }
 
-static inline const char *afb_req_argument(struct afb_req req, const char *name)
+static inline const char *afb_req_value(struct afb_req req, const char *name)
 {
 	return afb_req_get(req, name).value;
 }
@@ -55,40 +62,74 @@ static inline const char *afb_req_path(struct afb_req req, const char *name)
 	return afb_req_get(req, name).path;
 }
 
-static inline void afb_req_iterate(struct afb_req req, int (*iterator)(void *closure, struct afb_arg arg), void *closure)
+static inline struct json_object *afb_req_json(struct afb_req req)
 {
-	req.itf->iterate(req.data, iterator, closure);
+	return req.itf->json(req.closure);
+}
+
+static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
+{
+	req.itf->success(req.closure, obj, info);
 }
 
 static inline void afb_req_fail(struct afb_req req, const char *status, const char *info)
 {
-	req.itf->fail(req.data, status, info);
+	req.itf->fail(req.closure, status, info);
 }
 
-static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
+static inline const char *afb_req_raw(struct afb_req req, size_t *size)
 {
-	req.itf->success(req.data, obj, info);
+	return req.itf->raw(req.closure, size);
 }
 
-static inline int afb_req_session_create(struct afb_req req)
+static inline void afb_req_send(struct afb_req req, const char *buffer, size_t size)
 {
-	int result = req.itf->session_create(req.data);
-	if (!result)
-		afb_req_fail(req, "fail", "Can't create the session");
-	return result;
+	req.itf->send(req.closure, buffer, size);
+}
+
+static inline void *afb_req_context_get(struct afb_req req)
+{
+	return req.itf->context_get(req.closure);
+}
+
+static inline void afb_req_context_set(struct afb_req req, void *value, void (*free_value)(void*))
+{
+	return req.itf->context_set(req.closure, value, free_value);
+}
+
+static inline void afb_req_context_clear(struct afb_req req)
+{
+	afb_req_context_set(req, NULL, NULL);
+}
+
+static inline void afb_req_addref(struct afb_req req)
+{
+	return req.itf->addref(req.closure);
 }
 
-static inline int afb_req_session_check(struct afb_req req, int refresh)
+static inline void afb_req_unref(struct afb_req req)
 {
-	int result = req.itf->session_check(req.data, refresh);
-	if (!result)
-		afb_req_fail(req, "fail", "Token chek failed for the session");
+	return req.itf->unref(req.closure);
+}
+
+#include <stdlib.h>
+
+static inline struct afb_req *afb_req_store(struct afb_req req)
+{
+	struct afb_req *result = malloc(sizeof *result);
+	if (result != NULL) {
+		*result = req;
+		afb_req_addref(req);
+	}
 	return result;
 }
 
-static inline void afb_req_session_close(struct afb_req req)
+static inline struct afb_req afb_req_unstore(struct afb_req *req)
 {
-	req.itf->session_close(req.data);
+	struct afb_req result = *req;
+	free(req);
+	afb_req_unref(result);
+	return result;
 }
 
 #if !defined(_GNU_SOURCE)
@@ -96,7 +137,6 @@ static inline void afb_req_session_close(struct afb_req req)
 #endif
 
 #include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
 
 static inline void afb_req_fail_v(struct afb_req req, const char *status, const char *info, va_list args)