[taler-anastasis] branch master updated (b95a5de -> aa1073c)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a change to branch master
in repository anastasis.

    from b95a5de  plugin wrapper tests
     new 94cfd9c  Modified .gitignore
     new aa1073c  Created some files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |   9 ++
 src/backup-db/test_anastasis_db_postgres.conf      |   7 +-
 .../{test_anastasis_db.c => test_anastasisdb.c}    |   0
 src/backup/anastasis-httpd_mhd.c                   |   4 +-
 src/backup/anastasis-httpd_mhd.h                   | 117 +++++++++++++++++++++
 src/backup/anastasis-httpd_parsing.c               |   4 +-
 src/backup/anastasis-httpd_responses.c             |   4 +-
 NEWS => src/backup/anastasis-httpd_responses.h     |   0
 src/include/anastasis_service.h                    |   3 +-
 9 files changed, 139 insertions(+), 9 deletions(-)
 copy src/backup-db/{test_anastasis_db.c => test_anastasisdb.c} (100%)
 create mode 100644 src/backup/anastasis-httpd_mhd.h
 copy NEWS => src/backup/anastasis-httpd_responses.h (100%)

diff --git a/.gitignore b/.gitignore
index d73163a..ca1b5bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,10 +29,19 @@ src/backup-db/plugin_anastasis_postgres.lo
 src/backup-db/plugin_anastasis_postgres.o
 src/backup/.deps/
 src/backup/Makefile
+src/backup/Makefile.in
 src/include/Makefile
+src/include/Makefile.in
 src/lib/.deps/
 src/lib/Makefile
 src/lib/Makefile.in
 stamp-h1
 test-driver
 uncrustify.cfg
+doc/Makefile.in
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
diff --git a/src/backup-db/test_anastasis_db_postgres.conf 
b/src/backup-db/test_anastasis_db_postgres.conf
index 504dfdc..f91dea1 100644
--- a/src/backup-db/test_anastasis_db_postgres.conf
+++ b/src/backup-db/test_anastasis_db_postgres.conf
@@ -1,2 +1,7 @@
+[anastasis]
+#The DB plugin to use
+DB = postgres
+
 [anastasisdb-postgres]
-CONFIG = "postgres:///anastasis"
+#The connection string the plugin has to use for connecting to the database
+CONFIG = postgres:///anastasischeck
diff --git a/src/backup-db/test_anastasis_db.c 
b/src/backup-db/test_anastasisdb.c
similarity index 100%
copy from src/backup-db/test_anastasis_db.c
copy to src/backup-db/test_anastasisdb.c
diff --git a/src/backup/anastasis-httpd_mhd.c b/src/backup/anastasis-httpd_mhd.c
index af0023b..50e29b7 100644
--- a/src/backup/anastasis-httpd_mhd.c
+++ b/src/backup/anastasis-httpd_mhd.c
@@ -24,8 +24,8 @@
  */
 #include "platform.h"
 #include <jansson.h>
