X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb-req-itf.h;h=9ced7630d129d2593f49daf66242152137d56d58;hb=911df9d068b3e259dcab970ded4132a7397f565f;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..9ced7630 100644 --- a/include/afb-req-itf.h +++ b/include/afb-req-itf.h @@ -15,23 +15,29 @@ * limitations under the License. */ +struct json_object; + struct afb_arg { const char *name; const char *value; + const char *path; size_t size; - int is_file; }; 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, json_object *obj, 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 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) @@ -44,9 +50,9 @@ static inline const char *afb_req_argument(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) @@ -54,15 +60,45 @@ static inline void afb_req_iterate(struct afb_req req, int (*iterator)(void *clo req.itf->iterate(req.data, iterator, closure); } -#include -#include -#include - 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 void afb_req_success(struct afb_req req, struct json_object *obj, const char *info) +{ + req.itf->success(req.data, obj, info); +} + +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 +#include +#include + static inline void afb_req_fail_v(struct afb_req req, const char *status, const char *info, va_list args) { char *message; @@ -80,12 +116,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 +125,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);