diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-06-19 17:58:46 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-06-19 18:00:32 +0200 |
commit | ae7850a318794a7167b991f74066de1b6de4a19a (patch) | |
tree | cdc370a079acfd3eab469b2533d7fe82e06d30a0 | |
parent | 51ee20102fa3818e9e4a4113a59ad700cb7eea42 (diff) | |
download | exchange-ae7850a318794a7167b991f74066de1b6de4a19a.tar.xz |
split tracking into track_transfer.c and track_transaction.c
-rw-r--r-- | src/exchange/Makefile.am | 3 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd.c | 3 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_track_transaction.c (renamed from src/exchange/taler-exchange-httpd_tracking.c) | 41 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_track_transaction.h (renamed from src/exchange/taler-exchange-httpd_tracking.h) | 26 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_track_transfer.c | 65 | ||||
-rw-r--r-- | src/exchange/taler-exchange-httpd_track_transfer.h | 46 |
6 files changed, 123 insertions, 61 deletions
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am index 2c4c5a941..1d8372435 100644 --- a/src/exchange/Makefile.am +++ b/src/exchange/Makefile.am @@ -55,7 +55,8 @@ taler_exchange_httpd_SOURCES = \ taler-exchange-httpd_reserve_status.c taler-exchange-httpd_reserve_status.h \ taler-exchange-httpd_reserve_withdraw.c taler-exchange-httpd_reserve_withdraw.h \ taler-exchange-httpd_responses.c taler-exchange-httpd_responses.h \ - taler-exchange-httpd_tracking.c taler-exchange-httpd_tracking.h \ + taler-exchange-httpd_track_transaction.c taler-exchange-httpd_track_transaction.h \ + taler-exchange-httpd_track_transfer.c taler-exchange-httpd_track_transfer.h \ taler-exchange-httpd_wire.c taler-exchange-httpd_wire.h \ taler-exchange-httpd_validation.c taler-exchange-httpd_validation.h taler_exchange_httpd_LDADD = \ diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c index 67fef7143..43c8a8039 100644 --- a/src/exchange/taler-exchange-httpd.c +++ b/src/exchange/taler-exchange-httpd.c @@ -36,7 +36,8 @@ #include "taler-exchange-httpd_payback.h" #include "taler-exchange-httpd_wire.h" #include "taler-exchange-httpd_refresh.h" -#include "taler-exchange-httpd_tracking.h" +#include "taler-exchange-httpd_track_transfer.h" +#include "taler-exchange-httpd_track_transaction.h" #include "taler-exchange-httpd_keystate.h" #if HAVE_DEVELOPER #include "taler-exchange-httpd_test.h" diff --git a/src/exchange/taler-exchange-httpd_tracking.c b/src/exchange/taler-exchange-httpd_track_transaction.c index a9735490e..9b2aaeca5 100644 --- a/src/exchange/taler-exchange-httpd_tracking.c +++ b/src/exchange/taler-exchange-httpd_track_transaction.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015, 2016 GNUnet e.V. + Copyright (C) 2014-2017 GNUnet e.V. TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -14,7 +14,7 @@ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ /** - * @file taler-exchange-httpd_tracking.c + * @file taler-exchange-httpd_track_transaction.c * @brief Handle wire transfer tracking-related requests * @author Christian Grothoff */ @@ -25,44 +25,11 @@ #include <pthread.h> #include "taler_signatures.h" #include "taler-exchange-httpd_parsing.h" -#include "taler-exchange-httpd_tracking.h" +#include "taler-exchange-httpd_track_transaction.h" #include "taler-exchange-httpd_responses.h" /** - * Handle a "/track/transfer" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size) -{ - struct TALER_WireTransferIdentifierRawP wtid; - int res; - - res = TEH_PARSE_mhd_request_arg_data (connection, - "wtid", - &wtid, - sizeof (struct TALER_WireTransferIdentifierRawP)); - if (GNUNET_SYSERR == res) - return MHD_NO; /* internal error */ - if (GNUNET_NO == res) - return MHD_YES; /* parse error */ - return TEH_DB_execute_track_transfer (connection, - &wtid); -} - - -/** * Check the merchant signature, and if it is valid, * return the wire transfer identifier. * @@ -156,4 +123,4 @@ TEH_TRACKING_handler_track_transaction (struct TEH_RequestHandler *rh, } -/* end of taler-exchange-httpd_tracking.c */ +/* end of taler-exchange-httpd_track_transaction.c */ diff --git a/src/exchange/taler-exchange-httpd_tracking.h b/src/exchange/taler-exchange-httpd_track_transaction.h index fe223043c..f1cd3669d 100644 --- a/src/exchange/taler-exchange-httpd_tracking.h +++ b/src/exchange/taler-exchange-httpd_track_transaction.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014-2017 GNUnet e.V. TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -14,12 +14,12 @@ TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ /** - * @file taler-exchange-httpd_tracking.h + * @file taler-exchange-httpd_track_transaction.h * @brief Handle wire transfer tracking-related requests * @author Christian Grothoff */ -#ifndef TALER_EXCHANGE_HTTPD_TRACKING_H -#define TALER_EXCHANGE_HTTPD_TRACKING_H +#ifndef TALER_EXCHANGE_HTTPD_TRACK_TRANSACTION_H +#define TALER_EXCHANGE_HTTPD_TRACK_TRANSACTION_H #include <gnunet/gnunet_util_lib.h> #include <microhttpd.h> @@ -27,24 +27,6 @@ /** - * Handle a "/track/transfer" request. - * - * @param rh context of the handler - * @param connection the MHD connection to handle - * @param[in,out] connection_cls the connection's closure (can be updated) - * @param upload_data upload data - * @param[in,out] upload_data_size number of bytes (left) in @a upload_data - * @return MHD result code - */ -int -TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, - struct MHD_Connection *connection, - void **connection_cls, - const char *upload_data, - size_t *upload_data_size); - - -/** * Handle a "/track/transaction" request. * * @param rh context of the handler diff --git a/src/exchange/taler-exchange-httpd_track_transfer.c b/src/exchange/taler-exchange-httpd_track_transfer.c new file mode 100644 index 000000000..f54df282d --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transfer.c @@ -0,0 +1,65 @@ +/* + This file is part of TALER + Copyright (C) 2014, 2015, 2016 GNUnet e.V. + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with + TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> +*/ +/** + * @file taler-exchange-httpd_track_transfer.c + * @brief Handle wire transfer /track/transfer requests + * @author Christian Grothoff + */ +#include "platform.h" +#include <gnunet/gnunet_util_lib.h> +#include <jansson.h> +#include <microhttpd.h> +#include <pthread.h> +#include "taler_signatures.h" +#include "taler-exchange-httpd_parsing.h" +#include "taler-exchange-httpd_track_transfer.h" +#include "taler-exchange-httpd_responses.h" + + +/** + * Handle a "/track/transfer" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size) +{ + struct TALER_WireTransferIdentifierRawP wtid; + int res; + + res = TEH_PARSE_mhd_request_arg_data (connection, + "wtid", + &wtid, + sizeof (struct TALER_WireTransferIdentifierRawP)); + if (GNUNET_SYSERR == res) + return MHD_NO; /* internal error */ + if (GNUNET_NO == res) + return MHD_YES; /* parse error */ + return TEH_DB_execute_track_transfer (connection, + &wtid); +} + + +/* end of taler-exchange-httpd_track_transfer.c */ diff --git a/src/exchange/taler-exchange-httpd_track_transfer.h b/src/exchange/taler-exchange-httpd_track_transfer.h new file mode 100644 index 000000000..2242b25d0 --- /dev/null +++ b/src/exchange/taler-exchange-httpd_track_transfer.h @@ -0,0 +1,46 @@ +/* + This file is part of TALER + Copyright (C) 2014-2017 GNUnet e.V. + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License along with + TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> +*/ +/** + * @file taler-exchange-httpd_track_transfer.h + * @brief Handle wire transfer tracking-related requests + * @author Christian Grothoff + */ +#ifndef TALER_EXCHANGE_HTTPD_TRACK_TRANSFER_H +#define TALER_EXCHANGE_HTTPD_TRACK_TRANSFER_H + +#include <gnunet/gnunet_util_lib.h> +#include <microhttpd.h> +#include "taler-exchange-httpd.h" + + +/** + * Handle a "/track/transfer" request. + * + * @param rh context of the handler + * @param connection the MHD connection to handle + * @param[in,out] connection_cls the connection's closure (can be updated) + * @param upload_data upload data + * @param[in,out] upload_data_size number of bytes (left) in @a upload_data + * @return MHD result code + */ +int +TEH_TRACKING_handler_track_transfer (struct TEH_RequestHandler *rh, + struct MHD_Connection *connection, + void **connection_cls, + const char *upload_data, + size_t *upload_data_size); + +#endif |