aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-04-08 15:14:59 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-04-08 15:14:59 +0200
commit56f9ef4581d567248b6f83a3b15f39a0aca42895 (patch)
tree607fddaf6c62515126768b86d3e7e7df1112153a /include
parent6ea1d50ab6571551e1d0379940349911956c97ee (diff)
refactoring req interface
Change-Id: I6fc9246099c34f62c82e060cf014a63b0e8f63d8 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'include')
-rw-r--r--include/afb-req-itf.h27
1 files changed, 19 insertions, 8 deletions
diff --git a/include/afb-req-itf.h b/include/afb-req-itf.h
index 9ced7630..7f7472f1 100644
--- a/include/afb-req-itf.h
+++ b/include/afb-req-itf.h
@@ -21,14 +21,15 @@ struct afb_arg {
const char *name;
const char *value;
const char *path;
- size_t size;
};
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 (*fail)(void *data, const char *status, const char *info);
void (*success)(void *data, struct json_object *obj, const char *info);
+ void (*fail)(void *data, const char *status, 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);
@@ -45,7 +46,7 @@ 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;
}
@@ -55,9 +56,14 @@ 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)
+{
+ return req.itf->json(req.data);
+}
+
+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.data, obj, info);
}
static inline void afb_req_fail(struct afb_req req, const char *status, const char *info)
@@ -65,9 +71,14 @@ static inline void afb_req_fail(struct afb_req req, const char *status, const ch
req.itf->fail(req.data, 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.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)