X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=f0866f82e14f6fb9ef9500bc61bdd834190b4b80;hb=6797f9722dd3e5463e0f7c118397955bb59a40c7;hp=577ef8540a1789b7b8a11f880ff5a0064a53098b;hpb=20ea5089d0e5526afaa5231f30add7b25b2499bd;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c index 577ef854..f0866f82 100644 --- a/src/afb-hsrv.c +++ b/src/afb-hsrv.c @@ -31,6 +31,7 @@ #include "afb-method.h" #include "afb-context.h" +#include "afb-xreq.h" #include "afb-hreq.h" #include "afb-hsrv.h" #include @@ -39,8 +40,6 @@ #include "afb-common.h" - - #define JSON_CONTENT "application/json" #define FORM_CONTENT MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA @@ -68,8 +67,6 @@ struct afb_hsrv { char *cache_to; }; -static int global_reqids = 0; - static void reply_error(struct MHD_Connection *connection, unsigned int status) { struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT); @@ -124,7 +121,7 @@ static int access_handler( } /* create the request */ - hreq = calloc(1, sizeof *hreq); + hreq = afb_hreq_create(); if (hreq == NULL) { ERROR("Can't allocate 'hreq'"); reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR); @@ -132,13 +129,8 @@ static int access_handler( } /* init the request */ - hreq->refcount = 1; 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;