[GNUnet-SVN] r34349 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2014-10-05 14:20:11 +0200 (Sun, 05 Oct 2014)
New Revision: 34349

Modified:
   gnunet/src/dht/gnunet-service-dht_neighbours.c
   gnunet/src/dht/gnunet-service-xdht_neighbours.c
Log:
-actually enable logic to drop part of path to fit message size, check against 
correct constant

Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c      2014-10-05 12:16:51 UTC 
(rev 34348)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c      2014-10-05 12:20:11 UTC 
(rev 34349)
@@ -1302,12 +1302,12 @@
   msize =
       put_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size +
       sizeof (struct PeerPutMessage);
-  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  if (msize >= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE)
   {
     put_path_length = 0;
     msize = data_size + sizeof (struct PeerPutMessage);
   }
-  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  if (msize >= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE)
   {
     GNUNET_break (0);
     GNUNET_free (targets);

Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-10-05 12:16:51 UTC 
(rev 34348)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c     2014-10-05 12:20:11 UTC 
(rev 34349)
@@ -2469,6 +2469,7 @@
 
 /**
  * Send the get result to requesting client.
+ *
  * @param key Key of the requested data.
  * @param type Block type
  * @param target_peer Next peer to forward the message to.
@@ -2507,8 +2508,7 @@
   if (msize >= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE)
   {
     put_path_length = 0;
-    msize = msize - put_path_length;
-    return;
+    msize = msize - put_path_length * sizeof (struct GNUNET_PeerIdentity);
   }
 
   if (msize >= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE)