[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] 02/07: split tracking into track_transfer.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] 02/07: split tracking into track_transfer.c and track_transaction.c |
Date: |
Mon, 19 Jun 2017 21:18:00 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit ae7850a318794a7167b991f74066de1b6de4a19a
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jun 19 17:58:46 2017 +0200
split tracking into track_transfer.c and track_transaction.c
---
src/exchange/Makefile.am | 3 +-
src/exchange/taler-exchange-httpd.c | 3 +-
....c => taler-exchange-httpd_track_transaction.c} | 41 ++---------------
....h => taler-exchange-httpd_track_transaction.h} | 26 ++---------
...ing.h => taler-exchange-httpd_track_transfer.c} | 52 +++++++++++-----------
...ing.h => taler-exchange-httpd_track_transfer.h} | 27 ++---------
6 files changed, 42 insertions(+), 110 deletions(-)
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index 2c4c5a9..1d83724 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 67fef71..43c8a80 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
similarity index 76%
rename from src/exchange/taler-exchange-httpd_tracking.c
rename to src/exchange/taler-exchange-httpd_track_transaction.c
index a973549..9b2aaec 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
similarity index 65%
copy from src/exchange/taler-exchange-httpd_tracking.h
copy to src/exchange/taler-exchange-httpd_track_transaction.h
index fe22304..f1cd366 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_tracking.h
b/src/exchange/taler-exchange-httpd_track_transfer.c
similarity index 57%
copy from src/exchange/taler-exchange-httpd_tracking.h
copy to src/exchange/taler-exchange-httpd_track_transfer.c
index fe22304..f54df28 100644
--- a/src/exchange/taler-exchange-httpd_tracking.h
+++ b/src/exchange/taler-exchange-httpd_track_transfer.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014, 2015 GNUnet e.V.
+ 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
@@ -14,16 +14,19 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
/**
- * @file taler-exchange-httpd_tracking.h
- * @brief Handle wire transfer tracking-related requests
+ * @file taler-exchange-httpd_track_transfer.c
+ * @brief Handle wire transfer /track/transfer requests
* @author Christian Grothoff
*/
-#ifndef TALER_EXCHANGE_HTTPD_TRACKING_H
-#define TALER_EXCHANGE_HTTPD_TRACKING_H
-
+#include "platform.h"
#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
#include <microhttpd.h>
-#include "taler-exchange-httpd.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"
/**
@@ -41,25 +44,22 @@ 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);
-
+ size_t *upload_data_size)
+{
+ struct TALER_WireTransferIdentifierRawP wtid;
+ int res;
-/**
- * Handle a "/track/transaction" 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_transaction (struct TEH_RequestHandler *rh,
- struct MHD_Connection *connection,
- void **connection_cls,
- const char *upload_data,
- size_t *upload_data_size);
+ 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);
+}
-#endif
+/* end of taler-exchange-httpd_track_transfer.c */
diff --git a/src/exchange/taler-exchange-httpd_tracking.h
b/src/exchange/taler-exchange-httpd_track_transfer.h
similarity index 64%
rename from src/exchange/taler-exchange-httpd_tracking.h
rename to src/exchange/taler-exchange-httpd_track_transfer.h
index fe22304..2242b25 100644
--- a/src/exchange/taler-exchange-httpd_tracking.h
+++ b/src/exchange/taler-exchange-httpd_track_transfer.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_transfer.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_TRANSFER_H
+#define TALER_EXCHANGE_HTTPD_TRACK_TRANSFER_H
#include <gnunet/gnunet_util_lib.h>
#include <microhttpd.h>
@@ -43,23 +43,4 @@ TEH_TRACKING_handler_track_transfer (struct
TEH_RequestHandler *rh,
const char *upload_data,
size_t *upload_data_size);
-
-/**
- * Handle a "/track/transaction" 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_transaction (struct TEH_RequestHandler *rh,
- struct MHD_Connection *connection,
- void **connection_cls,
- const char *upload_data,
- size_t *upload_data_size);
-
-
#endif
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-exchange] branch master updated (92e6744 -> 247f82c), gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 07/07: move reply_transfer_pending to where it belongs, gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 05/07: fix #5010 for /track/transaction, gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 03/07: refactor /track logic towards new structure, gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 04/07: fix #5010 for /track/transfer, gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 02/07: split tracking into track_transfer.c and track_transaction.c,
gnunet <=
- [GNUnet-SVN] [taler-exchange] 01/07: address #5010 for /payback, gnunet, 2017/06/19
- [GNUnet-SVN] [taler-exchange] 06/07: split httpd_refresh.c into refresh_melt, refresh_link and refresh_reveal, gnunet, 2017/06/19