X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb-req-itf.h;h=f03ce868e0709661f67a3ead772df54c7d18334a;hb=5eaa2c12a8b89f8a16f0759db88d65b56c82918c;hp=a9b768db0aecf2d012100322d588a6f364d1489d;hpb=11d36a9f7e16aa9992835f8ce06f0e1e5297b131;p=src%2Fapp-framework-binder.git

diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index a9b768db..f03ce868 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -15,64 +15,93 @@
  * limitations under the License.
  */
 
+#pragma once
+
 struct json_object;
 
 struct afb_arg {
 	const char *name;
 	const char *value;
-	size_t size;
-	int is_file;
+	const char *path;
 };
 
 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 *req_closure);
+	struct afb_arg (*get)(void *req_closure, const char *name);
+	void (*success)(void *req_closure, struct json_object *obj, const char *info);
+	void (*fail)(void *req_closure, const char *status, const char *info);
+	const char *(*raw)(void *req_closure, size_t *size);
+	void (*send)(void *req_closure, char *buffer, size_t size);
+	void *(*context_get)(void *ctx_closure);
+	void (*context_set)(void *ctx_closure, void *context, void (*free_context)(void*));
+	int (*session_create)(void *req_closure);
+	int (*session_check)(void *req_closure, int refresh);
+	void (*session_close)(void *req_closure);
 };
 
 struct afb_req {
 	const struct afb_req_itf *itf;
-	void *data;
-	void *context;
+	void *req_closure;
+	void *ctx_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.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;
 }
 
-static inline int afb_req_is_argument_file(struct afb_req req, const char *name)
+static inline const char *afb_req_path(struct afb_req req, const char *name)
+{
+	return afb_req_get(req, name).path;
+}
+
+static inline struct json_object *afb_req_json(struct afb_req req)
 {
-	return afb_req_get(req, name).is_file;
+	return req.itf->json(req.req_closure);
 }
 
-static inline void afb_req_iterate(struct afb_req req, int (*iterator)(void *closure, struct afb_arg arg), void *closure)
+static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
 {
-	req.itf->iterate(req.data, iterator, closure);
+	req.itf->success(req.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.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)
+{
+	return req.itf->raw(req.req_closure, size);
+}
+
+static inline void afb_req_send(struct afb_req req, char *buffer, size_t size)
+{
+	req.itf->send(req.req_closure, buffer, size);
+}
+
+static inline void *afb_req_context_get(struct afb_req req)
+{
+	return req.itf->context_get(req.ctx_closure);
+}
+
+static inline void afb_req_context_set(struct afb_req req, void *context, void (*free_context)(void*))
+{
+	return req.itf->context_set(req.ctx_closure, context, free_context);
+}
+
+static inline void afb_req_context_clear(struct afb_req req)
 {
-	req.itf->success(req.data, obj, info);
+	afb_req_context_set(req, NULL, NULL);
 }
 
 static inline int afb_req_session_create(struct afb_req req)
 {
-	int result = req.itf->session_create(req.data);
+	int result = req.itf->session_create(req.req_closure);
 	if (!result)
 		afb_req_fail(req, "fail", "Can't create the session");
 	return result;
@@ -80,7 +109,7 @@ static inline int afb_req_session_create(struct afb_req req)
 
 static inline int afb_req_session_check(struct afb_req req, int refresh)
 {
-	int result = req.itf->session_check(req.data, refresh);
+	int result = req.itf->session_check(req.req_closure, refresh);
 	if (!result)
 		afb_req_fail(req, "fail", "Token chek failed for the session");
 	return result;
@@ -88,7 +117,7 @@ static inline int afb_req_session_check(struct afb_req req, int refresh)
 
 static inline void afb_req_session_close(struct afb_req req)
 {
-	req.itf->session_close(req.data);
+	req.itf->session_close(req.req_closure);
 }
 
 #if !defined(_GNU_SOURCE)