X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fplugin_namestore_sqlite.c;h=836aa4d37d3c66ec51ca6f9f5863b91a243889d3;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=6551dd4a2878953f657ab700d5bed2a511cd630a;hpb=a35c5a11d32bdd0bc24f64de36fbc6b0d0b20aae;p=oweals%2Fgnunet.git diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 6551dd4a2..836aa4d37 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -1,6 +1,6 @@ /* * This file is part of GNUnet - * (C) 2009-2013 Christian Grothoff (and other contributing authors) + * Copyright (C) 2009-2013 Christian Grothoff (and other contributing authors) * * GNUnet is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /** @@ -27,6 +27,7 @@ #include "platform.h" #include "gnunet_namestore_plugin.h" #include "gnunet_namestore_service.h" +#include "gnunet_gnsrecord_lib.h" #include "namestore.h" #include @@ -71,21 +72,6 @@ struct Plugin */ sqlite3 *dbh; - /** - * Precompiled SQL for caching a block - */ - sqlite3_stmt *cache_block; - - /** - * Precompiled SQL for looking up a block - */ - sqlite3_stmt *lookup_block; - - /** - * Precompiled SQL for removing expired blocks - */ - sqlite3_stmt *expire_blocks; - /** * Precompiled SQL to store records. */ @@ -111,6 +97,10 @@ struct Plugin */ sqlite3_stmt *zone_to_name; + /** + * Precompiled SQL to lookup records based on label. + */ + sqlite3_stmt *lookup_label; }; @@ -131,7 +121,7 @@ sq_prepare (sqlite3 * dbh, const char *zSql, sqlite3_stmt ** ppStmt) result = sqlite3_prepare_v2 (dbh, zSql, strlen (zSql), ppStmt, (const char **) &dummy); - LOG (GNUNET_ERROR_TYPE_DEBUG, + LOG (GNUNET_ERROR_TYPE_DEBUG, "Prepared `%s' / %p: %d\n", zSql, *ppStmt, result); return result; } @@ -147,21 +137,15 @@ create_indices (sqlite3 * dbh) { /* create indices */ if ( (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_query_hash ON ns096blocks (query,expiration_time)", - NULL, NULL, NULL)) || - (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_block_expiration ON ns096blocks (expiration_time)", - NULL, NULL, NULL)) || - (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON ns096records (zone_private_key,pkey_hash)", + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_reverse ON ns097records (zone_private_key,pkey)", NULL, NULL, NULL)) || (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON ns096records (zone_private_key,rvalue)", + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_pkey_iter ON ns097records (zone_private_key,rvalue)", NULL, NULL, NULL)) || (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns096records (rvalue)", + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns097records (rvalue)", NULL, NULL, NULL)) ) - LOG (GNUNET_ERROR_TYPE_ERROR, + LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); } @@ -172,7 +156,7 @@ create_indices (sqlite3 * dbh) #else #define ENULL &e #define ENULL_DEFINED 1 -#define CHECK(a) if (! a) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s\n", e); sqlite3_free(e); } +#define CHECK(a) if (! (a)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "%s\n", e); sqlite3_free(e); } #endif @@ -239,9 +223,6 @@ database_setup (struct Plugin *plugin) CHECK (SQLITE_OK == sqlite3_exec (plugin->dbh, "PRAGMA locking_mode=EXCLUSIVE", NULL, NULL, ENULL)); - CHECK (SQLITE_OK == - sqlite3_exec (plugin->dbh, "PRAGMA count_changes=OFF", NULL, NULL, - ENULL)); CHECK (SQLITE_OK == sqlite3_exec (plugin->dbh, "PRAGMA page_size=4092", NULL, NULL, ENULL)); @@ -249,42 +230,22 @@ database_setup (struct Plugin *plugin) CHECK (SQLITE_OK == sqlite3_busy_timeout (plugin->dbh, BUSY_TIMEOUT_MS)); - /* Create tables */ - CHECK (SQLITE_OK == - sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns096blocks'", - &stmt)); - if ((sqlite3_step (stmt) == SQLITE_DONE) && - (sqlite3_exec - (plugin->dbh, - "CREATE TABLE ns096blocks (" - " query BLOB NOT NULL DEFAULT ''," - " block BLOB NOT NULL DEFAULT ''," - " expiration_time INT8 NOT NULL DEFAULT 0" - ")", - NULL, NULL, NULL) != SQLITE_OK)) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); - sqlite3_finalize (stmt); - return GNUNET_SYSERR; - } - sqlite3_finalize (stmt); - + /* Create table */ CHECK (SQLITE_OK == sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns096records'", + "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns097records'", &stmt)); if ((sqlite3_step (stmt) == SQLITE_DONE) && (sqlite3_exec (plugin->dbh, - "CREATE TABLE ns096records (" - " zone_private_key BLOB NOT NULL DEFAULT ''," - " pkey_hash BLOB," + "CREATE TABLE ns097records (" + " zone_private_key BLOB NOT NULL DEFAULT ''," + " pkey BLOB," " rvalue INT8 NOT NULL DEFAULT ''," " record_count INT NOT NULL DEFAULT 0," " record_data BLOB NOT NULL DEFAULT ''," - " label TEXT NOT NULL DEFAULT ''" - ")", + " label TEXT NOT NULL DEFAULT ''" + ")", NULL, NULL, NULL) != SQLITE_OK)) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); @@ -297,40 +258,33 @@ database_setup (struct Plugin *plugin) if ((sq_prepare (plugin->dbh, - "INSERT INTO ns096blocks (query,block,expiration_time) VALUES (?, ?, ?)", - &plugin->cache_block) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "DELETE FROM ns096blocks WHERE expiration_timeexpire_blocks) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "SELECT block FROM ns096blocks WHERE query=? ORDER BY expiration_time DESC LIMIT 1", - &plugin->lookup_block) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "INSERT INTO ns096records (zone_private_key, pkey_hash, rvalue, record_count, record_data, label)" + "INSERT INTO ns097records (zone_private_key, pkey, rvalue, record_count, record_data, label)" " VALUES (?, ?, ?, ?, ?, ?)", &plugin->store_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "DELETE FROM ns096records WHERE zone_private_key=? AND label=?", + "DELETE FROM ns097records WHERE zone_private_key=? AND label=?", &plugin->delete_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, "SELECT record_count,record_data,label" - " FROM ns096records WHERE zone_private_key=? AND pkey_hash=?", + " FROM ns097records WHERE zone_private_key=? AND pkey=?", &plugin->zone_to_name) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT record_count,record_data,label" - " FROM ns096records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 OFFSET ?", + "SELECT record_count,record_data,label" + " FROM ns097records WHERE zone_private_key=? ORDER BY rvalue LIMIT 1 OFFSET ?", &plugin->iterate_zone) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT record_count,record_data,label,zone_private_key" - " FROM ns096records ORDER BY rvalue LIMIT 1 OFFSET ?", - &plugin->iterate_all_zones) != SQLITE_OK) + "SELECT record_count,record_data,label,zone_private_key" + " FROM ns097records ORDER BY rvalue LIMIT 1 OFFSET ?", + &plugin->iterate_all_zones) != SQLITE_OK) || + (sq_prepare + (plugin->dbh, + "SELECT record_count,record_data,label,zone_private_key" + " FROM ns097records WHERE zone_private_key=? AND label=?", + &plugin->lookup_label) != SQLITE_OK) ) { LOG_SQLITE (plugin,GNUNET_ERROR_TYPE_ERROR, "precompiling"); @@ -351,12 +305,6 @@ database_shutdown (struct Plugin *plugin) int result; sqlite3_stmt *stmt; - if (NULL != plugin->cache_block) - sqlite3_finalize (plugin->cache_block); - if (NULL != plugin->lookup_block) - sqlite3_finalize (plugin->lookup_block); - if (NULL != plugin->expire_blocks) - sqlite3_finalize (plugin->expire_blocks); if (NULL != plugin->store_records) sqlite3_finalize (plugin->store_records); if (NULL != plugin->delete_records) @@ -367,6 +315,8 @@ database_shutdown (struct Plugin *plugin) sqlite3_finalize (plugin->iterate_all_zones); if (NULL != plugin->zone_to_name) sqlite3_finalize (plugin->zone_to_name); + if (NULL != plugin->zone_to_name) + sqlite3_finalize (plugin->lookup_label); result = sqlite3_close (plugin->dbh); if (result == SQLITE_BUSY) { @@ -392,184 +342,6 @@ database_shutdown (struct Plugin *plugin) } -/** - * Removes any expired block. - * - * @param plugin the plugin - */ -static void -namestore_sqlite_expire_blocks (struct Plugin *plugin) -{ - struct GNUNET_TIME_Absolute now; - int n; - - now = GNUNET_TIME_absolute_get (); - if (SQLITE_OK != sqlite3_bind_int64 (plugin->expire_blocks, - 1, now.abs_value_us)) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->expire_blocks)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return; - } - n = sqlite3_step (plugin->expire_blocks); - if (SQLITE_OK != sqlite3_reset (plugin->expire_blocks)) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - switch (n) - { - case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Records expired\n"); - return; - case SQLITE_BUSY: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return; - default: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return; - } -} - - -/** - * Cache a block in the datastore. - * - * @param cls closure (internal context for the plugin) - * @param block block to cache - * @return GNUNET_OK on success, else GNUNET_SYSERR - */ -static int -namestore_sqlite_cache_block (void *cls, - const struct GNUNET_NAMESTORE_Block *block) -{ - struct Plugin *plugin = cls; - struct GNUNET_HashCode query; - struct GNUNET_TIME_Absolute expiration; - size_t block_size; - int n; - - namestore_sqlite_expire_blocks (plugin); - GNUNET_CRYPTO_hash (&block->derived_key, - sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), - &query); - expiration = GNUNET_TIME_absolute_ntoh (block->expiration_time); - block_size = ntohl (block->purpose.size) + - sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + - sizeof (struct GNUNET_CRYPTO_EccSignature); - if (block_size > 64 * 65536) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - if ((SQLITE_OK != sqlite3_bind_blob (plugin->cache_block, 1, &query, sizeof (struct GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->cache_block, 2, block, block_size, SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->cache_block, 3, expiration.abs_value_us))) - { - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->cache_block)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - - } - n = sqlite3_step (plugin->cache_block); - if (SQLITE_OK != sqlite3_reset (plugin->cache_block)) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - switch (n) - { - case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record stored\n"); - return GNUNET_OK; - case SQLITE_BUSY: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return GNUNET_NO; - default: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return GNUNET_SYSERR; - } -} - - -/** - * Get the block for a particular zone and label in the - * datastore. Will return at most one result to the iterator. - * - * @param cls closure (internal context for the plugin) - * @param query hash of public key derived from the zone and the label - * @param iter function to call with the result - * @param iter_cls closure for iter - * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error - */ -static int -namestore_sqlite_lookup_block (void *cls, - const struct GNUNET_HashCode *query, - GNUNET_NAMESTORE_BlockCallback iter, void *iter_cls) -{ - struct Plugin *plugin = cls; - int ret; - int sret; - size_t block_size; - const struct GNUNET_NAMESTORE_Block *block; - - if (SQLITE_OK != sqlite3_bind_blob (plugin->lookup_block, 1, - query, sizeof (struct GNUNET_HashCode), - SQLITE_STATIC)) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->lookup_block)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - } - - ret = GNUNET_NO; - if (SQLITE_ROW == (sret = sqlite3_step (plugin->lookup_block))) - { - block = sqlite3_column_blob (plugin->lookup_block, 0); - block_size = sqlite3_column_bytes (plugin->lookup_block, 0); - if ( (block_size < sizeof (struct GNUNET_NAMESTORE_Block)) || - (ntohl (block->purpose.size) + - sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) + - sizeof (struct GNUNET_CRYPTO_EccSignature) != block_size) ) - { - GNUNET_break (0); - ret = GNUNET_SYSERR; - } - else - { - iter (iter_cls, block); - ret = GNUNET_YES; - } - } - else - { - if (SQLITE_DONE != sret) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); - ret = GNUNET_SYSERR; - } - } - if (SQLITE_OK != sqlite3_reset (plugin->lookup_block)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return ret; -} - - /** * Store a record in the datastore. Removes any existing record in the * same zone with the same name. @@ -577,36 +349,36 @@ namestore_sqlite_lookup_block (void *cls, * @param cls closure (internal context for the plugin) * @param zone_key private key of the zone * @param label name that is being mapped (at most 255 characters long) - * @param rd_count number of entries in 'rd' array + * @param rd_count number of entries in @a rd array * @param rd array of records with data to store * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ -static int -namestore_sqlite_store_records (void *cls, - const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, +static int +namestore_sqlite_store_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, const char *label, unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd) + const struct GNUNET_GNSRECORD_Data *rd) { struct Plugin *plugin = cls; int n; - struct GNUNET_HashCode pkey_hash; + struct GNUNET_CRYPTO_EcdsaPublicKey pkey; uint64_t rvalue; size_t data_size; unsigned int i; - memset (&pkey_hash, 0, sizeof (pkey_hash)); + memset (&pkey, 0, sizeof (pkey)); for (i=0;i 64 * 65536) { GNUNET_break (0); @@ -615,7 +387,7 @@ namestore_sqlite_store_records (void *cls, { char data[data_size]; - if (data_size != GNUNET_NAMESTORE_records_serialize (rd_count, rd, + if (data_size != GNUNET_GNSRECORD_records_serialize (rd_count, rd, data_size, data)) { GNUNET_break (0); @@ -623,19 +395,19 @@ namestore_sqlite_store_records (void *cls, } /* First delete 'old' records */ - if ((SQLITE_OK != sqlite3_bind_blob (plugin->delete_records, 1, - zone_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), SQLITE_STATIC)) || + if ((SQLITE_OK != sqlite3_bind_blob (plugin->delete_records, 1, + zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || (SQLITE_OK != sqlite3_bind_text (plugin->delete_records, 2, label, -1, SQLITE_STATIC))) { - LOG_SQLITE (plugin, + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind_XXXX"); if (SQLITE_OK != sqlite3_reset (plugin->delete_records)) - LOG_SQLITE (plugin, + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); return GNUNET_SYSERR; - + } n = sqlite3_step (plugin->delete_records); if (SQLITE_OK != sqlite3_reset (plugin->delete_records)) @@ -644,23 +416,23 @@ namestore_sqlite_store_records (void *cls, if (0 != rd_count) { - if ((SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 1, - zone_key, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), SQLITE_STATIC)) || + if ((SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 1, + zone_key, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 2, - &pkey_hash, sizeof (struct GNUNET_HashCode), SQLITE_STATIC)) || + &pkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), SQLITE_STATIC)) || (SQLITE_OK != sqlite3_bind_int64 (plugin->store_records, 3, rvalue)) || (SQLITE_OK != sqlite3_bind_int (plugin->store_records, 4, rd_count)) || (SQLITE_OK != sqlite3_bind_blob (plugin->store_records, 5, data, data_size, SQLITE_STATIC)) || (SQLITE_OK != sqlite3_bind_text (plugin->store_records, 6, label, -1, SQLITE_STATIC))) { - LOG_SQLITE (plugin, + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind_XXXX"); if (SQLITE_OK != sqlite3_reset (plugin->store_records)) - LOG_SQLITE (plugin, + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); - return GNUNET_SYSERR; + return GNUNET_SYSERR; } n = sqlite3_step (plugin->store_records); if (SQLITE_OK != sqlite3_reset (plugin->store_records)) @@ -671,7 +443,10 @@ namestore_sqlite_store_records (void *cls, switch (n) { case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record stored\n"); + if (0 != rd_count) + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record stored\n"); + else + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Record deleted\n"); return GNUNET_OK; case SQLITE_BUSY: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, @@ -680,7 +455,7 @@ namestore_sqlite_store_records (void *cls, default: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step"); - return GNUNET_SYSERR; + return GNUNET_SYSERR; } } @@ -699,8 +474,8 @@ namestore_sqlite_store_records (void *cls, */ static int get_record_and_call_iterator (struct Plugin *plugin, - sqlite3_stmt *stmt, - const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, + sqlite3_stmt *stmt, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { unsigned int record_count; @@ -712,7 +487,7 @@ get_record_and_call_iterator (struct Plugin *plugin, ret = GNUNET_NO; if (SQLITE_ROW == (sret = sqlite3_step (stmt))) - { + { record_count = sqlite3_column_int (stmt, 0); data_size = sqlite3_column_bytes (stmt, 1); data = sqlite3_column_blob (stmt, 1); @@ -720,7 +495,7 @@ get_record_and_call_iterator (struct Plugin *plugin, if (NULL == zone_key) { /* must be "iterate_all_zones", got one extra return value */ - if (sizeof (struct GNUNET_CRYPTO_EccPrivateKey) != + if (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey) != sqlite3_column_bytes (stmt, 3)) { GNUNET_break (0); @@ -737,13 +512,13 @@ get_record_and_call_iterator (struct Plugin *plugin, because database might contain a large value here */ GNUNET_break (0); ret = GNUNET_SYSERR; - } + } else { - struct GNUNET_NAMESTORE_RecordData rd[record_count]; + struct GNUNET_GNSRECORD_Data rd[record_count]; if (GNUNET_OK != - GNUNET_NAMESTORE_records_deserialize (data_size, data, + GNUNET_GNSRECORD_records_deserialize (data_size, data, record_count, rd)) { GNUNET_break (0); @@ -769,6 +544,51 @@ get_record_and_call_iterator (struct Plugin *plugin, return ret; } +/** + * Lookup records in the datastore for which we are the authority. + * + * @param cls closure (internal context for the plugin) + * @param zone private key of the zone + * @param label name of the record in the zone + * @param iter function to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, else #GNUNET_SYSERR + */ +static int +namestore_sqlite_lookup_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, const char *label, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) +{ + struct Plugin *plugin = cls; + sqlite3_stmt *stmt; + int err; + + if (NULL == zone) + { + return GNUNET_SYSERR; + } + else + { + stmt = plugin->lookup_label; + err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), + SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_text (stmt, 2, + label, -1, SQLITE_STATIC)) ); + } + if (err) + { + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (stmt)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + return GNUNET_SYSERR; + } + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); +} + /** * Iterate over the results for a particular key and zone in the @@ -781,9 +601,9 @@ get_record_and_call_iterator (struct Plugin *plugin, * @param iter_cls closure for @a iter * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error */ -static int -namestore_sqlite_iterate_records (void *cls, - const struct GNUNET_CRYPTO_EccPrivateKey *zone, +static int +namestore_sqlite_iterate_records (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, uint64_t offset, GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { @@ -800,8 +620,8 @@ namestore_sqlite_iterate_records (void *cls, else { stmt = plugin->iterate_zone; - err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, - zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), + err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, offset)) ); @@ -815,7 +635,7 @@ namestore_sqlite_iterate_records (void *cls, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); return GNUNET_SYSERR; - } + } return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); } @@ -832,20 +652,20 @@ namestore_sqlite_iterate_records (void *cls, * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error */ static int -namestore_sqlite_zone_to_name (void *cls, - const struct GNUNET_CRYPTO_EccPrivateKey *zone, - const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, +namestore_sqlite_zone_to_name (void *cls, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const struct GNUNET_CRYPTO_EcdsaPublicKey *value_zone, GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { struct Plugin *plugin = cls; sqlite3_stmt *stmt; stmt = plugin->zone_to_name; - if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, - zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey), + if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_blob (stmt, 2, - value_zone, sizeof (struct GNUNET_CRYPTO_EccPublicSignKey), + (SQLITE_OK != sqlite3_bind_blob (stmt, 2, + value_zone, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), SQLITE_STATIC)) ) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, @@ -855,7 +675,11 @@ namestore_sqlite_zone_to_name (void *cls, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); return GNUNET_SYSERR; - } + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Performing reverse lookup for `%s'\n", + GNUNET_GNSRECORD_z2s (value_zone)); + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); } @@ -876,7 +700,7 @@ libgnunet_plugin_namestore_sqlite_init (void *cls) if (NULL != plugin.cfg) return NULL; /* can only initialize once! */ memset (&plugin, 0, sizeof (struct Plugin)); - plugin.cfg = cfg; + plugin.cfg = cfg; if (GNUNET_OK != database_setup (&plugin)) { database_shutdown (&plugin); @@ -884,12 +708,11 @@ libgnunet_plugin_namestore_sqlite_init (void *cls) } api = GNUNET_new (struct GNUNET_NAMESTORE_PluginFunctions); api->cls = &plugin; - api->cache_block = &namestore_sqlite_cache_block; - api->lookup_block = &namestore_sqlite_lookup_block; api->store_records = &namestore_sqlite_store_records; api->iterate_records = &namestore_sqlite_iterate_records; api->zone_to_name = &namestore_sqlite_zone_to_name; - LOG (GNUNET_ERROR_TYPE_INFO, + api->lookup_records = &namestore_sqlite_lookup_records; + LOG (GNUNET_ERROR_TYPE_INFO, _("Sqlite database running\n")); return api; } @@ -910,7 +733,7 @@ libgnunet_plugin_namestore_sqlite_done (void *cls) database_shutdown (plugin); plugin->cfg = NULL; GNUNET_free (api); - LOG (GNUNET_ERROR_TYPE_DEBUG, + LOG (GNUNET_ERROR_TYPE_DEBUG, "sqlite plugin is finished\n"); return NULL; }