#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <json-c/json.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
#include "afb-context.h"
#include "afb-xreq.h"
/******************************************************************************/
+static void vinfo(void *first, void *second, const char *fmt, va_list args, void (*fun)(void*,void*,const char*))
+{
+ char *info;
+ if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+ info = NULL;
+ fun(first, second, info);
+ free(info);
+}
+
+/******************************************************************************/
+
static struct json_object *xreq_json_cb(void *closure)
{
struct afb_xreq *xreq = closure;
}
}
-static const char *xreq_raw_cb(void *closure, size_t *size)
+static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
- const char *result = json_object_to_json_string(xreq_json_cb(xreq));
- if (size != NULL)
- *size = strlen(result);
- return result;
+ vinfo(closure, obj, fmt, args, (void*)xreq_success_cb);
}
-static void xreq_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
{
- struct json_object *obj = json_tokener_parse(buffer);
- if (!obj == !buffer)
- xreq_success_cb(closure, obj, "fake send");
- else
- xreq_fail_cb(closure, "fake-send-failed", "fake send");
+ vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
}
static void *xreq_context_get_cb(void *closure)
{
struct afb_xreq *xreq = closure;
- if (xreq->queryitf->subcall)
+ if (xreq->queryitf->subcall) {
xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure);
- else
+ json_object_put(args);
+ } else {
afb_subcall(xreq, api, verb, args, callback, cb_closure);
+ }
}
struct xreq_sync
if (!signum) {
sync->jobloop = jobloop;
- xreq_subcall_cb(sync->caller, sync->api, sync->verb, sync->args, xreq_sync_reply, sync);
+ xreq_subcall_cb(sync->caller, sync->api, sync->verb, json_object_get(sync->args), xreq_sync_reply, sync);
} else {
sync->iserror = 1;
xreq_sync_leave(sync);
sync.iserror = 1;
rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync);
+ json_object_put(args);
if (rc < 0 || sync.iserror) {
*result = sync.result ? : afb_msg_json_internal_error();
return 0;
return 1;
}
+static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+ /* TODO: improves the implementation. example: on condition make a list of log messages that will be returned */
+ vverbose(level, file, line, func, fmt, args);
+}
+
/******************************************************************************/
static struct json_object *xreq_hooked_json_cb(void *closure)
xreq_fail_cb(closure, status, info);
}
-static const char *xreq_hooked_raw_cb(void *closure, size_t *size)
+static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
{
- size_t s;
- const char *r = xreq_raw_cb(closure, size ? : &s);
- struct afb_xreq *xreq = closure;
- return afb_hook_xreq_raw(xreq, r, *(size ? : &s));
+ vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb);
}
-static void xreq_hooked_send_cb(void *closure, const char *buffer, size_t size)
+static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
- afb_hook_xreq_send(xreq, buffer, size);
- xreq_send_cb(closure, buffer, size);
+ vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
}
static void *xreq_hooked_context_get_cb(void *closure)
return afb_hook_xreq_subcallsync_result(xreq, r, *result);
}
+static void xreq_hooked_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+ struct afb_xreq *xreq = closure;
+ va_list ap;
+ va_copy(ap, args);
+ xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+ afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+ va_end(ap);
+}
+
/******************************************************************************/
const struct afb_req_itf xreq_itf = {
.get = xreq_get_cb,
.success = xreq_success_cb,
.fail = xreq_fail_cb,
- .raw = xreq_raw_cb,
- .send = xreq_send_cb,
+ .vsuccess = xreq_vsuccess_cb,
+ .vfail = xreq_vfail_cb,
.context_get = xreq_context_get_cb,
.context_set = xreq_context_set_cb,
.addref = xreq_addref_cb,
.subscribe = xreq_subscribe_cb,
.unsubscribe = xreq_unsubscribe_cb,
.subcall = xreq_subcall_cb,
- .subcallsync = xreq_subcallsync_cb
+ .subcallsync = xreq_subcallsync_cb,
+ .vverbose = xreq_vverbose_cb
};
const struct afb_req_itf xreq_hooked_itf = {
.get = xreq_hooked_get_cb,
.success = xreq_hooked_success_cb,
.fail = xreq_hooked_fail_cb,
- .raw = xreq_hooked_raw_cb,
- .send = xreq_hooked_send_cb,
+ .vsuccess = xreq_hooked_vsuccess_cb,
+ .vfail = xreq_hooked_vfail_cb,
.context_get = xreq_hooked_context_get_cb,
.context_set = xreq_hooked_context_set_cb,
.addref = xreq_hooked_addref_cb,
.subscribe = xreq_hooked_subscribe_cb,
.unsubscribe = xreq_hooked_unsubscribe_cb,
.subcall = xreq_hooked_subcall_cb,
- .subcallsync = xreq_hooked_subcallsync_cb
+ .subcallsync = xreq_hooked_subcallsync_cb,
+ .vverbose = xreq_hooked_vverbose_cb
};
static inline struct afb_req to_req(struct afb_xreq *xreq)
const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
{
- return afb_req_raw(to_req(xreq), size);
+ struct json_object *obj = xreq_json_cb(xreq);
+ const char *result = json_object_to_json_string(obj);
+ if (size != NULL)
+ *size = strlen(result);
+ return result;
}
void afb_xreq_addref(struct afb_xreq *xreq)
Code Review / src / app-framework-binder.git / blobdiff