X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fplugin_namestore_sqlite.c;h=836aa4d37d3c66ec51ca6f9f5863b91a243889d3;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=a03f8cc37b1b7b0fcbe055de040ca46384495b47;hpb=f6884a301a25d5038b0eeebaa4678eb164dc395b;p=oweals%2Fgnunet.git diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index a03f8cc37..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, 2011, 2012 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. */ /** @@ -26,17 +26,20 @@ #include "platform.h" #include "gnunet_namestore_plugin.h" +#include "gnunet_namestore_service.h" +#include "gnunet_gnsrecord_lib.h" +#include "namestore.h" #include /** - * After how many ms "busy" should a DB operation fail for good? - * A low value makes sure that we are more responsive to requests - * (especially PUTs). A high value guarantees a higher success - * rate (SELECTs in iterate can take several seconds despite LIMIT=1). + * After how many ms "busy" should a DB operation fail for good? A + * low value makes sure that we are more responsive to requests + * (especially PUTs). A high value guarantees a higher success rate + * (SELECTs in iterate can take several seconds despite LIMIT=1). * * The default value of 1s should ensure that users do not experience - * huge latencies while at the same time allowing operations to succeed - * with reasonable probability. + * huge latencies while at the same time allowing operations to + * succeed with reasonable probability. */ #define BUSY_TIMEOUT_MS 1000 @@ -70,50 +73,34 @@ struct Plugin sqlite3 *dbh; /** - * Precompiled SQL for put record + * Precompiled SQL to store records. */ - sqlite3_stmt *put_record; + sqlite3_stmt *store_records; /** - * Precompiled SQL for put node + * Precompiled SQL to deltete existing records. */ - sqlite3_stmt *put_node; + sqlite3_stmt *delete_records; /** - * Precompiled SQL for put signature + * Precompiled SQL for iterate records within a zone. */ - sqlite3_stmt *put_signature; + sqlite3_stmt *iterate_zone; /** - * Precompiled SQL for iterate records + * Precompiled SQL for iterate all records within all zones. */ - sqlite3_stmt *iterate_records; + sqlite3_stmt *iterate_all_zones; /** - * Precompiled SQL for get node + * Precompiled SQL to for reverse lookup based on PKEY. */ - sqlite3_stmt *get_node; + sqlite3_stmt *zone_to_name; /** - * Precompiled SQL for get signature + * Precompiled SQL to lookup records based on label. */ - sqlite3_stmt *get_signature; - - /** - * Precompiled SQL for delete zone - */ - sqlite3_stmt *delete_zone_records; - - /** - * Precompiled SQL for delete zone - */ - sqlite3_stmt *delete_zone_nodes; - - /** - * Precompiled SQL for delete zone - */ - sqlite3_stmt *delete_zone_signatures; - + sqlite3_stmt *lookup_label; }; @@ -134,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; } @@ -149,24 +136,16 @@ static void create_indices (sqlite3 * dbh) { /* create indices */ - if (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS ir_zone_name_hash ON ns090records (zone_hash,record_name_hash)", - NULL, NULL, NULL)) - LOG (GNUNET_ERROR_TYPE_ERROR, - "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); - - - if (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS in_zone_location ON ns090nodes (zone_hash,zone_revision,node_location_depth,node_location_offset DESC)", - NULL, NULL, NULL)) - LOG (GNUNET_ERROR_TYPE_ERROR, - "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); - - - if (SQLITE_OK != - sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS is_zone ON ns090signatures (zone_hash)", - NULL, NULL, NULL)) - LOG (GNUNET_ERROR_TYPE_ERROR, + if ( (SQLITE_OK != + 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 ns097records (zone_private_key,rvalue)", + NULL, NULL, NULL)) || + (SQLITE_OK != + sqlite3_exec (dbh, "CREATE INDEX IF NOT EXISTS it_iter ON ns097records (rvalue)", + NULL, NULL, NULL)) ) + LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create indices: %s\n", sqlite3_errmsg (dbh)); } @@ -177,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 @@ -187,7 +166,7 @@ create_indices (sqlite3 * dbh) * as needed as well). * * @param plugin the plugin context (state for this module) - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ static int database_setup (struct Plugin *plugin) @@ -201,10 +180,9 @@ database_setup (struct Plugin *plugin) if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (plugin->cfg, "namestore-sqlite", "FILENAME", &afsdir)) - { - LOG (GNUNET_ERROR_TYPE_ERROR, - _ ("Option `%s' in section `%s' missing in configuration!\n"), - "FILENAME", "namestore-sqlite"); + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "namestore-sqlite", "FILENAME"); return GNUNET_SYSERR; } if (GNUNET_OK != GNUNET_DISK_file_test (afsdir)) @@ -216,13 +194,8 @@ database_setup (struct Plugin *plugin) return GNUNET_SYSERR; } } -#ifdef ENABLE_NLS - plugin->fn = - GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), nl_langinfo (CODESET)); -#else - plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), "UTF-8"); /* good luck */ -#endif - GNUNET_free (afsdir); + /* afsdir should be UTF-8-encoded. If it isn't, it's a bug */ + plugin->fn = afsdir; /* Open database and precompile statements */ if (sqlite3_open (plugin->fn, &plugin->dbh) != SQLITE_OK) @@ -250,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)); @@ -260,26 +230,22 @@ database_setup (struct Plugin *plugin) CHECK (SQLITE_OK == sqlite3_busy_timeout (plugin->dbh, BUSY_TIMEOUT_MS)); - /* Create tables */ + /* Create table */ CHECK (SQLITE_OK == sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns090records'", + "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns097records'", &stmt)); if ((sqlite3_step (stmt) == SQLITE_DONE) && (sqlite3_exec (plugin->dbh, - "CREATE TABLE ns090records (" - " zone_hash BLOB NOT NULL DEFAULT ''," - " zone_revision INT4 NOT NULL DEFAULT 0," - " record_name_hash BLOB NOT NULL DEFAULT ''," - " record_name TEXT NOT NULL DEFAULT ''," - " record_type INT4 NOT NULL DEFAULT 0," - " node_location_depth INT4 NOT NULL DEFAULT 0," - " node_location_offset INT8 NOT NULL DEFAULT 0," - " record_expiration_time INT8 NOT NULL DEFAULT 0," - " record_flags INT4 NOT NULL DEFAULT 0," - " record_value BLOB NOT NULL DEFAULT ''" - ")", + "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 ''" + ")", NULL, NULL, NULL) != SQLITE_OK)) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); @@ -288,103 +254,38 @@ database_setup (struct Plugin *plugin) } sqlite3_finalize (stmt); - CHECK (SQLITE_OK == - sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns090nodes'", - &stmt)); - if ((sqlite3_step (stmt) == SQLITE_DONE) && - (sqlite3_exec - (plugin->dbh, - "CREATE TABLE ns090nodes (" - " zone_hash BLOB NOT NULL DEFAULT ''," - " zone_revision INT4 NOT NULL DEFAULT 0," - " node_location_depth INT4 NOT NULL DEFAULT 0," - " node_location_offset INT8 NOT NULL DEFAULT 0," - " node_parent_offset INT8 NOT NULL DEFAULT 0," - " node_hashcodes BLOB NOT NULL DEFAULT ''" - ")", - NULL, NULL, NULL) != SQLITE_OK)) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_exec"); - sqlite3_finalize (stmt); - return GNUNET_SYSERR; - } - sqlite3_finalize (stmt); - - - CHECK (SQLITE_OK == - sq_prepare (plugin->dbh, - "SELECT 1 FROM sqlite_master WHERE tbl_name = 'ns090signatures'", - &stmt)); - if ((sqlite3_step (stmt) == SQLITE_DONE) && - (sqlite3_exec - (plugin->dbh, - "CREATE TABLE ns090signatures (" - " zone_hash BLOB NOT NULL DEFAULT ''," - " zone_revision INT4 NOT NULL DEFAULT 0," - " zone_time INT8 NOT NULL DEFAULT 0," - " zone_root_hash BLOB NOT NULL DEFAULT 0," - " zone_root_depth INT4 NOT NULL DEFAULT 0," - " zone_public_key BLOB NOT NULL DEFAULT 0," - " zone_signature BLOB 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_indices (plugin->dbh); if ((sq_prepare (plugin->dbh, - "INSERT INTO ns090records (zone_hash, zone_revision, record_name_hash, record_name, " - "record_type, node_location_depth, node_location_offset, " - "record_expiration_time, record_flags, record_value) VALUES " - "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", - &plugin->put_record) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "INSERT INTO ns090nodes (zone_hash, zone_revision, " - "node_location_depth, node_location_offset, node_parent_offset, node_hashcodes) " - "VALUES (?, ?, ?, ?, ?, ?)", - &plugin->put_node) != SQLITE_OK) || + "INSERT INTO ns097records (zone_private_key, pkey, rvalue, record_count, record_data, label)" + " VALUES (?, ?, ?, ?, ?, ?)", + &plugin->store_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "INSERT INTO ns090signatures (zone_hash, zone_revision, zone_time, zone_root_hash, " - "zone_root_depth, zone_public_key, zone_signature) " - "VALUES (?, ?, ?, ?, ?, ?, ?)", - &plugin->put_signature) != SQLITE_OK) || + "DELETE FROM ns097records WHERE zone_private_key=? AND label=?", + &plugin->delete_records) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT zone_revision,record_name,record_type,node_location_depth,node_location_offset,record_expiration_time,record_flags,record_value " - "FROM ns090records WHERE zone_hash=? AND record_name_hash=?", - &plugin->iterate_records) != SQLITE_OK) || + "SELECT record_count,record_data,label" + " FROM ns097records WHERE zone_private_key=? AND pkey=?", + &plugin->zone_to_name) != SQLITE_OK) || (sq_prepare (plugin->dbh, - "SELECT node_parent_offset,node_location_offset,node_hashcodes FROM ns090nodes " - "WHERE zone_hash=? AND zone_revision=? AND node_location_depth=? AND node_location_offset<=? ORDER BY node_location_offset DESC LIMIT 1", - &plugin->get_node) != SQLITE_OK) || + "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 zone_revision,zone_time,zone_root_hash,zone_root_depth,zone_public_key,zone_signature " - "FROM ns090signatures WHERE zone_hash=?", - &plugin->get_signature) != 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, - "DELETE FROM ns090records WHERE zone_hash=?", - &plugin->delete_zone_records) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "DELETE FROM ns090nodes WHERE zone_hash=?", - &plugin->delete_zone_nodes) != SQLITE_OK) || - (sq_prepare - (plugin->dbh, - "DELETE FROM ns090signatures WHERE zone_hash=?", - &plugin->delete_zone_signatures) != SQLITE_OK) ) + "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"); return GNUNET_SYSERR; @@ -404,24 +305,18 @@ database_shutdown (struct Plugin *plugin) int result; sqlite3_stmt *stmt; - if (NULL != plugin->put_record) - sqlite3_finalize (plugin->put_record); - if (NULL != plugin->put_node) - sqlite3_finalize (plugin->put_node); - if (NULL != plugin->put_signature) - sqlite3_finalize (plugin->put_signature); - if (NULL != plugin->iterate_records) - sqlite3_finalize (plugin->iterate_records); - if (NULL != plugin->get_node) - sqlite3_finalize (plugin->get_node); - if (NULL != plugin->get_signature) - sqlite3_finalize (plugin->get_signature); - if (NULL != plugin->delete_zone_records) - sqlite3_finalize (plugin->delete_zone_records); - if (NULL != plugin->delete_zone_nodes) - sqlite3_finalize (plugin->delete_zone_nodes); - if (NULL != plugin->delete_zone_signatures) - sqlite3_finalize (plugin->delete_zone_signatures); + if (NULL != plugin->store_records) + sqlite3_finalize (plugin->store_records); + if (NULL != plugin->delete_records) + sqlite3_finalize (plugin->delete_records); + if (NULL != plugin->iterate_zone) + sqlite3_finalize (plugin->iterate_zone); + if (NULL != plugin->iterate_all_zones) + 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) { @@ -448,553 +343,344 @@ database_shutdown (struct Plugin *plugin) /** - * Store a record in the datastore. + * Store a record in the datastore. Removes any existing record in the + * same zone with the same name. * * @param cls closure (internal context for the plugin) - * @param zone hash of the public key of the zone - * @param name name that is being mapped (at most 255 characters long) - * @param record_type type of the record (A, AAAA, PKEY, etc.) - * @param loc location of the signature for the record - * @param expiration expiration time for the content - * @param flags flags for the content - * @param data_size number of bytes in data - * @param data value, semantics depend on 'record_type' (see RFCs for DNS and - * GNS specification for GNS extensions) - * @return GNUNET_OK on success + * @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 @a rd array + * @param rd array of records with data to store + * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ -static int -namestore_sqlite_put_record (void *cls, - const GNUNET_HashCode *zone, - const char *name, - uint32_t record_type, - const struct GNUNET_NAMESTORE_SignatureLocation *loc, - struct GNUNET_TIME_Absolute expiration, - enum GNUNET_NAMESTORE_RecordFlags flags, - size_t data_size, - const void *data) -{ - struct Plugin *plugin = cls; - int n; - GNUNET_HashCode nh; - size_t name_len; - - name_len = strlen (name); - GNUNET_CRYPTO_hash (name, name_len, &nh); - if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_record, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_record, 2, loc->revision)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_record, 3, &nh, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_text (plugin->put_record, 4, name, -1, SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_record, 5, record_type)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_record, 6, loc->depth)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_record, 7, loc->offset)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_record, 8, expiration.abs_value)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_record, 9, flags)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_record, 10, data, data_size, SQLITE_STATIC)) ) - { - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->put_record)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; - - } - n = sqlite3_step (plugin->put_record); - if (SQLITE_OK != sqlite3_reset (plugin->put_record)) - 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; - } -} - - -/** - * Store a Merkle tree node in the datastore. - * - * @param cls closure (internal context for the plugin) - * @param zone hash of public key of the zone - * @param loc location in the B-tree - * @param ploc parent's location in the B-tree (must have depth = loc.depth + 1), NULL for root - * @param num_entries number of entries at this node in the B-tree - * @param entries the 'num_entries' entries to store (hashes over the - * records) - * @return GNUNET_OK on success - */ -static int -namestore_sqlite_put_node (void *cls, - const GNUNET_HashCode *zone, - const struct GNUNET_NAMESTORE_SignatureLocation *loc, - const struct GNUNET_NAMESTORE_SignatureLocation *ploc, - unsigned int num_entries, - const GNUNET_HashCode *entries) +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_GNSRECORD_Data *rd) { struct Plugin *plugin = cls; int n; + struct GNUNET_CRYPTO_EcdsaPublicKey pkey; + uint64_t rvalue; + size_t data_size; + unsigned int i; - if ( (loc->revision != ploc->revision) || - (loc->depth + 1 != ploc->depth) || - (0 == num_entries)) + memset (&pkey, 0, sizeof (pkey)); + for (i=0;i 64 * 65536) { GNUNET_break (0); return GNUNET_SYSERR; } - if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_node, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_node, 2, loc->revision)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_node, 3, loc->depth)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_node, 4, loc->offset)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_node, 5, ploc->offset)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_node, 6, entries, num_entries * sizeof (GNUNET_HashCode), SQLITE_STATIC)) ) { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->put_node)) + char data[data_size]; + + if (data_size != GNUNET_GNSRECORD_records_serialize (rd_count, rd, + data_size, data)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + + /* First delete 'old' records */ + 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, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (plugin->delete_records)) + 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)) + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + + if (0 != rd_count) + { + 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, 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, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_bind_XXXX"); + if (SQLITE_OK != sqlite3_reset (plugin->store_records)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + return GNUNET_SYSERR; + } + n = sqlite3_step (plugin->store_records); + if (SQLITE_OK != sqlite3_reset (plugin->store_records)) + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); + } } - n = sqlite3_step (plugin->put_node); - if (SQLITE_OK != sqlite3_reset (plugin->put_node)) - 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", "Node 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, - "sqlite3_step"); + "sqlite3_step"); return GNUNET_NO; default: LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - return GNUNET_SYSERR; - } -} - - -/** - * Iterate over the results for a particular key and zone in the - * datastore. Will only query the latest revision known for the - * zone (as adding a new zone revision will cause the plugin to - * delete all records from previous revisions). - * - * @param cls closure (internal context for the plugin) - * @param zone hash of public key of the zone - * @param name_hash hash of name, NULL to iterate over all records of the zone - * @param iter maybe NULL (to just count) - * @param iter_cls closure for iter - * @return the number of results found - */ -static unsigned int -namestore_sqlite_iterate_records (void *cls, - const GNUNET_HashCode *zone, - const GNUNET_HashCode *name_hash, - GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) -{ - struct Plugin *plugin = cls; - unsigned int ret; - int sret; - struct GNUNET_TIME_Absolute expiration; - uint32_t record_type; - enum GNUNET_NAMESTORE_RecordFlags flags; - size_t data_size; - const void *data; - struct GNUNET_NAMESTORE_SignatureLocation loc; - const char *name; - - if ((SQLITE_OK != sqlite3_bind_blob (plugin->iterate_records, 1, - zone, sizeof (GNUNET_HashCode), - SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->iterate_records, 2, - name_hash, sizeof (GNUNET_HashCode), - SQLITE_STATIC)) ) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->iterate_records)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); + "sqlite3_step"); return GNUNET_SYSERR; } - ret = 0; - while (SQLITE_ROW == (sret = sqlite3_step (plugin->iterate_records))) - { - ret++; - if (NULL == iter) - continue; /* FIXME: just counting can be done more cheaply... */ - loc.revision = sqlite3_column_int (plugin->iterate_records, 0); - name = (const char*) sqlite3_column_text (plugin->iterate_records, 1); - record_type = sqlite3_column_int (plugin->iterate_records, 2); - loc.depth = sqlite3_column_int (plugin->iterate_records, 3); - loc.offset = sqlite3_column_int64 (plugin->iterate_records, 4); - expiration.abs_value = (uint64_t) sqlite3_column_int64 (plugin->iterate_records, 5); - flags = (enum GNUNET_NAMESTORE_RecordFlags) sqlite3_column_int (plugin->iterate_records, 6); - data = sqlite3_column_blob (plugin->iterate_records, 7); - data_size = sqlite3_column_bytes (plugin->iterate_records, 7); - iter (iter_cls, zone, - &loc, name, record_type, - expiration, flags, data_size, data); - } - if (SQLITE_DONE != sret) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); - sqlite3_finalize (plugin->iterate_records); - return ret; } - + /** - * Get a particular node from the signature tree. + * The given 'sqlite' statement has been prepared to be run. + * It will return a record which should be given to the iterator. + * Runs the statement and parses the returned record. * - * @param cls closure (internal context for the plugin) - * @param zone hash of public key of the zone - * @param loc location of the node in the signature tree - * @param cb function to call with the result - * @param cb_cls closure for cont - * @return GNUNET_OK on success, GNUNET_NO if no node was found + * @param plugin plugin context + * @param stmt to run (and then clean up) + * @param zone_key private key of the zone + * @param iter iterator to call with the result + * @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_get_node (void *cls, - const GNUNET_HashCode *zone, - const struct GNUNET_NAMESTORE_SignatureLocation *loc, - GNUNET_NAMESTORE_NodeCallback cb, void *cb_cls) +get_record_and_call_iterator (struct Plugin *plugin, + sqlite3_stmt *stmt, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, + GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls) { - struct Plugin *plugin = cls; + unsigned int record_count; + size_t data_size; + const char *data; + const char *label; int ret; - size_t hashcodes_size; - const GNUNET_HashCode *hashcodes; - struct GNUNET_NAMESTORE_SignatureLocation ploc; - struct GNUNET_NAMESTORE_SignatureLocation rloc; - - GNUNET_assert (NULL != cb); - if ((SQLITE_OK != sqlite3_bind_blob (plugin->get_node, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->get_node, 2, loc->revision)) || - (SQLITE_OK != sqlite3_bind_int (plugin->get_node, 3, loc->depth)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->get_node, 4, loc->offset)) ) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->get_node)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; + int sret; - } - rloc.revision = loc->revision; - rloc.depth = loc->depth; - ploc.revision = loc->revision; - ploc.depth = loc->depth + 1; ret = GNUNET_NO; - if (SQLITE_ROW == (ret = sqlite3_step (plugin->get_node))) + if (SQLITE_ROW == (sret = sqlite3_step (stmt))) { - ploc.offset = sqlite3_column_int64 (plugin->get_node, 0); - rloc.offset = sqlite3_column_int64 (plugin->get_node, 1); - hashcodes = sqlite3_column_blob (plugin->get_node, 2); - hashcodes_size = sqlite3_column_bytes (plugin->get_node, 2); - if (0 != (hashcodes_size % sizeof (GNUNET_HashCode))) + record_count = sqlite3_column_int (stmt, 0); + data_size = sqlite3_column_bytes (stmt, 1); + data = sqlite3_column_blob (stmt, 1); + label = (const char*) sqlite3_column_text (stmt, 2); + if (NULL == zone_key) { + /* must be "iterate_all_zones", got one extra return value */ + if (sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey) != + sqlite3_column_bytes (stmt, 3)) + { + GNUNET_break (0); + ret = GNUNET_SYSERR; + } + else + { + zone_key = sqlite3_column_blob (stmt, 3); + } + } + if (record_count > 64 * 1024) + { + /* sanity check, don't stack allocate far too much just + because database might contain a large value here */ GNUNET_break (0); - /* FIXME: delete bogus record? */ - } + ret = GNUNET_SYSERR; + } else { - ret = GNUNET_OK; - cb (cb_cls, - zone, - &rloc, - &ploc, - hashcodes_size / sizeof (GNUNET_HashCode), - hashcodes); + struct GNUNET_GNSRECORD_Data rd[record_count]; + + if (GNUNET_OK != + GNUNET_GNSRECORD_records_deserialize (data_size, data, + record_count, rd)) + { + GNUNET_break (0); + ret = GNUNET_SYSERR; + } + else if (NULL != zone_key) + { + if (NULL != iter) + iter (iter_cls, zone_key, label, record_count, rd); + ret = GNUNET_YES; + } } } - else if (SQLITE_DONE != ret) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); - sqlite3_finalize (plugin->get_node); + else + { + if (SQLITE_DONE != sret) + LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); + } + if (SQLITE_OK != sqlite3_reset (stmt)) + LOG_SQLITE (plugin, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_reset"); return ret; } - /** - * Get the current signature for a zone. + * Lookup records in the datastore for which we are the authority. * * @param cls closure (internal context for the plugin) - * @param zone hash of public key of the zone - * @param cb function to call with the result - * @param cb_cls closure for cont - * @return GNUNET_OK on success, GNUNET_NO if no node was found + * @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_get_signature (void *cls, - const GNUNET_HashCode *zone, - GNUNET_NAMESTORE_SignatureCallback cb, void *cb_cls) +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; - int ret; - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key; - struct GNUNET_NAMESTORE_SignatureLocation top_loc; - const struct GNUNET_CRYPTO_RsaSignature *zone_sig; - struct GNUNET_TIME_Absolute zone_time; - const GNUNET_HashCode *top_hash; - - GNUNET_assert (NULL != cb); - if (SQLITE_OK != sqlite3_bind_blob (plugin->get_signature, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) + sqlite3_stmt *stmt; + int err; + + if (NULL == zone) { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->get_signature)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); return GNUNET_SYSERR; } - ret = GNUNET_NO; - if (SQLITE_ROW == (ret = sqlite3_step (plugin->get_signature))) + else { - top_loc.offset = 0; - top_loc.revision = sqlite3_column_int (plugin->get_signature, 0); - zone_time.abs_value = sqlite3_column_int64 (plugin->get_signature, 1); - top_hash = sqlite3_column_blob (plugin->get_signature, 2); - top_loc.depth = sqlite3_column_int (plugin->get_signature, 3); - zone_key = sqlite3_column_blob (plugin->get_signature, 4); - zone_sig = sqlite3_column_blob (plugin->get_signature, 5); - - if ((sizeof (GNUNET_HashCode) != sqlite3_column_bytes (plugin->get_signature, 2)) || - (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) != sqlite3_column_bytes (plugin->get_signature, 4)) || - (sizeof (struct GNUNET_CRYPTO_RsaSignature) != sqlite3_column_bytes (plugin->get_signature, 5))) - { - GNUNET_break (0); - /* FIXME: delete bogus record & full zone (!?) */ - } - else - { - ret = GNUNET_OK; - cb (cb_cls, - zone_key, - &top_loc, - zone_sig, - zone_time, - top_hash); - } + 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 (SQLITE_DONE != ret) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite_step"); - sqlite3_finalize (plugin->get_signature); - return ret; -} - - -/** - * Run a SQL statement that takes only a 'zone' as the argument - * and returns nothing (deletes records). - * - * @param plugin our plugin - * @param zone zone argument to pass - * @param stmt prepared statement to run - */ -static void -run_delete_statement (struct Plugin *plugin, - const GNUNET_HashCode *zone, - sqlite3_stmt *stmt) -{ - int n; - - if (SQLITE_OK != sqlite3_bind_blob (plugin->delete_zone_records, 1, zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) + if (err) { LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->delete_zone_records)) + if (SQLITE_OK != sqlite3_reset (stmt)) LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_reset"); - return; - } - n = sqlite3_step (plugin->put_signature); - if (SQLITE_OK != sqlite3_reset (plugin->delete_zone_records)) - 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", "Zone records deleted\n"); - break; - case SQLITE_BUSY: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - break; - default: - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - break; + return GNUNET_SYSERR; } + return get_record_and_call_iterator (plugin, stmt, zone, iter, iter_cls); } /** - * Delete an entire zone (all revisions, all records, all nodes, - * all signatures). Not used in normal operation. + * Iterate over the results for a particular key and zone in the + * datastore. Will return at most one result to the iterator. * * @param cls closure (internal context for the plugin) - * @param zone zone to delete + * @param zone hash of public key of the zone, NULL to iterate over all zones + * @param offset offset in the list of all matching records + * @param iter function to call with the result + * @param iter_cls closure for @a iter + * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error */ -static void -namestore_sqlite_delete_zone (void *cls, - const GNUNET_HashCode *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) { struct Plugin *plugin = cls; - - run_delete_statement (plugin, zone, plugin->delete_zone_records); - run_delete_statement (plugin, zone, plugin->delete_zone_nodes); - run_delete_statement (plugin, zone, plugin->delete_zone_signatures); -} - - -/** - * Context for 'delete_old_zone_information'. - */ -struct DeleteContext -{ - /** - * Plugin handle. - */ - struct Plugin *plugin; - - /** - * Hash of the public key of the zone (to avoid having to - * recalculate it). - */ - const GNUNET_HashCode *zone; - - /** - * Revision to compare against. - */ - uint32_t revision; - -}; - - -/** - * Function called on the current signature in the database for - * a zone. If the revision given in the closure is more recent, - * delete all information about the zone. Otherwise, only delete - * the signature. - * - * @param cls a 'struct DeleteContext' with a revision to compare against - * @param zone_key public key of the zone - * @param loc location of the root in the B-tree (depth, revision) - * @param top_sig signature signing the zone - * @param zone_time time the signature was created - * @param root_hash top level hash that is being signed - */ -static void -delete_old_zone_information (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - const struct GNUNET_NAMESTORE_SignatureLocation *loc, - const struct GNUNET_CRYPTO_RsaSignature *top_sig, - struct GNUNET_TIME_Absolute zone_time, - const GNUNET_HashCode *root_hash) -{ - struct DeleteContext *dc = cls; + sqlite3_stmt *stmt; + int err; - run_delete_statement (dc->plugin, dc->zone, dc->plugin->delete_zone_signatures); - if (loc->revision == dc->revision) - return; - run_delete_statement (dc->plugin, dc->zone, dc->plugin->delete_zone_records); - run_delete_statement (dc->plugin, dc->zone, dc->plugin->delete_zone_nodes); + if (NULL == zone) + { + stmt = plugin->iterate_all_zones; + err = (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, + offset)); + } + else + { + stmt = plugin->iterate_zone; + err = ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, + zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey), + SQLITE_STATIC)) || + (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, + offset)) ); + } + 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); } - + /** - * Store a zone signature in the datastore. If a signature for the zone with a - * lower depth exists, the old signature is removed. If a signature for an - * older revision of the zone exists, this will delete all records, nodes - * and signatures for the older revision of the zone. + * Look for an existing PKEY delegation record for a given public key. + * Returns at most one result to the iterator. * * @param cls closure (internal context for the plugin) - * @param zone_key public key of the zone - * @param loc location in the B-tree (top of the tree, offset 0, depth at 'maximum') - * @param top_sig signature at the top, NULL if 'loc.depth > 0' - * @param root_hash top level hash that is signed - * @param zone_time time the zone was signed - * @return GNUNET_OK on success + * @param zone private key of the zone to look up in, never NULL + * @param value_zone public key of the target zone (value), never NULL + * @param iter function to call with the result + * @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_put_signature (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, - const struct GNUNET_NAMESTORE_SignatureLocation *loc, - const struct GNUNET_CRYPTO_RsaSignature *top_sig, - const GNUNET_HashCode *root_hash, - struct GNUNET_TIME_Absolute zone_time) +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; - int n; - GNUNET_HashCode zone; - struct DeleteContext dc; - - GNUNET_CRYPTO_hash (zone_key, - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), - &zone); - /* get "old" signature, if older revision, delete all existing - records/nodes for the zone, if same revision, delete only the signature */ - dc.plugin = plugin; - dc.zone = &zone; - dc.revision = loc->revision; - (void) namestore_sqlite_get_signature (plugin, - &zone, - &delete_old_zone_information, - &dc); - if ((SQLITE_OK != sqlite3_bind_blob (plugin->put_signature, 1, &zone, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_signature, 2, loc->revision)) || - (SQLITE_OK != sqlite3_bind_int64 (plugin->put_signature, 3, zone_time.abs_value)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_signature, 4, root_hash, sizeof (GNUNET_HashCode), SQLITE_STATIC)) || - (SQLITE_OK != sqlite3_bind_int (plugin->put_signature, 5, loc->depth)) || - (SQLITE_OK != sqlite3_bind_blob (plugin->put_signature, 6, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), SQLITE_STATIC))|| - (SQLITE_OK != sqlite3_bind_blob (plugin->put_signature, 7, top_sig, sizeof (struct GNUNET_CRYPTO_RsaSignature), SQLITE_STATIC)) ) - { - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_bind_XXXX"); - if (SQLITE_OK != sqlite3_reset (plugin->put_signature)) - LOG_SQLITE (plugin, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - return GNUNET_SYSERR; + sqlite3_stmt *stmt; - } - n = sqlite3_step (plugin->put_signature); - if (SQLITE_OK != sqlite3_reset (plugin->put_signature)) - LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_reset"); - switch (n) + stmt = plugin->zone_to_name; + 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_EcdsaPublicKey), + SQLITE_STATIC)) ) { - case SQLITE_DONE: - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "sqlite", "Signature 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"); + "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; } + 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); } @@ -1002,7 +688,7 @@ namestore_sqlite_put_signature (void *cls, * Entry point for the plugin. * * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*" - * @return NULL on error, othrewise the plugin context + * @return NULL on error, otherwise the plugin context */ void * libgnunet_plugin_namestore_sqlite_init (void *cls) @@ -1014,22 +700,19 @@ 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); return NULL; } - api = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_PluginFunctions)); + api = GNUNET_new (struct GNUNET_NAMESTORE_PluginFunctions); api->cls = &plugin; - api->put_record = &namestore_sqlite_put_record; - api->put_node = &namestore_sqlite_put_node; - api->put_signature = &namestore_sqlite_put_signature; + api->store_records = &namestore_sqlite_store_records; api->iterate_records = &namestore_sqlite_iterate_records; - api->get_node = &namestore_sqlite_get_node; - api->get_signature = &namestore_sqlite_get_signature; - api->delete_zone = &namestore_sqlite_delete_zone; - LOG (GNUNET_ERROR_TYPE_INFO, + api->zone_to_name = &namestore_sqlite_zone_to_name; + api->lookup_records = &namestore_sqlite_lookup_records; + LOG (GNUNET_ERROR_TYPE_INFO, _("Sqlite database running\n")); return api; } @@ -1047,12 +730,10 @@ libgnunet_plugin_namestore_sqlite_done (void *cls) struct GNUNET_NAMESTORE_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "sqlite plugin is done\n"); 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; }