-#include "taler-merchant-httpd_mhd.h"
-#include "taler-merchant-httpd_responses.h"
+#include "anastasis-httpd_mhd.h"
+#include "anastasis-httpd_responses.h"
 
 
 /**
diff --git a/src/backup/anastasis-httpd_mhd.h b/src/backup/anastasis-httpd_mhd.h
new file mode 100644
index 0000000..58e8070
--- /dev/null
+++ b/src/backup/anastasis-httpd_mhd.h
@@ -0,0 +1,117 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014, 2015 GNUnet e.V. and INRIA
+
+  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 anastasis-httpd_mhd.h
+ * @brief helpers for MHD interaction, used to generate simple responses
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#ifndef ANASTASIS_HTTPD_MHD_H
+#define ANASTASIS_HTTPD_MHD_H
+#include <gnunet/gnunet_util_lib.h>
+#include <microhttpd.h>
+#include "anastasis-httpd.h"
+
+
+/**
+ * Function to call to handle the request by sending
+ * back static data from the @a rh.
+ *
+ * @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
+ * @param mi merchant backend instance, NULL is allowed in this case!
+ * @return MHD result code
+ */
+int
+TMH_MHD_handler_static_response (struct TMH_RequestHandler *rh,
+                                 struct MHD_Connection *connection,
+                                 void **connection_cls,
+                                 const char *upload_data,
+                                 size_t *upload_data_size,
+                                 struct MerchantInstance *mi);
+
+
+/**
+ * Function to call to handle the request by sending
+ * back a redirect to the AGPL source code.
+ *
+ * @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
+ * @param mi merchant backend instance, never NULL
+ * @return MHD result code
+ */
+int
+TMH_MHD_handler_agpl_redirect (struct TMH_RequestHandler *rh,
+                               struct MHD_Connection *connection,
+                               void **connection_cls,
+                               const char *upload_data,
+                               size_t *upload_data_size,
+                               struct MerchantInstance *mi);
+
+
+/**
+ * Function to call to handle the request by building a JSON
+ * reply from varargs.
+ *
+ * @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 response_code HTTP response code to use
+ * @param do_cache can the response be cached? (0: no, 1: yes)
+ * @param fmt format string for pack
+ * @param ... varargs
+ * @return MHD result code
+ */
+int
+TMH_MHD_helper_send_json_pack (struct TMH_RequestHandler *rh,
+                               struct MHD_Connection *connection,
+                               void *connection_cls,
+                               int response_code,
+                               int do_cache,
+                               const char *fmt,
+                               ...);
+
+
+/**
+ * Function to call to handle the request by building a JSON
+ * reply with an error message from @a rh.
+ *
+ * @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
+ * @param mi merchant backend instance, never NULL
+ * @return MHD result code
+ */
+int
+TMH_MHD_handler_send_json_pack_error (struct TMH_RequestHandler *rh,
+                                      struct MHD_Connection *connection,
+                                      void **connection_cls,
+                                      const char *upload_data,
+                                      size_t *upload_data_size,
+                                      struct MerchantInstance *mi);
+
+
+#endif
diff --git a/src/backup/anastasis-httpd_parsing.c 
b/src/backup/anastasis-httpd_parsing.c
index 242278f..b2295d3 100644
--- a/src/backup/anastasis-httpd_parsing.c
+++ b/src/backup/anastasis-httpd_parsing.c
@@ -28,8 +28,8 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <taler/taler_json_lib.h>
-#include "taler-merchant-httpd_parsing.h"
-#include "taler-merchant-httpd_responses.h"
+#include "anastasis-httpd_parsing.h"
+#include "anastasis-httpd_responses.h"
 
 /* FIXME: de-duplicate code with taler-exchange-httpd_parsing.c
    and taler-exchange-httpd_response.c */
diff --git a/src/backup/anastasis-httpd_responses.c 
b/src/backup/anastasis-httpd_responses.c
index bdd5884..f15fc89 100644
--- a/src/backup/anastasis-httpd_responses.c
+++ b/src/backup/anastasis-httpd_responses.c
@@ -23,8 +23,8 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "taler-merchant-httpd.h"
-#include "taler-merchant-httpd_responses.h"
+#include "anastasis-httpd.h"
+#include "anastasis-httpd_responses.h"
 #include <taler/taler_util.h>
 #include <taler/taler_json_lib.h>
 #include <gnunet/gnunet_util_lib.h>
diff --git a/NEWS b/src/backup/anastasis-httpd_responses.h
similarity index 100%
copy from NEWS
copy to src/backup/anastasis-httpd_responses.h
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index 2a9e25a..0eb59b4 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -25,8 +25,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include <jansson.h>
 
-*
-/ struct Anastasis_MERCHANT_Pay *
+struct Anastasis_MERCHANT_Pay *
 Anastasis_MERCHANT_pay_abort (struct GNUNET_CURL_Context *ctx,
                               const char *merchant_url,
                               const char *instance,

-- 
To stop receiving notification emails like this one, please contact
address@hidden.