simplifications

[src/app-framework-binder.git] / src / afb-hreq.h

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index f2362b1..752d06c 100644 (file)
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -15,17 +15,11 @@
  * limitations under the License.
  */
 
-
-struct afb_req_itf;
-
-
-struct afb_hreq_post {
-       const char *upload_data;
-       size_t *upload_data_size;
-};
+struct AFB_session;
+struct AFB_clientCtx;
 
 struct afb_hreq {
-       AFB_session *session;
+       const char *cacheTimeout;
        struct MHD_Connection *connection;
        enum afb_method method;
        const char *version;
@@ -33,12 +27,14 @@ struct afb_hreq {
        size_t lenurl;
        const char *tail;
        size_t lentail;
-       struct afb_hreq **recorder;
-       int (*post_handler) (struct afb_hreq *, struct afb_hreq_post *);
-       int (*post_completed) (struct afb_hreq *, struct afb_hreq_post *);
-       void *post_data;
+       struct MHD_PostProcessor *postform;
+       struct AFB_clientCtx *context;
+       struct hreq_data *data;
+       int upgrade;
 };
 
+extern void afb_hreq_free(struct afb_hreq *request);
+
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
 
 extern int afb_hreq_valid_tail(struct afb_hreq *request);
@@ -53,8 +49,14 @@ extern int afb_hreq_redirect_to(struct afb_hreq *request, const char *url);
 
 extern const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name);
 
+extern const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name);
+
 extern const char *afb_hreq_get_argument(struct afb_hreq *hreq, const char *name);
 
-extern const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name);
+extern int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *name, const char *file, const char *data, size_t size);
+
+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 struct afb_req_itf afb_hreq_itf;
+extern struct AFB_clientCtx *afb_hreq_context(struct afb_hreq *hreq);