Simplify functions for calls

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

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index d4041d7..5cb8609 100644 (file)
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,20 @@
 
 #pragma once
 
-struct AFB_clientCtx;
+struct afb_session;
 struct json_object;
 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_hsrv *hsrv;
@@ -34,6 +42,7 @@ struct afb_hreq {
        int suspended;
        int replied;
        const char *version;
+       const char *lang;
        const char *url;
        size_t lenurl;
        const char *tail;
@@ -42,6 +51,8 @@ struct afb_hreq {
        struct hreq_data *data;
        struct json_object *json;
        int upgrade;
+       char *api;
+       char *verb;
 };
 
 extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
@@ -54,7 +65,13 @@ extern int afb_hreq_reply_file_if_exist(struct afb_hreq *request, int dirfd, con
 
 extern int afb_hreq_reply_file(struct afb_hreq *request, int dirfd, const char *filename);
 
-extern int afb_hreq_redirect_to(struct afb_hreq *request, const char *url);
+extern int afb_hreq_reply_locale_file_if_exist(struct afb_hreq *hreq, struct locale_search *search, const char *filename);
+
+extern int afb_hreq_reply_locale_file(struct afb_hreq *hreq, struct locale_search *search, const char *filename);
+
+extern void afb_hreq_redirect_to(struct afb_hreq *request, const char *url, int add_query_part);
+
+extern int afb_hreq_redirect_to_ending_slash_if_needed(struct afb_hreq *hreq);
 
 extern const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name);
 
@@ -68,6 +85,8 @@ extern int afb_hreq_post_add(struct afb_hreq *hreq, const char *name, const char
 
 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 int afb_hreq_init_context(struct afb_hreq *hreq);
 
 extern int afb_hreq_init_cookie(int port, const char *path, int maxage);