[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37463 - in gnunet/src: my psycstore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37463 - in gnunet/src: my psycstore |
|
Date: |
Wed, 6 Jul 2016 12:21:57 +0200 |
Author: christophe.genevey
Date: 2016-07-06 12:21:57 +0200 (Wed, 06 Jul 2016)
New Revision: 37463
Modified:
gnunet/src/my/test_my.c
gnunet/src/psycstore/Makefile.am
gnunet/src/psycstore/plugin_psycstore_mysql.c
Log:
fix leak memory
Modified: gnunet/src/my/test_my.c
===================================================================
--- gnunet/src/my/test_my.c 2016-07-06 09:54:28 UTC (rev 37462)
+++ gnunet/src/my/test_my.c 2016-07-06 10:21:57 UTC (rev 37463)
@@ -103,7 +103,10 @@
if (NULL == statements_handle_insert)
{
fprintf (stderr, "Failed to prepared statement INSERT\n");
- return 1;
+ GNUNET_CRYPTO_rsa_signature_free (sig);
+ GNUNET_CRYPTO_rsa_private_key_free (priv);
+ GNUNET_CRYPTO_rsa_public_key_free (pub);
+ return 1;
}
struct GNUNET_MY_QueryParam params_insert[] = {
@@ -126,6 +129,9 @@
params_insert))
{
fprintf (stderr, "Failed to execute prepared statement INSERT\n");
+ GNUNET_CRYPTO_rsa_signature_free (sig);
+ GNUNET_CRYPTO_rsa_private_key_free (priv);
+ GNUNET_CRYPTO_rsa_public_key_free (pub);
return 1;
}
@@ -147,6 +153,9 @@
if (NULL == statements_handle_select)
{
fprintf(stderr, "Failed to prepared statement SELECT\n");
+ GNUNET_CRYPTO_rsa_signature_free (sig);
+ GNUNET_CRYPTO_rsa_private_key_free (priv);
+ GNUNET_CRYPTO_rsa_public_key_free (pub);
return 1;
}
@@ -159,6 +168,9 @@
params_select))
{
fprintf (stderr, "Failed to execute prepared statement SELECT\n");
+ GNUNET_CRYPTO_rsa_signature_free (sig);
+ GNUNET_CRYPTO_rsa_private_key_free (priv);
+ GNUNET_CRYPTO_rsa_public_key_free (pub);
return 1;
}
Modified: gnunet/src/psycstore/Makefile.am
===================================================================
--- gnunet/src/psycstore/Makefile.am 2016-07-06 09:54:28 UTC (rev 37462)
+++ gnunet/src/psycstore/Makefile.am 2016-07-06 10:21:57 UTC (rev 37463)
@@ -56,9 +56,12 @@
$(SQLITE_PLUGIN)
libgnunet_plugin_psycstore_sqlite_la_SOURCES = \
- plugin_psycstore_sqlite.c
+ plugin_psycstore_sqlite.c \
+ plugin_psycstore_mysql.c
libgnunet_plugin_psycstore_sqlite_la_LIBADD = \
libgnunetpsycstore.la \
+ $(top_builddir)/src/my/libgnunetmy.la \
+ $(top_builddir)/src/mysql/libgnunetmysql.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
$(LTLIBINTL)
@@ -95,3 +98,4 @@
test_plugin_psycstore_sqlite_LDADD = \
$(top_builddir)/src/testing/libgnunettesting.la \
$(top_builddir)/src/util/libgnunetutil.la
+
Modified: gnunet/src/psycstore/plugin_psycstore_mysql.c
===================================================================
--- gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-07-06 09:54:28 UTC
(rev 37462)
+++ gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-07-06 10:21:57 UTC
(rev 37463)
@@ -38,7 +38,11 @@
#include "gnunet_crypto_lib.h"
#include "gnunet_psyc_util_lib.h"
#include "psycstore.h"
+#include "gnunet_my_lib.h"
+#include "gnunet_mysql_lib.h"
+
#include <sqlite3.h>
+#include <mysql/mysql.h>
/**
* After how many ms "busy" should a DB operation fail for good? A
@@ -59,11 +63,9 @@
* a failure of the command 'cmd' on file 'filename'
* with the message given by strerror(errno).
*/
-#define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from (level,
"psycstore-sqlite", _("`%s' failed at %s:%d with error: %s (%d)\n"), cmd,
__FILE__, __LINE__, sqlite3_errmsg(db->dbh), sqlite3_errcode(db->dbh)); }
while(0)
-
#define LOG_MYSQL(db, level, cmd, stmt) do { GNUNET_log_from (level,
"psycstore-mysql", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__,
__LINE__, mysql_stmt_error (stmt)); } while(0)
-#define LOG(kind,...) GNUNET_log_from (kind, "psycstore-sqlite", __VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "psycstore-mysql", __VA_ARGS__)
enum Transactions {
TRANSACTION_NONE = 0,
@@ -94,137 +96,137 @@
*/
enum Transactions transaction;
- GNUNET_MYSQL_StatementHandle *transaction_begin;
+ struct GNUNET_MYSQL_StatementHandle *transaction_begin;
- GNUNET_MYSQL_StatementHandle *transaction_commit;
+ struct GNUNET_MYSQL_StatementHandle *transaction_commit;
- GNUNET_MYSQL_StatementHandle *transaction_rollback;
+ struct GNUNET_MYSQL_StatementHandle *transaction_rollback;
/**
* Precompiled SQL for channel_key_store()
*/
- GNUNET_MYSQL_StatementHandle *insert_channel_key;
+ struct GNUNET_MYSQL_StatementHandle *insert_channel_key;
/**
* Precompiled SQL for slave_key_store()
*/
- GNUNET_MYSQL_StatementHandle *insert_slave_key;
+ struct GNUNET_MYSQL_StatementHandle *insert_slave_key;
/**
* Precompiled SQL for membership_store()
*/
- GNUNET_MYSQL_StatementHandle *insert_membership;
+ struct GNUNET_MYSQL_StatementHandle *insert_membership;
/**
* Precompiled SQL for membership_test()
*/
- GNUNET_MYSQL_StatementHandle *select_membership;
+ struct GNUNET_MYSQL_StatementHandle *select_membership;
/**
* Precompiled SQL for fragment_store()
*/
- GNUNET_MYSQL_StatementHandle *insert_fragment;
+ struct GNUNET_MYSQL_StatementHandle *insert_fragment;
/**
* Precompiled SQL for message_add_flags()
*/
- GNUNET_MYSQL_StatementHandle *update_message_flags;
+ struct GNUNET_MYSQL_StatementHandle *update_message_flags;
/**
* Precompiled SQL for fragment_get()
*/
- GNUNET_MYSQL_StatementHandle *select_fragments;
+ struct GNUNET_MYSQL_StatementHandle *select_fragments;
/**
* Precompiled SQL for fragment_get()
*/
- GNUNET_MYSQL_StatementHandle *select_latest_fragments;
+ struct GNUNET_MYSQL_StatementHandle *select_latest_fragments;
/**
* Precompiled SQL for message_get()
*/
- GNUNET_MYSQL_StatementHandle *select_messages;
+ struct GNUNET_MYSQL_StatementHandle *select_messages;
/**
* Precompiled SQL for message_get()
*/
- GNUNET_MYSQL_StatementHandle *select_latest_messages;
+ struct GNUNET_MYSQL_StatementHandle *select_latest_messages;
/**
* Precompiled SQL for message_get_fragment()
*/
- GNUNET_MYSQL_StatementHandle *select_message_fragment;
+ struct GNUNET_MYSQL_StatementHandle *select_message_fragment;
/**
* Precompiled SQL for counters_get_message()
*/
- GNUNET_MYSQL_StatementHandle *select_counters_message;
+ struct GNUNET_MYSQL_StatementHandle *select_counters_message;
/**
* Precompiled SQL for counters_get_state()
*/
- GNUNET_MYSQL_StatementHandle *select_counters_state;
+ struct GNUNET_MYSQL_StatementHandle *select_counters_state;
/**
* Precompiled SQL for state_modify_end()
*/
- GNUNET_MYSQL_StatementHandle *update_state_hash_message_id;
+ struct GNUNET_MYSQL_StatementHandle *update_state_hash_message_id;
/**
* Precompiled SQL for state_sync_end()
*/
- GNUNET_MYSQL_StatementHandle *update_max_state_message_id;
+ struct GNUNET_MYSQL_StatementHandle *update_max_state_message_id;
/**
* Precompiled SQL for state_modify_op()
*/
- GNUNET_MYSQL_StatementHandle *insert_state_current;
+ struct GNUNET_MYSQL_StatementHandle *insert_state_current;
/**
* Precompiled SQL for state_modify_end()
*/
- GNUNET_MYSQL_StatementHandle *delete_state_empty;
+ struct GNUNET_MYSQL_StatementHandle *delete_state_empty;
/**
* Precompiled SQL for state_set_signed()
*/
- GNUNET_MYSQL_StatementHandle *update_state_signed;
+ struct GNUNET_MYSQL_StatementHandle *update_state_signed;
/**
* Precompiled SQL for state_sync()
*/
- GNUNET_MYSQL_StatementHandle *insert_state_sync;
+ struct GNUNET_MYSQL_StatementHandle *insert_state_sync;
/**
* Precompiled SQL for state_sync()
*/
- GNUNET_MYSQL_StatementHandle *delete_state;
+ struct GNUNET_MYSQL_StatementHandle *delete_state;
/**
* Precompiled SQL for state_sync()
*/
- GNUNET_MYSQL_StatementHandle *insert_state_from_sync;
+ struct GNUNET_MYSQL_StatementHandle *insert_state_from_sync;
/**
* Precompiled SQL for state_sync()
*/
- GNUNET_MYSQL_StatementHandle *delete_state_sync;
+ struct GNUNET_MYSQL_StatementHandle *delete_state_sync;
/**
* Precompiled SQL for state_get_signed()
*/
- GNUNET_MYSQL_StatementHandle *select_state_signed;
+ struct GNUNET_MYSQL_StatementHandle *select_state_signed;
/**
* Precompiled SQL for state_get()
*/
- GNUNET_MYSQL_StatementHandle *select_state_one;
+ struct GNUNET_MYSQL_StatementHandle *select_state_one;
/**
* Precompiled SQL for state_get_prefix()
*/
- GNUNET_MYSQL_StatementHandle *select_state_prefix;
+ struct GNUNET_MYSQL_StatementHandle *select_state_prefix;
};
@@ -275,7 +277,7 @@
*/
static int
mysql_exec (struct GNUNET_MYSQL_Context *mc,
- struct GNUNET_MYSQL_Statement *sh,
+ struct GNUNET_MYSQL_StatementHandle *sh,
struct GNUNET_MY_QueryParam *qp)
{
int result;
@@ -282,11 +284,11 @@
result = GNUNET_MY_exec_prepared (mc, sh, qp);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Executed `%s' / %d\n", sql, result);
+ "Executed `GNUNET_MY_exec_prepared`' / %d\n", result);
if (GNUNET_OK != result)
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Error executing SQL query: %s\n %s\n"),
- mysql_stmt_error (GNUNET_MYSQL_statement_get_stmt (sh)), sql);
+ _("Error executing SQL query: %s\n"),
+ mysql_stmt_error (GNUNET_MYSQL_statement_get_stmt (sh)));
return result;
}
@@ -639,6 +641,9 @@
{
int result;
sqlite3_stmt *stmt;
+
+ //MYSQL_STMT *stmt;
+
while (NULL != (stmt = sqlite3_next_stmt (plugin->dbh, NULL)))
{
result = sqlite3_finalize (stmt);
@@ -683,7 +688,7 @@
if(GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc,
stmt,
- results)
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql exec_channel", stmt);
@@ -706,7 +711,7 @@
static int
transaction_begin (struct Plugin *plugin, enum Transactions transaction)
{
- GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin;
MYSQL_STMT * statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -722,9 +727,9 @@
GNUNET_MY_query_param_end
};
- if (GNUNET_OK != GNUNET_MY_extract_result (plugin->mc,
+ if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc,
stmt,
- results))
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", statement);
@@ -749,7 +754,7 @@
static int
transaction_commit (struct Plugin *plugin)
{
- GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -767,7 +772,7 @@
if (GNUNET_OK != GNUNET_MY_exec_prepared( plugin->mc,
stmt,
- results))
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", statement);
@@ -774,7 +779,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -792,7 +797,7 @@
static int
transaction_rollback (struct Plugin *plugin)
{
- GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback;
MYSQL_STMT* statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -809,7 +814,7 @@
if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc,
stmt,
- results))
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", statement);
@@ -816,7 +821,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -832,7 +837,7 @@
channel_key_store (struct Plugin *plugin,
const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key)
{
- GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_channel_key;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_channel_key;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -851,7 +856,7 @@
if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc,
stmt,
- results))
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", statement);
@@ -858,6 +863,13 @@
return GNUNET_SYSERR;
}
+ if (0 != mysql_stmt_reset (statement))
+ {
+ LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql_stmt_reset", statement);
+ return GNUNET_SYSERR;
+ }
+
return GNUNET_OK;
}
@@ -866,7 +878,7 @@
slave_key_store (struct Plugin *plugin,
const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key)
{
- GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_slave_key;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_slave_key;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -885,7 +897,7 @@
if (GNUNET_OK != GNUNET_MY_exec_prepared( plugin->mc,
stmt,
- results))
+ params))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql extract_result", statement);
@@ -892,7 +904,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -921,7 +933,6 @@
uint64_t group_generation)
{
struct Plugin *plugin = cls;
-// sqlite3_stmt *stmt = plugin->insert_membership;
uint32_t idid_join = (uint32_t)did_join;
uint64_t iannounced_at = (uint64_t)announced_at;
@@ -928,8 +939,10 @@
uint64_t ieffective_since = (uint64_t)effective_since;
uint64_t igroup_generation = (uint64_t)group_generation;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_membership;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_membership;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
@@ -964,7 +977,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -988,8 +1001,8 @@
uint64_t message_id)
{
struct Plugin *plugin = cls;
- //sqlite3_stmt *stmt = plugin->select_membership;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_membership;
+
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_membership;
MYSQL_STMT *statement = NULL;
uint32_t did_join = 0;
@@ -1043,7 +1056,7 @@
ret = GNUNET_NO;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1068,8 +1081,10 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_fragment;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_fragment;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
@@ -1094,16 +1109,16 @@
struct GNUNET_MY_QueryParam params_insert[] = {
GNUNET_MY_query_param_auto_from_type (channel_key),
- GNUNET_MY_query_param_uint64 (&msg->hop_counter),
- GNUNET_MY_query_param_auto_from_type (msg->signature),
- GNUNET_MY_query_param_auto_from_type (msg->purpose),
+ GNUNET_MY_query_param_uint32 (msg->hop_counter),
+ GNUNET_MY_query_param_auto_from_type (&msg->signature),
+ GNUNET_MY_query_param_auto_from_type (&msg->purpose),
GNUNET_MY_query_param_uint64 (&fragment_id),
GNUNET_MY_query_param_uint64 (&fragment_offset),
GNUNET_MY_query_param_uint64 (&message_id),
GNUNET_MY_query_param_uint64 (&group_generation),
- GNUNET_MY_query_param_uint64 (&msg->flags),
- GNUNET_MY_query_param_uint64 (&psycstore_flags),
- GNUNET_MY_query_param_auto_from_type (msg[1]),
+ GNUNET_MY_query_param_uint32 ( msg->flags),
+ GNUNET_MY_query_param_uint32 (&psycstore_flags),
+ GNUNET_MY_query_param_auto_from_type (&msg[1]),
GNUNET_MY_query_param_end
};
@@ -1116,7 +1131,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1141,7 +1156,7 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -1164,7 +1179,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1254,8 +1269,17 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+ if (NULL == statement)
+ {
+ LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql get_stmt", statement);
+ return GNUNET_SYSERR;
+ }
+
int ret = GNUNET_SYSERR;
*returned_fragments = 0;
@@ -1268,7 +1292,7 @@
ret = fragment_select (plugin, stmt, returned_fragments, cb, cb_cls);
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1296,8 +1320,11 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_fragments;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_fragments;
+ MYSQL_STMT * statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+
int ret = GNUNET_SYSERR;
*returned_fragments = 0;
@@ -1309,7 +1336,7 @@
ret = fragment_select (plugin, stmt, returned_fragments, cb, cb_cls);
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1338,13 +1365,16 @@
void *cb_cls)
{
struct Plugin *plugin = cls;
-// sqlite3_stmt *stmt = plugin->select_messages;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_messages;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_messages;
+ MYSQL_STMT *statement = NULL;
+
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+
int ret = GNUNET_SYSERR;
*returned_fragments = 0;
- struct GNUNET_MY_QueryParams params_select[] = {
+ struct GNUNET_MY_QueryParam params_select[] = {
GNUNET_MY_query_param_auto_from_type (channel_key),
GNUNET_MY_query_param_uint64 (&first_message_id),
GNUNET_MY_query_param_uint64 (&last_message_id),
@@ -1354,7 +1384,7 @@
ret = fragment_select (plugin, stmt, returned_fragments, cb, cb_cls);
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1382,8 +1412,11 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_messages;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_messages;
+ MYSQL_STMT *statement;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+
int ret = GNUNET_SYSERR;
*returned_fragments = 0;
@@ -1396,7 +1429,7 @@
ret = fragment_select (plugin, stmt, returned_fragments, cb, cb_cls);
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1425,8 +1458,11 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+
int ret = GNUNET_SYSERR;
struct GNUNET_MY_QueryParam params_select[] = {
@@ -1447,7 +1483,7 @@
ret = fragment_row (stmt, cb, cb_cls);
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1472,7 +1508,8 @@
uint64_t *max_group_generation)
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_message;
+
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_message;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -1516,7 +1553,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1540,7 +1577,7 @@
{
struct Plugin *plugin = cls;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_state;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_state;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -1582,7 +1619,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1599,7 +1636,7 @@
* @return #GNUNET_OK on success, else #GNUNET_SYSERR
*/
static int
-state_assign (struct Plugin *plugin, GNUNET_MYSQL_StatementHandle *stmt,
+state_assign (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt,
const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
const char *name, const void *value, size_t value_size)
{
@@ -1633,7 +1670,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1645,7 +1682,7 @@
static int
-update_message_id (struct Plugin *plugin, GNUNET_MYSQL_StatementHandle *stmt,
+update_message_id (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle
*stmt,
const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
uint64_t message_id)
{
@@ -1661,7 +1698,7 @@
struct GNUNET_MY_QueryParam params[] = {
GNUNET_MY_query_param_uint64 (&message_id),
- GNUNET_MY_query_param_auto_from_type (channel_id),
+ GNUNET_MY_query_param_auto_from_type (channel_key),
GNUNET_MY_query_param_end
};
@@ -1674,7 +1711,7 @@
return GNUNET_SYSERR;
}
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1892,8 +1929,11 @@
struct Plugin *plugin = cls;
int ret = GNUNET_SYSERR;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_one;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_one;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+
struct GNUNET_MY_QueryParam params_select[] = {
GNUNET_MY_query_param_auto_from_type (channel_key),
GNUNET_MY_query_param_string (name),
@@ -1910,7 +1950,7 @@
ret = cb (cb_cls, name, sqlite3_column_blob (stmt, 0),
sqlite3_column_bytes (stmt, 0));
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -1936,7 +1976,7 @@
struct Plugin *plugin = cls;
int ret = GNUNET_SYSERR;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_prefix;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_prefix;
MYSQL_STMT *statement = NULL;
statement = GNUNET_MYSQL_statement_get_stmt (stmt);
@@ -1974,7 +2014,7 @@
sqlite3_column_blob (stmt, 1),
sqlite3_column_bytes (stmt, 1));
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
@@ -2000,9 +2040,17 @@
struct Plugin *plugin = cls;
int ret = GNUNET_SYSERR;
- //sqlite3_stmt *stmt = plugin->select_state_signed;
- GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_signed;
+ struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_signed;
+ MYSQL_STMT *statement = NULL;
+ statement = GNUNET_MYSQL_statement_get_stmt (stmt);
+ if (NULL == statement)
+ {
+ LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "mysql get_stmt", statement);
+ return GNUNET_SYSERR;
+ }
+
struct GNUNET_MY_QueryParam params_select[] = {
GNUNET_MY_query_param_auto_from_type (channel_key),
GNUNET_MY_query_param_end
@@ -2025,7 +2073,7 @@
sqlite3_column_blob (stmt, 1),
sqlite3_column_bytes (stmt, 1));
- if (0 != mysql_stmt_reset (stmt))
+ if (0 != mysql_stmt_reset (statement))
{
LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql_stmt_reset", statement);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37463 - in gnunet/src: my psycstore,
gnunet <=