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

[gnunet]

Author: bartpolot
Date: 2012-06-21 17:41:05 +0200 (Thu, 21 Jun 2012)
New Revision: 22190

Modified:
   gnunet/src/mesh/gnunet-service-mesh_new.c
Log:
- use blocks for checking by type results

Modified: gnunet/src/mesh/gnunet-service-mesh_new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_new.c   2012-06-21 15:19:45 UTC (rev 
22189)
+++ gnunet/src/mesh/gnunet-service-mesh_new.c   2012-06-21 15:41:05 UTC (rev 
22190)
@@ -3783,17 +3783,23 @@
                       unsigned int put_path_length, enum GNUNET_BLOCK_Type 
type,
                       size_t size, const void *data)
 {
-  const struct GNUNET_PeerIdentity *pi = data;
+  const struct PBlock *pb = data;
+  const struct GNUNET_PeerIdentity *pi = &pb->id;
   struct MeshTunnel *t = cls;
   struct MeshPeerInfo *peer_info;
   struct MeshPeerPath *p;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got type DHT result!\n");
-  if (size != sizeof (struct GNUNET_PeerIdentity))
+  if (size != sizeof (struct PBlock))
   {
     GNUNET_break_op (0);
     return;
   }
+  if (ntohl(pb->type) != t->type)
+  {
+    GNUNET_break_op (0);
+    return;
+  }
   GNUNET_assert (NULL != t->owner);
   peer_info = peer_info_get (pi);
   (void) GNUNET_CONTAINER_multihashmap_put (t->peers, &pi->hashPubKey,