diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-02-05 13:48:42 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-02-05 13:48:42 +0000 |
commit | 59b233b7e3b3d70006fc8b40bd566e67bc487231 (patch) | |
tree | 7c926c36c1fdcc4d1d98e74673e0ee0e75964095 | |
parent | c6fbb7224e3bdf617ae07e106b9494c522cbe1cd (diff) | |
download | gnunet-59b233b7e3b3d70006fc8b40bd566e67bc487231.tar.gz gnunet-59b233b7e3b3d70006fc8b40bd566e67bc487231.zip |
comparing wrong data
-rw-r--r-- | src/dht/test_dht_twopeer_put_get.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c index 1d0af082b..2427edef9 100644 --- a/src/dht/test_dht_twopeer_put_get.c +++ b/src/dht/test_dht_twopeer_put_get.c | |||
@@ -55,7 +55,7 @@ | |||
55 | /* If number of peers not in config file, use this number */ | 55 | /* If number of peers not in config file, use this number */ |
56 | #define DEFAULT_NUM_PEERS 2 | 56 | #define DEFAULT_NUM_PEERS 2 |
57 | 57 | ||
58 | #define DNS GNUNET_NO | 58 | #define DNS GNUNET_YES |
59 | 59 | ||
60 | /* Globals */ | 60 | /* Globals */ |
61 | 61 | ||
@@ -215,20 +215,30 @@ void get_result_iterator (void *cls, | |||
215 | const struct GNUNET_PeerIdentity * const *put_path, | 215 | const struct GNUNET_PeerIdentity * const *put_path, |
216 | enum GNUNET_BLOCK_Type type, | 216 | enum GNUNET_BLOCK_Type type, |
217 | size_t size, | 217 | size_t size, |
218 | const void *data) | 218 | const void *result_data) |
219 | { | 219 | { |
220 | GNUNET_HashCode original_key; /* Key data was stored data under */ | 220 | GNUNET_HashCode original_key; /* Key data was stored data under */ |
221 | char original_data[4]; /* Made up data that was stored */ | 221 | char original_data[4]; /* Made up data that was stored */ |
222 | memset(&original_key, 42, sizeof(GNUNET_HashCode)); /* Set the key to what it was set to previously */ | 222 | memset(&original_key, 42, sizeof(GNUNET_HashCode)); /* Set the key to what it was set to previously */ |
223 | memset(original_data, 43, sizeof(original_data)); | 223 | memset(original_data, 43, sizeof(original_data)); |
224 | 224 | ||
225 | if ((0 != memcmp(&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp(original_data, data, sizeof(original_data)))) | 225 | #if DNS |
226 | if ((0 != memcmp(&data.service_descriptor, key, sizeof (GNUNET_HashCode))) || (0 != memcmp((char *)&data, result_data, sizeof(original_data)))) | ||
227 | { | ||
228 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Key or data is not the same as was inserted!\n"); | ||
229 | GNUNET_SCHEDULER_cancel(die_task); | ||
230 | GNUNET_SCHEDULER_add_now(&end_badly, "key or data mismatch in get response!\n"); | ||
231 | return; | ||
232 | } | ||
233 | #else | ||
234 | if ((0 != memcmp(&original_key, key, sizeof (GNUNET_HashCode))) || (0 != memcmp(original_data, result_data, sizeof(original_data)))) | ||
226 | { | 235 | { |
227 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Key or data is not the same as was inserted!\n"); | 236 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Key or data is not the same as was inserted!\n"); |
228 | GNUNET_SCHEDULER_cancel(die_task); | 237 | GNUNET_SCHEDULER_cancel(die_task); |
229 | GNUNET_SCHEDULER_add_now(&end_badly, "key or data mismatch in get response!\n"); | 238 | GNUNET_SCHEDULER_add_now(&end_badly, "key or data mismatch in get response!\n"); |
230 | return; | 239 | return; |
231 | } | 240 | } |
241 | #endif | ||
232 | 242 | ||
233 | GNUNET_SCHEDULER_cancel(die_task); | 243 | GNUNET_SCHEDULER_cancel(die_task); |
234 | GNUNET_DHT_get_stop(global_get_handle); | 244 | GNUNET_DHT_get_stop(global_get_handle); |