[GNUnet-SVN] r29731 - in gnunet/src: include integration-tests namestore

[gnunet]

Author: grothoff
Date: 2013-10-01 00:06:01 +0200 (Tue, 01 Oct 2013)
New Revision: 29731

Modified:
   gnunet/src/include/gnunet_namestore_plugin.h
   gnunet/src/integration-tests/connection_watchdog.c
   gnunet/src/namestore/namestore_api_common.c
Log:
-fixing build issues in namestore related to #3047

Modified: gnunet/src/include/gnunet_namestore_plugin.h
===================================================================
--- gnunet/src/include/gnunet_namestore_plugin.h        2013-09-30 22:02:55 UTC 
(rev 29730)
+++ gnunet/src/include/gnunet_namestore_plugin.h        2013-09-30 22:06:01 UTC 
(rev 29731)
@@ -26,7 +26,6 @@
 #ifndef GNUNET_NAMESTORE_PLUGIN_H
 #define GNUNET_NAMESTORE_PLUGIN_H
 
-#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_service.h"
 

Modified: gnunet/src/integration-tests/connection_watchdog.c
===================================================================
--- gnunet/src/integration-tests/connection_watchdog.c  2013-09-30 22:02:55 UTC 
(rev 29730)
+++ gnunet/src/integration-tests/connection_watchdog.c  2013-09-30 22:06:01 UTC 
(rev 29731)
@@ -23,11 +23,10 @@
  * @author Matthias Wachs
  */
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_core_service.h"
-#include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_statistics_service.h"
 

Modified: gnunet/src/namestore/namestore_api_common.c
===================================================================
--- gnunet/src/namestore/namestore_api_common.c 2013-09-30 22:02:55 UTC (rev 
29730)
+++ gnunet/src/namestore/namestore_api_common.c 2013-09-30 22:06:01 UTC (rev 
29731)
@@ -509,7 +509,6 @@
                                  const void *data,
                                  size_t data_size)
 {
-  struct GNUNET_CRYPTO_HashAsciiEncoded s_peer;
   const char *cdata;
   char* result;
   char tmp[INET6_ADDRSTRLEN];
@@ -650,10 +649,9 @@
           ('\0' != cdata[data_size - 1]) )
        return NULL; /* malformed */
       vpn = data;
-      GNUNET_CRYPTO_hash_to_enc (&vpn->peer.hashPubKey, &s_peer);
       if (0 == GNUNET_asprintf (&vpn_str, "%u %s %s",
                                (unsigned int) ntohs (vpn->proto),
-                               (const char*) &s_peer,
+                               (const char*) GNUNET_i2s_full (&vpn->peer),
                                (const char*) &vpn[1]))
       {
        GNUNET_free (vpn_str);
@@ -978,8 +976,9 @@
     }
     *data_size = sizeof (struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv) + 1;
     *data = vpn = GNUNET_malloc (*data_size);
-    if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((char*)&s_peer,
-                                                    &vpn->peer.hashPubKey))
+    if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string ((char*) 
s_peer,
+                                                                   strlen 
(s_peer),
+                                                                   &vpn->peer))
     {
       GNUNET_free (vpn);
       *data_size = 0;