[GNUnet-SVN] r29745 - gnunet/src/mesh

[gnunet]

Author: grothoff
Date: 2013-10-01 09:20:58 +0200 (Tue, 01 Oct 2013)
New Revision: 29745

Modified:
   gnunet/src/mesh/gnunet-mesh.c
   gnunet/src/mesh/mesh.h
   gnunet/src/mesh/mesh_api.c
   gnunet/src/mesh/mesh_api_enc.c
   gnunet/src/mesh/plugin_block_mesh.c
Log:
-fixing FTBFS

Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c       2013-10-01 07:16:13 UTC (rev 29744)
+++ gnunet/src/mesh/gnunet-mesh.c       2013-10-01 07:20:58 UTC (rev 29745)
@@ -24,10 +24,8 @@
  * @author Bartlomiej Polot
  */
 #include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_mesh_service.h"
-#include "gnunet_program_lib.h"
 
 
 /**
@@ -127,6 +125,7 @@
   }
 }
 
+
 /**
  * Call MESH's monitor API, get info of one tunnel.
  *
@@ -139,8 +138,13 @@
   struct GNUNET_PeerIdentity pid;
 
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_hash_from_string (tunnel_id, &pid.hashPubKey))
+      GNUNET_CRYPTO_ecc_public_sign_key_from_string (tunnel_id,
+                                                    strlen (tunnel_id),
+                                                    &pid.public_key))
   {
+    fprintf (stderr,
+            _("Invalid tunnel owner `%s'\n"),
+            tunnel_id);
     GNUNET_SCHEDULER_shutdown();
     return;
   }

Modified: gnunet/src/mesh/mesh.h
===================================================================
--- gnunet/src/mesh/mesh.h      2013-10-01 07:16:13 UTC (rev 29744)
+++ gnunet/src/mesh/mesh.h      2013-10-01 07:20:58 UTC (rev 29745)
@@ -39,9 +39,7 @@
 #define MESH_DEBUG              GNUNET_YES
 
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_protocols.h"
 #include <gnunet_mesh_service.h>

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-10-01 07:16:13 UTC (rev 29744)
+++ gnunet/src/mesh/mesh_api.c  2013-10-01 07:20:58 UTC (rev 29745)
@@ -31,10 +31,7 @@
  * TODO: add regex to reconnect
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_mesh_service.h"
 #include "mesh.h"
 #include "mesh_protocol.h"

Modified: gnunet/src/mesh/mesh_api_enc.c
===================================================================
--- gnunet/src/mesh/mesh_api_enc.c      2013-10-01 07:16:13 UTC (rev 29744)
+++ gnunet/src/mesh/mesh_api_enc.c      2013-10-01 07:20:58 UTC (rev 29745)
@@ -22,10 +22,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_peer_lib.h"
 #include "gnunet_mesh_service_enc.h"
 #include "mesh_enc.h"
 #include "mesh_protocol_enc.h"

Modified: gnunet/src/mesh/plugin_block_mesh.c
===================================================================
--- gnunet/src/mesh/plugin_block_mesh.c 2013-10-01 07:16:13 UTC (rev 29744)
+++ gnunet/src/mesh/plugin_block_mesh.c 2013-10-01 07:20:58 UTC (rev 29745)
@@ -106,9 +106,9 @@
  * @param cls closure
  * @param type block type
  * @param block block to get the key for
- * @param block_size number of bytes in block
+ * @param block_size number of bytes in @a block
  * @param key set to the key (query) for the given block
- * @return GNUNET_OK on success, GNUNET_SYSERR if type not supported
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
@@ -124,7 +124,9 @@
   case GNUNET_BLOCK_TYPE_MESH_PEER:
     if (sizeof (struct PBlock) != block_size)
       return GNUNET_SYSERR;
-    *key = pb->id.hashPubKey;
+    GNUNET_CRYPTO_hash (&pb->id,
+                       sizeof (struct GNUNET_PeerIdentity),
+                       key);
     return GNUNET_OK;
   default:
     GNUNET_break (0);
@@ -146,7 +148,7 @@
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_mesh_evaluate;
   api->get_key = &block_plugin_mesh_get_key;
   api->types = types;