[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20614 - gnunet-gtk/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20614 - gnunet-gtk/src/gns |
Date: |
Mon, 19 Mar 2012 19:25:50 +0100 |
Author: wachs
Date: 2012-03-19 19:25:50 +0100 (Mon, 19 Mar 2012)
New Revision: 20614
Modified:
gnunet-gtk/src/gns/gnunet-gns-gtk.c
gnunet-gtk/src/gns/gnunet-gns-gtk.h
gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- use short hashes
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-19 17:16:16 UTC (rev 20613)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-19 18:25:50 UTC (rev 20614)
@@ -288,6 +288,7 @@
run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_GNS_Context *gns = GNUNET_malloc (sizeof (struct
GNUNET_GNS_Context));
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
char *keyfile;
char *label;
@@ -296,7 +297,8 @@
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration
(),
"gns",
"ZONEKEY_DIRECTORY",
-
&zonekey_directory))
+ &zonekey_direc
struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+ GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);tory))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Option `%s' missing in section `%s'\n"),
@@ -315,10 +317,8 @@
return;
}
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Using `%s'\n", keyfile);
- }
gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
keyfile = NULL;
@@ -329,7 +329,7 @@
return;
}
GNUNET_CRYPTO_rsa_key_get_public (gns->pkey, &gns->pubkey);
- GNUNET_CRYPTO_hash (&gns->pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone);
+ GNUNET_CRYPTO_short_hash (&gns->pubkey, sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &gns->zone);
gns->ns = GNUNET_NAMESTORE_connect (get_configuration ());
@@ -352,7 +352,8 @@
gns->ls = GTK_LIST_STORE (gtk_builder_get_object (gns->builder,
"GNUNET_GNS_GTK_type_liststore"));
GNUNET_assert (NULL != gns->ts);
- zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&gns->zone));
+ GNUNET_CRYPTO_short_hash_to_enc(&gns->zone, &shenc);
+ zone_as_string = GNUNET_strdup ((char *) &shenc);
label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
zone_as_string);
gtk_label_set_markup (GTK_LABEL (get_object ("GNUNET_GNS_GTK_zone_label")),
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.h
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.h 2012-03-19 17:16:16 UTC (rev 20613)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.h 2012-03-19 18:25:50 UTC (rev 20614)
@@ -42,7 +42,7 @@
struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
};
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-19 17:16:16 UTC (rev
20613)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-19 18:25:50 UTC (rev
20614)
@@ -339,7 +339,7 @@
struct ZoneIteration_Context
{
struct GNUNET_GNS_Context *gns;
- GNUNET_HashCode zone;
+ struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_NAMESTORE_ZoneIterator * it;
};
@@ -381,12 +381,17 @@
GNUNET_assert (zc_ctx != NULL);
if ((NULL == zone_key) && (NULL == name))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n",
GNUNET_h2s(&zc_ctx->zone));
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+ GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n", &shenc);
GNUNET_free (zc_ctx);
return;
}
+
+ struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
+ GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s' iteration result `%s', %u
records\n",
- GNUNET_h2s(&zc_ctx->zone), name, rd_count);
+ shenc, name, rd_count);
GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
gtk_tree_store_append(zc_ctx->gns->ts, &iter_name, NULL);
@@ -476,8 +481,6 @@
zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
zc_ctx->gns = user_data;
zc_ctx->zone = gns->zone;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Starting one `%s' iteration\n",
GNUNET_h2s(&zc_ctx->zone));
-
zc_ctx->it = GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &gns->zone,
GNUNET_NAMESTORE_RF_NONE,
GNUNET_NAMESTORE_RF_NONE,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20614 - gnunet-gtk/src/gns,
gnunet <=