[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36762 - gnunet/src/namecache
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36762 - gnunet/src/namecache |
Date: |
Tue, 15 Dec 2015 15:00:51 +0100 |
Author: schanzen
Date: 2015-12-15 15:00:51 +0100 (Tue, 15 Dec 2015)
New Revision: 36762
Modified:
gnunet/src/namecache/namecache.conf.in
gnunet/src/namecache/plugin_namecache_flat.c
Log:
- update flat plugin to namestore flat plugin status. Add config filename.
Modified: gnunet/src/namecache/namecache.conf.in
===================================================================
--- gnunet/src/namecache/namecache.conf.in 2015-12-12 14:18:02 UTC (rev
36761)
+++ gnunet/src/namecache/namecache.conf.in 2015-12-15 14:00:51 UTC (rev
36762)
@@ -14,6 +14,9 @@
[namecache-sqlite]
FILENAME = $GNUNET_DATA_HOME/namecache/sqlite.db
+[namecache-flat]
+FILENAME = $GNUNET_DATA_HOME/namecache/flat.db
+
[namecache-postgres]
CONFIG = connect_timeout=10; dbname=gnunet
TEMPORARY_TABLE = NO
Modified: gnunet/src/namecache/plugin_namecache_flat.c
===================================================================
--- gnunet/src/namecache/plugin_namecache_flat.c 2015-12-12 14:18:02 UTC
(rev 36761)
+++ gnunet/src/namecache/plugin_namecache_flat.c 2015-12-15 14:00:51 UTC
(rev 36762)
@@ -148,27 +148,32 @@
}
GNUNET_DISK_file_close (fh);
-
- line = strtok ("\n", buffer);
- while (line != NULL) {
- query = strtok (",", line);
- block = strtok (NULL, line);
- line = strtok ("\n", buffer);
- entry = GNUNET_malloc (sizeof (struct FlatFileEntry));
- GNUNET_CRYPTO_hash_from_string (query,
- &entry->query);
- GNUNET_STRINGS_base64_decode (block,
- strlen (block),
- &block_buffer);
- entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer;
- if (GNUNET_OK !=
- GNUNET_CONTAINER_multihashmap_put (plugin->hm,
- &entry->query,
- entry,
-
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
- {
- GNUNET_free (entry);
- GNUNET_break (0);
+ if (0 < size) {
+ line = strtok (buffer, "\n");
+ while (line != NULL) {
+ query = strtok (line, ",");
+ if (NULL == query)
+ break;
+ block = strtok (NULL, ",");
+ if (NULL == block)
+ break;
+ line = strtok (NULL, "\n");
+ entry = GNUNET_malloc (sizeof (struct FlatFileEntry));
+ GNUNET_CRYPTO_hash_from_string (query,
+ &entry->query);
+ GNUNET_STRINGS_base64_decode (block,
+ strlen (block),
+ &block_buffer);
+ entry->block = (struct GNUNET_GNSRECORD_Block *) block_buffer;
+ if (GNUNET_OK !=
+ GNUNET_CONTAINER_multihashmap_put (plugin->hm,
+ &entry->query,
+ entry,
+
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+ {
+ GNUNET_free (entry);
+ GNUNET_break (0);
+ }
}
}
GNUNET_free (buffer);
@@ -295,7 +300,7 @@
*/
static int
namecache_cache_block (void *cls,
- const struct GNUNET_GNSRECORD_Block *block)
+ const struct GNUNET_GNSRECORD_Block *block)
{
struct Plugin *plugin = cls;
struct GNUNET_HashCode query;
@@ -391,7 +396,7 @@
api->cache_block = &namecache_cache_block;
api->lookup_block = &namecache_lookup_block;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("flat plugin running\n"));
+ _("flat plugin running\n"));
return api;
}
@@ -412,7 +417,7 @@
plugin->cfg = NULL;
GNUNET_free (api);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "flat plugin is finished\n");
+ "flat plugin is finished\n");
return NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36762 - gnunet/src/namecache,
gnunet <=