From 5f6d706422048710c603aa0e3877417d99cae19f Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Thu, 23 May 2019 20:29:50 +0200 Subject: Export compressing routine. --- src/bank-lib/bank_api_admin.c | 2 +- src/exchange/taler-exchange-httpd_parsing.c | 18 ++++--- src/include/Makefile.am | 3 +- src/include/teah_common.h | 78 +++++++++++++++++++++++++++++ src/lib/teah_common.h | 78 ----------------------------- 5 files changed, 91 insertions(+), 88 deletions(-) create mode 100644 src/include/teah_common.h delete mode 100644 src/lib/teah_common.h (limited to 'src') diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c index 0d07be964..804da3f0a 100644 --- a/src/bank-lib/bank_api_admin.c +++ b/src/bank-lib/bank_api_admin.c @@ -24,7 +24,7 @@ #include /* just for HTTP status codes */ #include "taler_signatures.h" // FIXME(dold): temporary hack -#include "../lib/teah_common.h" +#include "teah_common.h" /** diff --git a/src/exchange/taler-exchange-httpd_parsing.c b/src/exchange/taler-exchange-httpd_parsing.c index 2a9f7a5a7..d1a1e9df5 100644 --- a/src/exchange/taler-exchange-httpd_parsing.c +++ b/src/exchange/taler-exchange-httpd_parsing.c @@ -77,18 +77,20 @@ TEH_PARSE_post_json (struct MHD_Connection *connection, json); switch (pr) { + case GNUNET_JSON_PR_OUT_OF_MEMORY: - return (MHD_NO == - TEH_RESPONSE_reply_internal_error (connection, - TALER_EC_PARSER_OUT_OF_MEMORY, - "out of memory")) - ? GNUNET_SYSERR : GNUNET_NO; + return (MHD_NO == TEH_RESPONSE_reply_internal_error + (connection, + TALER_EC_PARSER_OUT_OF_MEMORY, + "out of memory")) ? GNUNET_SYSERR : GNUNET_NO; + case GNUNET_JSON_PR_CONTINUE: return GNUNET_YES; + case GNUNET_JSON_PR_REQUEST_TOO_LARGE: - return (MHD_NO == - TEH_RESPONSE_reply_request_too_large (connection)) - ? GNUNET_SYSERR : GNUNET_NO; + return (MHD_NO == TEH_RESPONSE_reply_request_too_large + (connection)) ? GNUNET_SYSERR : GNUNET_NO; + case GNUNET_JSON_PR_JSON_INVALID: return (MHD_YES == TEH_RESPONSE_reply_invalid_json (connection)) diff --git a/src/include/Makefile.am b/src/include/Makefile.am index d06d0064a..2d5724de6 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -30,7 +30,8 @@ talerinclude_HEADERS = \ taler_signatures.h \ taler_wire_lib.h \ taler_wire_plugin.h \ - taler_testing_bank_lib.h + taler_testing_bank_lib.h \ + teah_common.h endif diff --git a/src/include/teah_common.h b/src/include/teah_common.h new file mode 100644 index 000000000..c72311850 --- /dev/null +++ b/src/include/teah_common.h @@ -0,0 +1,78 @@ +/* + This file is part of TALER + Copyright (C) 2019 GNUnet e.V. + + TALER is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + TALER is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with TALER; see the file COPYING. If not, see + +*/ +/** + * @file lib/teah_common.h + * @brief Helper routines shared by libtalerexchange and libtalerauditor + * @author Christian Grothoff + */ +#ifndef TEAH_COMMON_H +#define TEAH_COMMON_H + +#include +#include "taler_json_lib.h" + +/** + * Should we compress PUT/POST bodies with 'deflate' encoding? + */ +#define COMPRESS_BODIES 1 + +/** + * State used for #TEAL_curl_easy_post() and + * #TEAL_curl_easy_post_finished(). + */ +struct TEAH_PostContext +{ + /** + * JSON encoding of the request to POST. + */ + char *json_enc; + + /** + * Custom headers. + */ + struct curl_slist *headers; +}; + + +/** + * Add the @a body as POST data to the easy handle in + * @a ctx. + * + * @param ctx[in,out] a request context (updated) + * @param eh easy handle to use + * @param body JSON body to add to @e ctx + * @return #GNUNET_OK on success #GNUNET_SYSERR on failure + */ +int +TEAH_curl_easy_post (struct TEAH_PostContext *ctx, + CURL *eh, + const json_t *body); + + +/** + * Free the data in @a ctx. + * + * @param ctx[in] a request context (updated) + */ +void +TEAH_curl_easy_post_finished (struct TEAH_PostContext *ctx); + + + +#endif diff --git a/src/lib/teah_common.h b/src/lib/teah_common.h deleted file mode 100644 index c72311850..000000000 --- a/src/lib/teah_common.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - This file is part of TALER - Copyright (C) 2019 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - TALER is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with TALER; see the file COPYING. If not, see - -*/ -/** - * @file lib/teah_common.h - * @brief Helper routines shared by libtalerexchange and libtalerauditor - * @author Christian Grothoff - */ -#ifndef TEAH_COMMON_H -#define TEAH_COMMON_H - -#include -#include "taler_json_lib.h" - -/** - * Should we compress PUT/POST bodies with 'deflate' encoding? - */ -#define COMPRESS_BODIES 1 - -/** - * State used for #TEAL_curl_easy_post() and - * #TEAL_curl_easy_post_finished(). - */ -struct TEAH_PostContext -{ - /** - * JSON encoding of the request to POST. - */ - char *json_enc; - - /** - * Custom headers. - */ - struct curl_slist *headers; -}; - - -/** - * Add the @a body as POST data to the easy handle in - * @a ctx. - * - * @param ctx[in,out] a request context (updated) - * @param eh easy handle to use - * @param body JSON body to add to @e ctx - * @return #GNUNET_OK on success #GNUNET_SYSERR on failure - */ -int -TEAH_curl_easy_post (struct TEAH_PostContext *ctx, - CURL *eh, - const json_t *body); - - -/** - * Free the data in @a ctx. - * - * @param ctx[in] a request context (updated) - */ -void -TEAH_curl_easy_post_finished (struct TEAH_PostContext *ctx); - - - -#endif -- cgit v1.2.3