afb-req-itf: small step for abstracting

Change-Id: Iaad2c4077b1b28c30c3f1b0369fb82ca0a5909ab
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 19efd4b..613d419 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -23,11 +23,12 @@
 
 #include "../include/local-def.h"
 #include "afb-method.h"
+#include "afb-req-itf.h"
 #include "afb-hreq.h"
 
-
 static char empty_string[1] = "";
 
+
 /* a valid subpath is a relative path not looking deeper than root using .. */
 static int validsubpath(const char *subpath)
 {
@@ -229,3 +230,18 @@ int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url)
        return 1;
 }
 
+const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name)
+{
+       return MHD_lookup_connection_value(hreq->connection, MHD_COOKIE_KIND, name);
+}
+
+const char *afb_hreq_get_argument(struct afb_hreq *hreq, const char *name)
+{
+       return MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name);
+}
+
+struct afb_req_itf afb_hreq_itf = {
+       .get_cookie = (void*)afb_hreq_get_cookie,
+       .get_argument = (void*)afb_hreq_get_argument
+};
+

diff --git a/src/afb-hreq.h b/src/afb-hreq.h
index f0679e0..fd2a2a3 100644 (file)
--- a/src/afb-hreq.h
+++ b/src/afb-hreq.h
@@ -16,6 +16,9 @@
  */
 
 
+struct afb_req_itf;
+
+
 struct afb_hreq_post {
        const char *upload_data;
        size_t *upload_data_size;
@@ -35,16 +38,16 @@ struct afb_hreq {
        void *post_data;
 };
 
-int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
-
-int afb_hreq_valid_tail(struct afb_hreq *request);
+extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
 
-void afb_hreq_reply_error(struct afb_hreq *request, unsigned int status);
+extern int afb_hreq_valid_tail(struct afb_hreq *request);
 
-int afb_hreq_reply_file_if_exist(struct afb_hreq *request, int dirfd, const char *filename);
+extern void afb_hreq_reply_error(struct afb_hreq *request, unsigned int status);
 
-int afb_hreq_reply_file(struct afb_hreq *request, int dirfd, const char *filename);
+extern int afb_hreq_reply_file_if_exist(struct afb_hreq *request, int dirfd, const char *filename);
 
-int afb_hreq_redirect_to(struct afb_hreq *request, const char *url);
+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 struct afb_req_itf afb_hreq_itf;

diff --git a/src/afb-req-itf.h b/src/afb-req-itf.h
new file mode 100644 (file)
index 0000000..004d2c6
--- /dev/null
+++ b/src/afb-req-itf.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+struct afb_req_itf {
+       const char *(*get_cookie)(void *data, const char *name);
+       const char *(*get_argument)(void *data, const char *name);
+};
+
+
+