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.req_closure, name);
static struct jbus *jbus;
+struct memo
+{
+ struct afb_req request;
+ const char *method;
+};
+
+static struct memo *make_memo(struct afb_req request, const char *method)
+{
+ struct memo *memo = malloc(sizeof *memo);
+ if (memo != NULL) {
+ memo->request = request;
+ memo->method = method;
+ }
+ return memo;
+}
+
static void application_list_changed(const char *data, void *closure)
{
afb_evmgr_push(evmgr, "application-list-changed", NULL);
return result;
}
-static void embed_call_void(struct afb_req request, const char *method)
+static void embed_call_void_callback(int status, struct json_object *obj, struct memo *memo)
{
- struct json_object *obj = jbus_call_sj_sync(jbus, method, "true");
if (interface->verbosity)
- fprintf(stderr, "(afm-main-plugin) %s(true) -> %s\n", method,
+ fprintf(stderr, "(afm-main-plugin) %s(true) -> %s\n", memo->method,
obj ? json_object_to_json_string(obj) : "NULL");
if (obj == NULL) {
- afb_req_fail(request, "failed", "framework daemon failure");
- return;
+ afb_req_fail(memo->request, "failed", "framework daemon failure");
+ } else {
+ obj = json_object_get(obj);
+ obj = embed(memo->method, obj);
+ if (obj == NULL) {
+ afb_req_fail(memo->request, "failed", "framework daemon failure");
+ } else {
+ afb_req_success(memo->request, obj, NULL);
+ }
}
- obj = json_object_get(obj);
- obj = embed(method, obj);
+ free(memo);
+}
+
+static void embed_call_void(struct afb_req request, const char *method)
+{
+ struct memo *memo = make_memo(request, method);
+ if (memo == NULL)
+ afb_req_fail(request, "failed", "out of memory");
+ else if (jbus_call_sj(jbus, method, "true", (void*)embed_call_void_callback, memo) < 0) {
+ afb_req_fail(request, "failed", "dbus failure");
+ free(memo);
+ }
+}
+
+static void call_appid_callback(int status, struct json_object *obj, struct memo *memo)
+{
+ if (interface->verbosity)
+ fprintf(stderr, "(afm-main-plugin) %s -> %s\n", memo->method,
+ obj ? json_object_to_json_string(obj) : "NULL");
if (obj == NULL) {
- afb_req_fail(request, "failed", "framework daemon failure");
- return;
+ afb_req_fail(memo->request, "failed", "framework daemon failure");
+ } else {
+ obj = json_object_get(obj);
+ afb_req_success(memo->request, obj, NULL);
}
- afb_req_success(request, obj, NULL);
+ free(memo);
}
static void call_appid(struct afb_req request, const char *method)
{
- struct json_object *obj;
+ struct memo *memo;
char *sid;
const char *id = afb_req_value(request, _id_);
if (id == NULL) {
afb_req_fail(request, "bad-request", "missing 'id'");
return;
}
- if (asprintf(&sid, "\"%s\"", id) <= 0) {
+ memo = make_memo(request, method);
+ if (asprintf(&sid, "\"%s\"", id) <= 0 || memo == NULL) {
afb_req_fail(request, "server-error", "out of memory");
+ free(memo);
return;
}
- obj = jbus_call_sj_sync(jbus, method, sid);
- if (interface->verbosity)
- fprintf(stderr, "(afm-main-plugin) %s(%s) -> %s\n", method, sid,
- obj ? json_object_to_json_string(obj) : "NULL");
- free(sid);
- if (obj == NULL) {
- afb_req_fail(request, "failed", "framework daemon failure");
- return;
+ if (jbus_call_sj(jbus, method, sid, (void*)call_appid_callback, memo) < 0) {
+ afb_req_fail(request, "failed", "dbus failure");
+ free(memo);
}
- obj = json_object_get(obj);
- afb_req_success(request, obj, NULL);
+ free(sid);
}
static void call_runid(struct afb_req request, const char *method)
afb_req_success(request, obj, NULL);
}
-
/************************** entries ******************************/
static void runnables(struct afb_req request)
obj = jbus_call_sj_sync(jbus, _install_, query);
if (interface->verbosity)
-;
fprintf(stderr, "(afm-main-plugin) install(%s) -> %s\n", query,
obj ? json_object_to_json_string(obj) : "NULL");
free(query);
{
char *cookie;
const char *k, *v;
+
+ if (hreq->replied != 0)
+ return;
+
k = va_arg(args, const char *);
while (k != NULL) {
v = va_arg(args, const char *);
}
MHD_queue_response(hreq->connection, status, response);
MHD_destroy_response(response);
+
+ hreq->replied = 1;
+ if (hreq->suspended != 0) {
+ extern void run_micro_httpd(struct afb_hsrv *hsrv);
+ MHD_resume_connection (hreq->connection);
+ hreq->suspended = 0;
+ run_micro_httpd(hreq->hsrv);
+ }
}
void afb_hreq_reply(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, ...)
struct AFB_clientCtx;
struct json_object;
struct hreq_data;
+struct afb_hsrv;
struct afb_hreq {
+ struct afb_hsrv *hsrv;
const char *cacheTimeout;
struct MHD_Connection *connection;
int method;
+ int reqid;
+ int scanned;
+ int suspended;
+ int replied;
const char *version;
const char *url;
size_t lenurl;
struct hsrv_handler *handlers;
struct MHD_Daemon *httpd;
struct upoll *upoll;
+ int in_run;
char *cache_to;
};
+static int global_reqids = 0;
static void reply_error(struct MHD_Connection *connection, unsigned int status)
{
hsrv = cls;
hreq = *recordreq;
if (hreq == NULL) {
- /* create the request */
- hreq = calloc(1, sizeof *hreq);
- if (hreq == NULL)
- goto internal_error;
- *recordreq = hreq;
-
/* get the method */
method = get_method(methodstr);
method &= afb_method_get | afb_method_post;
- if (method == afb_method_none)
- goto bad_request;
+ if (method == afb_method_none) {
+ reply_error(connection, MHD_HTTP_BAD_REQUEST);
+ return MHD_YES;
+ }
+
+ /* create the request */
+ hreq = calloc(1, sizeof *hreq);
+ if (hreq == NULL) {
+ reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
/* init the request */
+ hreq->hsrv = hsrv;
hreq->cacheTimeout = hsrv->cache_to;
+ hreq->reqid = ++global_reqids;
+ hreq->scanned = 0;
+ hreq->suspended = 0;
+ hreq->replied = 0;
hreq->connection = connection;
hreq->method = method;
hreq->version = version;
hreq->tail = hreq->url = url;
hreq->lentail = hreq->lenurl = strlen(url);
+ *recordreq = hreq;
/* init the post processing */
if (method == afb_method_post) {
} else if (strcasestr(type, FORM_CONTENT) != NULL) {
hreq->postform = MHD_create_post_processor (connection, 65500, postproc, hreq);
if (hreq->postform == NULL)
- goto internal_error;
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
return MHD_YES;
} else if (strcasestr(type, JSON_CONTENT) == NULL) {
- reply_error(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
+ afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
return MHD_YES;
}
}
/* process further data */
if (*upload_data_size) {
if (hreq->postform != NULL) {
- if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size))
- goto internal_error;
+ if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size)) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
} else {
- if (!afb_hreq_post_add(hreq, "", upload_data, *upload_data_size))
- goto internal_error;
+ if (!afb_hreq_post_add(hreq, "", upload_data, *upload_data_size)) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+ return MHD_YES;
+ }
}
*upload_data_size = 0;
- return MHD_YES;
+ return MHD_YES;
}
/* flush the data */
if (hreq->postform != NULL) {
rc = MHD_destroy_post_processor(hreq->postform);
hreq->postform = NULL;
- if (rc == MHD_NO)
- goto bad_request;
+ if (rc == MHD_NO) {
+ afb_hreq_reply_error(hreq, MHD_HTTP_BAD_REQUEST);
+ return MHD_YES;
+ }
+ }
+
+ if (hreq->scanned != 0) {
+ if (hreq->replied == 0 && hreq->suspended == 0) {
+ MHD_suspend_connection (connection);
+ hreq->suspended = 1;
+ }
+ return MHD_YES;
}
/* search an handler for the request */
+ hreq->scanned = 1;
iter = hsrv->handlers;
while (iter) {
if (afb_hreq_unprefix(hreq, iter->prefix, iter->length)) {
- if (iter->handler(hreq, iter->data))
+ if (iter->handler(hreq, iter->data)) {
+ if (hreq->replied == 0 && hreq->suspended == 0) {
+ MHD_suspend_connection (connection);
+ hreq->suspended = 1;
+ }
return MHD_YES;
+ }
hreq->tail = hreq->url;
hreq->lentail = hreq->lenurl;
}
/* no handler */
afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
return MHD_YES;
-
-bad_request:
- reply_error(connection, MHD_HTTP_BAD_REQUEST);
- return MHD_YES;
-
-internal_error:
- reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
- return MHD_YES;
}
/* Because of POST call multiple time requestApi we need to free POST handle here */
afb_hreq_free(hreq);
}
-static void handle_epoll_readable(struct afb_hsrv *hsrv)
+void run_micro_httpd(struct afb_hsrv *hsrv)
{
- upoll_on_readable(hsrv->upoll, NULL);
- MHD_run(hsrv->httpd);
- upoll_on_readable(hsrv->upoll, (void*)handle_epoll_readable);
+ if (hsrv->in_run != 0)
+ hsrv->in_run = 2;
+ else {
+ upoll_on_readable(hsrv->upoll, NULL);
+ do {
+ hsrv->in_run = 1;
+ MHD_run(hsrv->httpd);
+ } while(hsrv->in_run == 2);
+ hsrv->in_run = 0;
+ upoll_on_readable(hsrv->upoll, (void*)run_micro_httpd);
+ }
};
static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t addrlen)
fprintf(stderr, "Error: connection to upoll of httpd failed");
return 0;
}
- upoll_on_readable(upoll, (void*)handle_epoll_readable);
+ upoll_on_readable(upoll, (void*)run_micro_httpd);
hsrv->httpd = httpd;
hsrv->upoll = upoll;
extern struct afb_hsrv *afb_hsrv_create();
extern void afb_hsrv_put(struct afb_hsrv *hsrv);
-
extern void afb_hsrv_stop(struct afb_hsrv *hsrv);
extern int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection_timeout);
extern int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration);
Code Review / src / app-framework-binder.git / commitdiff