Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Make profile.d file consistent between rpm and debian"
[src/app-framework-binder.git]
/
src
/
afb-hreq.h
diff --git
a/src/afb-hreq.h
b/src/afb-hreq.h
index
3d7954a
..
bae178d
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, 2018
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-17,21
+17,18
@@
#pragma once
#pragma once
-struct AFB_clientCtx;
+#include "afb-xreq.h"
+
struct json_object;
struct json_object;
+struct json_tokener;
+
+struct afb_session;
struct hreq_data;
struct afb_hsrv;
struct hreq_data;
struct afb_hsrv;
-struct afb_req_itf;
-
-extern const struct afb_req_itf afb_hreq_req_itf;
+struct locale_search;
struct afb_hreq {
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;
struct afb_hsrv *hsrv;
const char *cacheTimeout;
struct MHD_Connection *connection;
@@
-49,7
+46,7
@@
struct afb_hreq {
struct MHD_PostProcessor *postform;
struct hreq_data *data;
struct json_object *json;
struct MHD_PostProcessor *postform;
struct hreq_data *data;
struct json_object *json;
-
int upgrade
;
+
struct json_tokener *tokener
;
};
extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
};
extern int afb_hreq_unprefix(struct afb_hreq *request, const char *prefix, size_t length);
@@
-62,6
+59,10
@@
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_reply_file(struct afb_hreq *request, int dirfd, const char *filename);
+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 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);
@@
-76,7
+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 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
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);
extern int afb_hreq_init_context(struct afb_hreq *hreq);
@@
-96,3
+97,4
@@
extern void afb_hreq_addref(struct afb_hreq *hreq);
extern void afb_hreq_unref(struct afb_hreq *hreq);
extern void afb_hreq_unref(struct afb_hreq *hreq);
+extern struct afb_hreq *afb_hreq_create();