X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.h;h=1b682c87eaabe3b88512febe4182ae39ec0e2e69;hb=f3d1f19ae308cc0559728c0ccf6281cbce5ee37c;hp=5cb86091b990e7a9662c63b6fa09b4144b1ffda6;hpb=44f21bd2a3b50f92669223cdafe79993654c1e19;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index 5cb86091..1b682c87 100644
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2016-2019 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,22 +17,18 @@
 
 #pragma once
 
-struct afb_session;
+#include "afb-xreq.h"
+
 struct json_object;
+struct json_tokener;
+
+struct afb_session;
 struct hreq_data;
 struct afb_hsrv;
-struct afb_req_itf;
 struct locale_search;
 
-extern const struct afb_req_itf afb_hreq_req_itf;
-
 struct afb_hreq {
-	/*
-	 * CAUTION: 'context' field should be the first because there
-	 * is an implicit convertion to struct afb_context
-	 */
-	struct afb_context context;
-	int refcount;
+	struct afb_xreq xreq;
 	struct afb_hsrv *hsrv;
 	const char *cacheTimeout;
 	struct MHD_Connection *connection;
@@ -50,9 +46,7 @@ struct afb_hreq {
 	struct MHD_PostProcessor *postform;
 	struct hreq_data *data;
 	struct json_object *json;
-	int upgrade;
-	char *api;
-	char *verb;
+	struct json_tokener *tokener;
 };
 
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
@@ -83,9 +77,7 @@ extern int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *name, const
 
 extern int afb_hreq_post_add(struct afb_hreq *hreq, const char *name, const char *data, size_t size);
 
-extern struct afb_req afb_hreq_to_req(struct afb_hreq *hreq);
-
-extern int afb_hreq_init_req_call(struct afb_hreq *hreq, const char *api, size_t lenapi, const char *verb, size_t lenverb);
+extern void afb_hreq_call(struct afb_hreq *hreq, struct afb_apiset *apiset, const char *api, size_t lenapi, const char *verb, size_t lenverb);
 
 extern int afb_hreq_init_context(struct afb_hreq *hreq);
 
@@ -105,3 +97,4 @@ extern void afb_hreq_addref(struct afb_hreq *hreq);
 
 extern void afb_hreq_unref(struct afb_hreq *hreq);
 
+extern struct afb_hreq *afb_hreq_create();