X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb-req-itf.h;h=357ffd7b3a72db6de0ecd2f5d5547c1e836d2262;hb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;hp=eea783178c36511337c4a06f40e3467a81e7c7a4;hpb=dde70b62b09f49ad672c104a3f81714bf11047be;p=src%2Fapp-framework-binder.git

diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index eea78317..357ffd7b 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -15,23 +15,32 @@
  * 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 json_object *(*json)(void *data);
 	struct afb_arg (*get)(void *data, const char *name);
-	void (*iterate)(void *data, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
+	void (*success)(void *data, struct json_object *obj, const char *info);
 	void (*fail)(void *data, const char *status, const char *info);
-	void (*success)(void *data, json_object *obj, const char *info);
+	const char *(*raw)(void *data, size_t *size);
+	void (*send)(void *data, char *buffer, size_t size);
+	int (*session_create)(void *data);
+	int (*session_check)(void *data, int refresh);
+	void (*session_close)(void *data);
 };
 
 struct afb_req {
 	const struct afb_req_itf *itf;
 	void *data;
+	void **context;
 };
 
 static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
@@ -39,30 +48,70 @@ static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
 	return req.itf->get(req.data, 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).is_file;
+	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.data);
 }
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
+static inline void afb_req_success(struct afb_req req, struct json_object *obj, const char *info)
+{
+	req.itf->success(req.data, 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);
 }
 
+static inline const char *afb_req_raw(struct afb_req req, size_t *size)
+{
+	return req.itf->raw(req.data, size);
+}
+
+static inline void afb_req_send(struct afb_req req, char *buffer, size_t size)
+{
+	req.itf->send(req.data, buffer, size);
+}
+
+static inline int afb_req_session_create(struct afb_req req)
+{
+	int result = req.itf->session_create(req.data);
+	if (!result)
+		afb_req_fail(req, "fail", "Can't create the session");
+	return result;
+}
+
+static inline int afb_req_session_check(struct afb_req req, int refresh)
+{
+	int result = req.itf->session_check(req.data, refresh);
+	if (!result)
+		afb_req_fail(req, "fail", "Token chek failed for the session");
+	return result;
+}
+
+static inline void afb_req_session_close(struct afb_req req)
+{
+	req.itf->session_close(req.data);
+}
+
+#if !defined(_GNU_SOURCE)
+# error "_GNU_SOURCE must be defined for using vasprintf"
+#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)
 {
 	char *message;
@@ -80,12 +129,7 @@ static inline void afb_req_fail_f(struct afb_req req, const char *status, const
 	va_end(args);
 }
 
-static inline void afb_req_success(struct afb_req req, json_object *obj, const char *info)
-{
-	req.itf->success(req.data, obj, info);
-}
-
-static inline void afb_req_success_v(struct afb_req req, json_object *obj, const char *info, va_list args)
+static inline void afb_req_success_v(struct afb_req req, struct json_object *obj, const char *info, va_list args)
 {
 	char *message;
 	if (info == NULL || vasprintf(&message, info, args) < 0)
@@ -94,7 +138,7 @@ static inline void afb_req_success_v(struct afb_req req, json_object *obj, const
 	free(message);
 }
 
-static inline void afb_req_success_f(struct afb_req req, json_object *obj, const char *info, ...)
+static inline void afb_req_success_f(struct afb_req req, struct json_object *obj, const char *info, ...)
 {
 	va_list args;
 	va_start(args, info);