X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hsrv.c;h=f0866f82e14f6fb9ef9500bc61bdd834190b4b80;hb=6797f9722dd3e5463e0f7c118397955bb59a40c7;hp=91dff296a4bf8918c6d5bc9514c7212d00433514;hpb=b8bcf15d19e77a6b255c11e8d95fa655a3f7c3eb;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index 91dff296..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 <afb/afb-req-itf.h>
@@ -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;
@@ -238,9 +230,11 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
 	struct afb_hreq *hreq;
 
 	hreq = *recordreq;
-	if (hreq->upgrade)
-		MHD_suspend_connection (connection);
-	afb_hreq_unref(hreq);
+	if (hreq) {
+		if (hreq->upgrade)
+			MHD_suspend_connection (connection);
+		afb_hreq_unref(hreq);
+	}
 }
 
 void run_micro_httpd(struct afb_hsrv *hsrv)