/**
* @file dht/test_dht_monitor.c
*
- * @brief Test for the dht service: store, retrieve and monitor in a 2d_torus.
+ * @brief Test for the dht service: store, retrieve and monitor in a line.
* TODO: update this description
* Each peer stores it own ID in the DHT and then a different peer tries to
* retrieve that key from it. The GET starts after a first round of PUTS has
struct GNUNET_DHT_GetHandle *get_h_far;
const char *id_origin = "FC74";
-const char *id_far = "KPST";
-
-unsigned int i_origin;
-unsigned int i_far;
+const char *id_far = "2UVH";
struct GNUNET_TESTING_Daemon *d_far;
struct GNUNET_TESTING_Daemon *o;
"test: All peers successfully shut down!\n");
#endif
}
+ GNUNET_CONFIGURATION_destroy (testing_cfg);
}
if (data_file != NULL)
GNUNET_DISK_file_close (data_file);
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_CONFIGURATION_destroy (testing_cfg);
}
disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
}
+/**
+ * Start test: start GET request from the first node in the line looking for
+ * the ID of the last node in the line.
+ *
+ * @param cls Closure (not used).
+ * @param tc Task context.
+ */
static void
do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ {
+ return;
+ }
+
in_test = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: looking for %s\n",
GNUNET_h2s_full (&d_far->id.hashPubKey));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: from %s\n",
GNUNET_h2s_full (&o->id.hashPubKey));
- get_h_far = GNUNET_DHT_get_start (hs[i_origin], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
GNUNET_BLOCK_TYPE_TEST, /* type */
&d_far->id.hashPubKey, /*key to search */
4U, /* replication level */
}
+/**
+ * Periodic function used to put the ID of the far peer in the DHT.
+ *
+ * @param cls Closure (not used).
+ * @param tc Task context.
+ */
static void
put_id (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TESTING_Daemon *d;
- d = GNUNET_TESTING_daemon_get (pg, i_far);
+ if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
+ {
+ put_task = GNUNET_SCHEDULER_NO_TASK;
+ return;
+ }
+
+ d = GNUNET_TESTING_daemon_get (pg, 4);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: putting into DHT: %s\n",
GNUNET_h2s_full (&d->id.hashPubKey));
- GNUNET_DHT_put (hs[i_far], &d->id.hashPubKey, 10U,
+ GNUNET_DHT_put (hs[4], &d->id.hashPubKey, 10U,
GNUNET_DHT_RO_RECORD_ROUTE |
GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
GNUNET_BLOCK_TYPE_TEST, sizeof (struct GNUNET_PeerIdentity),
}
/**
- * Callback called on each request going through the DHT.
+ * Callback called on each GET request going through the DHT.
+ * Prints the info about the intercepted packet and increments a counter.
+ *
+ * @param cls Closure.
+ * @param options Options, for instance RecordRoute, DemultiplexEverywhere.
+ * @param type The type of data in the request.
+ * @param hop_count Hop count so far.
+ * @param path_length number of entries in path (or 0 if not recorded).
+ * @param path peers on the GET path (or NULL if not recorded).
+ * @param desired_replication_level Desired replication level.
+ * @param key Key of the requested data.
+ */
+void
+monitor_get_cb (void *cls,
+ enum GNUNET_DHT_RouteOption options,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t hop_count,
+ uint32_t desired_replication_level,
+ unsigned int path_length,
+ const struct GNUNET_PeerIdentity *path,
+ const GNUNET_HashCode * key)
+{
+ const char *s_key;
+ unsigned int i;
+
+ i = (unsigned int) (long) cls;
+ s_key = GNUNET_h2s(key);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%u got a GET message for key %s\n",
+ i, s_key);
+
+ if (strncmp (s_key, id_far, 4) == 0 && in_test == GNUNET_YES)
+ monitor_counter++;
+}
+
+
+/**
+ * Callback called on each PUT request going through the DHT.
+ * Prints the info about the intercepted packet and increments a counter.
*
* @param cls Closure.
- * @param mtype Type of the DHT message monitored.
- * @param exp When will this value expire.
- * @param key Key of the result/request.
- * @param get_path Peers on reply path (or NULL if not recorded).
+ * @param options Options, for instance RecordRoute, DemultiplexEverywhere.
+ * @param type The type of data in the request.
+ * @param hop_count Hop count so far.
+ * @param path_length number of entries in path (or 0 if not recorded).
+ * @param path peers on the PUT path (or NULL if not recorded).
+ * @param desired_replication_level Desired replication level.
+ * @param exp Expiration time of the data.
+ * @param key Key under which data is to be stored.
+ * @param data Pointer to the data carried.
+ * @param size Number of bytes in data.
+ */
+void
+monitor_put_cb (void *cls,
+ enum GNUNET_DHT_RouteOption options,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t hop_count,
+ uint32_t desired_replication_level,
+ unsigned int path_length,
+ const struct GNUNET_PeerIdentity *path,
+ struct GNUNET_TIME_Absolute exp,
+ const GNUNET_HashCode * key,
+ const void *data,
+ size_t size)
+{
+ const char *s_key;
+ unsigned int i;
+
+ i = (unsigned int) (long) cls;
+ s_key = GNUNET_h2s(key);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%u got a PUT message for key %s with %u bytes\n",
+ i, s_key, size);
+
+ if (strncmp (s_key, id_far, 4) == 0 && in_test == GNUNET_YES)
+ monitor_counter++;
+}
+
+
+/**
+ * Callback called on each GET reply going through the DHT.
+ * Prints the info about the intercepted packet and increments a counter.
+ *
+ * @param cls Closure.
+ * @param type The type of data in the result.
+ * @param get_path Peers on GET path (or NULL if not recorded).
* @param get_path_length number of entries in get_path.
* @param put_path peers on the PUT path (or NULL if not recorded).
* @param put_path_length number of entries in get_path.
- * @param desired_replication_level Desired replication level.
- * @param type Type of the result/request.
+ * @param exp Expiration time of the data.
+ * @param key Key of the data.
* @param data Pointer to the result data.
* @param size Number of bytes in data.
*/
void
-monitor_dht_cb (void *cls,
- uint16_t mtype,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode * key,
- const struct GNUNET_PeerIdentity * get_path,
+monitor_res_cb (void *cls,
+ enum GNUNET_BLOCK_Type type,
+ const struct GNUNET_PeerIdentity *get_path,
unsigned int get_path_length,
- const struct GNUNET_PeerIdentity * put_path,
+ const struct GNUNET_PeerIdentity *put_path,
unsigned int put_path_length,
- uint32_t desired_replication_level,
- enum GNUNET_DHT_RouteOption options,
- enum GNUNET_BLOCK_Type type,
+ struct GNUNET_TIME_Absolute exp,
+ const GNUNET_HashCode * key,
const void *data,
size_t size)
{
const char *s_key;
+ unsigned int i;
+ i = (unsigned int) (long) cls;
s_key = GNUNET_h2s(key);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "%u got a message of type %u for key %s\n",
- cls, mtype, s_key);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%u got a REPLY message for key %s with %u bytes\n",
+ i, s_key, size);
- if ((mtype == GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET ||
- mtype == GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT) &&
- strncmp (s_key, id_far, 4) == 0 && in_test == GNUNET_YES)
+ if (strncmp (s_key, id_far, 4) == 0 && in_test == GNUNET_YES)
monitor_counter++;
}
/**
* peergroup_ready: start test when all peers are connected
+ *
* @param cls closure
* @param emsg error message
*/
{
struct GNUNET_TESTING_Daemon *d;
char *buf;
- const char *id_aux;
int buf_len;
unsigned int i;
hs = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *));
mhs = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_MonitorHandle *));
d_far = o = NULL;
+ o = GNUNET_TESTING_daemon_get (pg, 0);
+ d_far = GNUNET_TESTING_daemon_get (pg, 4);
+
for (i = 0; i < num_peers; i++)
{
d = GNUNET_TESTING_daemon_get (pg, i);
hs[i] = GNUNET_DHT_connect (d->cfg, 32);
- mhs[i] = GNUNET_DHT_monitor_start(hs[i], GNUNET_BLOCK_TYPE_ANY, NULL,
- &monitor_dht_cb, (void *)(long)i);
- id_aux = GNUNET_i2s (&d->id);
- if (strcmp (id_aux, id_origin) == 0)
- {
- o = d;
- i_origin = i;
- }
- if (strcmp (id_aux, id_far) == 0)
- {
- i_far = i;
- d_far = d;
- }
+ mhs[i] = GNUNET_DHT_monitor_start(hs[i],
+ GNUNET_BLOCK_TYPE_ANY,
+ NULL,
+ &monitor_get_cb,
+ &monitor_res_cb,
+ &monitor_put_cb,
+ (void *)(long)i);
}
if ((NULL == o) || (NULL == d_far))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "test: Peers not found (hostkey file changed?)\n");
+ "test: Error getting daemons from pg\n");
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
return;
&topology_file))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Option test_dht_2d:topology_output_file is required!\n");
+ "Option test_dht_monitor:topology_output_file is required!\n");
return;
}
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_dht_2dtorus",
+ GNUNET_CONFIGURATION_get_value_string (testing_cfg, "test_dht_topo",
"data_output_file",
&data_filename))
{
}
if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "test_dht_2dtorus",
+ GNUNET_CONFIGURATION_get_value_string (cfg, "test_dht_topo",
"output_file", &temp_str))
{
output_file =
{
char *const argv[] = { "test-dht-monitor",
"-c",
- "test_dht_2dtorus.conf", // reuse 2dtorus conf file
+ "test_dht_line.conf",
#if VERBOSE
"-L", "DEBUG",
#endif
in_test = GNUNET_NO;
GNUNET_PROGRAM_run (sizeof (argv) / sizeof (char *) - 1, argv,
"test_dht_monitor",
- gettext_noop ("Test dht monitoring in a small 2D torus."),
+ gettext_noop ("Test dht monitoring in a line."),
options, &run, NULL);
#if REMOVE_DIR
GNUNET_DISK_directory_remove ("/tmp/test_dht_monitor");
projects / oweals / gnunet.git / blobdiff