summaryrefslogtreecommitdiff
path: root/src/backenddb
diff options
context:
space:
mode:
Diffstat (limited to 'src/backenddb')
-rw-r--r--src/backenddb/Makefile.am29
-rw-r--r--src/backenddb/merchantdb_plugin.c150
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c (renamed from src/backenddb/merchant_db.c)56
3 files changed, 177 insertions, 58 deletions
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 8139e9c8..02656185 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -1,17 +1,38 @@
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
+plugindir = $(libdir)/taler
+
+if HAVE_POSTGRESQL
+if HAVE_TALERPQ
+plugin_LTLIBRARIES = \
+ libtaler_plugin_merchantdb_postgres.la
+endif
+endif
+
lib_LTLIBRARIES = \
libtalermerchantdb.la
libtalermerchantdb_la_SOURCES = \
- merchant_db.c
+ merchantdb_plugin.c
libtalermerchantdb_la_LIBADD = \
$(LIBGCRYPT_LIBS) \
-ltalerutil \
- -lgnunetutil \
+ -lgnunetutil
+
+libtalermerchantdb_la_LDFLAGS = \
+ $(POSTGRESQL_LDFLAGS) \
+ -version-info 0:0:0 \
+ -no-undefined
+
+libtaler_plugin_merchantdb_postgres_la_SOURCES = \
+ plugin_merchantdb_postgres.c
+libtaler_plugin_merchantdb_postgres_la_LIBADD = \
+ $(LTLIBINTL)
+libtaler_plugin_merchantdb_postgres_la_LDFLAGS = \
+ $(TALER_PLUGIN_LDFLAGS) \
-ltalerpq \
- -lgnunetpostgres \
+ -ltalerutil \
-lpq \
- -lpthread
+ -lgnunetutil $(XLIB)
diff --git a/src/backenddb/merchantdb_plugin.c b/src/backenddb/merchantdb_plugin.c
new file mode 100644
index 00000000..62a1a193
--- /dev/null
+++ b/src/backenddb/merchantdb_plugin.c
@@ -0,0 +1,150 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2015 Christian Grothoff (and other contributing authors)
+
+ 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, If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file merchantdb/merchantdb_plugin.c
+ * @brief Logic to load database plugin
+ * @author Christian Grothoff
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ */
+#include "platform.h"
+#include <taler/taler_util.h>
+#include "taler_merchantdb_plugin.h"
+#include <ltdl.h>
+
+
+/**
+ * Initialize the plugin.
+ *
+ * @param cfg configuration to use
+ * @return #GNUNET_OK on success
+ */
+struct TALER_MERCHANTDB_Plugin *
+TALER_MERCHANTDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ char *plugin_name;
+ char *lib_name;
+ struct GNUNET_CONFIGURATION_Handle *cfg_dup;
+ struct TALER_MERCHANTDB_Plugin *plugin;
+
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "merchant",
+ "db",
+ &plugin_name))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "merchant",
+ "db");
+ return NULL;
+ }
+ (void) GNUNET_asprintf (&lib_name,
+ "libtaler_plugin_merchantdb_%s",
+ plugin_name);
+ GNUNET_free (plugin_name);
+ cfg_dup = GNUNET_CONFIGURATION_dup (cfg);
+ plugin = GNUNET_PLUGIN_load (lib_name, cfg_dup);
+ if (NULL != plugin)
+ plugin->library_name = lib_name;
+ else
+ GNUNET_free (lib_name);
+ GNUNET_CONFIGURATION_destroy (cfg_dup);
+ return plugin;
+}
+
+
+/**
+ * Shutdown the plugin.
+ *
+ * @param plugin the plugin to unload
+ */
+void
+TALER_MERCHANTDB_plugin_unload (struct TALER_MERCHANTDB_Plugin *plugin)
+{
+ char *lib_name;
+
+ if (NULL == plugin)
+ return;
+ lib_name = plugin->library_name;
+ GNUNET_assert (NULL == GNUNET_PLUGIN_unload (lib_name,
+ plugin));
+ GNUNET_free (lib_name);
+}
+
+
+/**
+ * Libtool search path before we started.
+ */
+static char *old_dlsearchpath;
+
+
+/**
+ * Setup libtool paths.
+ */
+void __attribute__ ((constructor))
+plugin_init ()
+{
+ int err;
+ const char *opath;
+ char *path;
+ char *cpath;
+
+ err = lt_dlinit ();
+ if (err > 0)
+ {
+ FPRINTF (stderr,
+ _("Initialization of plugin mechanism failed: %s!\n"),
+ lt_dlerror ());
+ return;
+ }
+ opath = lt_dlgetsearchpath ();
+ if (NULL != opath)
+ old_dlsearchpath = GNUNET_strdup (opath);
+ path = TALER_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
+ if (NULL != path)
+ {
+ if (NULL != opath)
+ {
+ GNUNET_asprintf (&cpath, "%s:%s", opath, path);
+ lt_dlsetsearchpath (cpath);
+ GNUNET_free (path);
+ GNUNET_free (cpath);
+ }
+ else
+ {
+ lt_dlsetsearchpath (path);
+ GNUNET_free (path);
+ }
+ }
+}
+
+
+/**
+ * Shutdown libtool.
+ */
+void __attribute__ ((destructor))
+plugin_fini ()
+{
+ lt_dlsetsearchpath (old_dlsearchpath);
+ if (NULL != old_dlsearchpath)
+ {
+ GNUNET_free (old_dlsearchpath);
+ old_dlsearchpath = NULL;
+ }
+ lt_dlexit ();
+}
+
+
+/* end of merchantdb_plugin.c */
diff --git a/src/backenddb/merchant_db.c b/src/backenddb/plugin_merchantdb_postgres.c
index d8bef636..02e6884b 100644
--- a/src/backenddb/merchant_db.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -21,9 +21,10 @@
*/
#include "platform.h"
#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_postgres_lib.h>
#include <taler/taler_util.h>
#include <taler/taler_pq_lib.h>
-#include "taler_merchantdb_lib.h"
+#include "taler_merchantdb_plugin.h"
/**
* Shorthand for exit jumps.
@@ -616,56 +617,3 @@ TALER_MERCHANTDB_contract_get_values (PGconn *conn,
PQclear (res);
return GNUNET_SYSERR;
}
-
-
-/**
- * Get a set of values representing a contract. This function is meant
- * to obsolete the '_get_contract_values' version.
- *
- * @param h_contract the hashcode of this contract
- * @param contract_handle where to store the results
- * @raturn GNUNET_OK in case of success, GNUNET_SYSERR
- * upon errors
- */
-uint32_t
-TALER_MERCHANTDB_contract_get_handle (PGconn *conn,
- const struct GNUNET_HashCode *h_contract,
- struct TALER_MERCHANTDB_ContractHandle *contract_handle)
-{
- struct TALER_MERCHANTDB_ContractHandle ch;
- PGresult *res;
- ExecStatusType status;
-
- struct TALER_PQ_QueryParam params[] = {
- TALER_PQ_query_param_fixed_size (h_contract, sizeof (struct GNUNET_HashCode)),
- TALER_PQ_query_param_end
- };
-
- struct TALER_PQ_ResultSpec rs[] = {
- TALER_PQ_result_spec_uint64 ("nounce", &ch.nounce),
- TALER_PQ_result_spec_absolute_time ("edate", &ch.edate),
- TALER_PQ_result_spec_absolute_time ("timestamp", &ch.timestamp),
- TALER_PQ_result_spec_absolute_time ("refund_deadline", &ch.refund_deadline),
- TALER_PQ_result_spec_uint64 ("contract_id", &ch.contract_id),
- TALER_PQ_result_spec_end
- };
-
- res = TALER_PQ_exec_prepared (conn, "get_contract_set", params);
- status = PQresultStatus (res);
- EXITIF (PGRES_TUPLES_OK != status);
- if (0 == PQntuples (res))
- {
- TALER_LOG_DEBUG ("Contract not found");
- goto EXITIF_exit;
- }
-
- EXITIF (1 != PQntuples (res));
- EXITIF (GNUNET_YES != TALER_PQ_extract_result (res, rs, 0));
- *contract_handle = ch;
- PQclear (res);
- return GNUNET_OK;
-
- EXITIF_exit:
- PQclear (res);
- return GNUNET_SYSERR;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 15:47:33 +0000