[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16852 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16852 - gnunet/src/dht |
Date: |
Wed, 14 Sep 2011 20:25:10 +0200 |
Author: bartpolot
Date: 2011-09-14 20:25:10 +0200 (Wed, 14 Sep 2011)
New Revision: 16852
Modified:
gnunet/src/dht/dht_api_get_put.c
Log:
Fixed data size given to dht_get_iterator
Modified: gnunet/src/dht/dht_api_get_put.c
===================================================================
--- gnunet/src/dht/dht_api_get_put.c 2011-09-14 16:46:38 UTC (rev 16851)
+++ gnunet/src/dht/dht_api_get_put.c 2011-09-14 18:25:10 UTC (rev 16852)
@@ -128,7 +128,6 @@
struct GNUNET_DHT_GetHandle *get_handle = cls;
const struct GNUNET_DHT_GetResultMessage *result;
const struct GNUNET_PeerIdentity **put_path;
- size_t payload;
char *path_offset;
const struct GNUNET_PeerIdentity *pos;
unsigned int i;
@@ -147,12 +146,12 @@
put_path = NULL;
put_path_length = ntohs (result->put_path_length);
+ data_size =
+ ntohs (result->header.size) -
+ (put_path_length * sizeof (struct GNUNET_PeerIdentity)) -
+ sizeof (struct GNUNET_DHT_GetResultMessage);
if (put_path_length > 0)
{
- data_size =
- ntohs (result->header.size) -
- (put_path_length * sizeof (struct GNUNET_PeerIdentity)) -
- sizeof (struct GNUNET_DHT_GetResultMessage);
path_offset = (char *) &result[1];
//GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "In get_reply_iterator,
result->header.size is %d, put_path_length %d, offset is %d, data_size is
%d\n", ntohs(result->header.size), put_path_length, ntohs(result->header.size)
- (put_path_length * sizeof(struct GNUNET_PeerIdentity)), data_size);
path_offset += data_size;
@@ -169,10 +168,9 @@
put_path[put_path_length] = NULL;
}
- payload = ntohs (reply->size) - sizeof (struct GNUNET_DHT_GetResultMessage);
get_handle->iter (get_handle->iter_cls,
GNUNET_TIME_absolute_ntoh (result->expiration), key,
- outgoing_path, put_path, ntohs (result->type), payload,
+ outgoing_path, put_path, ntohs (result->type), data_size,
&result[1]);
GNUNET_free_non_null (put_path);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16852 - gnunet/src/dht,
gnunet <=