* How long do we wait for the NAT test to report success?
* Should match NAT_SERVER_TIMEOUT in 'nat_test.c'.
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
*/
static int iterate_connections;
+/**
+ * Option -d.
+ */
+static int iterate_validation;
+
/**
* Option -a.
*/
*/
static int monitor_connections;
+/**
+ * Option -f.
+ */
+static int monitor_validation;
+
/**
* Option -C.
*/
static int try_connect;
+/**
+ * Option -D.
+ */
+static int try_disconnect;
+
/**
* Option -n.
*/
*/
static struct GNUNET_TRANSPORT_TransmitHandle *th;
+/**
+ * Map storing information about monitored peers
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *monitored_peers;
+
/**
*
*/
-struct GNUNET_TRANSPORT_PeerMonitoringContext *pic;
+static struct GNUNET_TRANSPORT_PeerMonitoringContext *pic;
+
+static struct GNUNET_TRANSPORT_ValidationMonitoringContext *vic;
/**
* Identity of the peer we transmit to / connect to.
*/
struct GNUNET_OS_Process *resolver;
-/**
- * Number of tasks running that still need the resolver.
- */
-static unsigned int resolver_users;
-
/**
* Number of address resolutions pending
*/
*/
static unsigned int address_resolution_in_progress;
+/**
+ * DLL for NAT Test Contexts: head
+ */
+struct TestContext *head;
+
+/**
+ * DLL for NAT Test Contexts: tail
+ */
+struct TestContext *tail;
+
/**
* Context for a plugin test.
*/
struct TestContext
{
+ /**
+ * Previous in DLL
+ */
+ struct TestContext *prev;
+
+ /**
+ * Next in DLL
+ */
+ struct TestContext *next;
/**
* Handle to the active NAT test.
/**
* Name of plugin under test.
*/
- const char *name;
+ char *name;
+
+ /**
+ * Bound port
+ */
+ unsigned long long bnd_port;
+
+ /**
+ * Advertised ports
+ */
+ unsigned long long adv_port;
+
+};
+
+enum TestResult
+{
+ /* NAT returned success */
+ NAT_TEST_SUCCESS = GNUNET_OK,
+
+ /* NAT returned failure */
+ NAT_TEST_FAIL = GNUNET_NO,
+
+ /* NAT returned failure while running test */
+ NAT_TEST_INTERNAL_FAIL = GNUNET_SYSERR,
+
+ /* We could not start the test */
+ NAT_TEST_FAILED_TO_START = 2,
+ /* We had a timeout while running the test */
+ NAT_TEST_TIMEOUT = 3,
};
+static struct ValidationResolutionContext *vc_head;
+static struct ValidationResolutionContext *vc_tail;
+
+struct ValidationResolutionContext
+{
+ struct ValidationResolutionContext *next;
+ struct ValidationResolutionContext *prev;
+
+ struct GNUNET_PeerIdentity id;
+ struct GNUNET_HELLO_Address *addrcp;
+ struct GNUNET_TIME_Absolute last_validation;
+ struct GNUNET_TIME_Absolute valid_until;
+ struct GNUNET_TIME_Absolute next_validation;
+ enum GNUNET_TRANSPORT_ValidationState state;
+
+ struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+
+ char *transport;
+ int printed;
+};
+
+struct MonitoredPeer
+{
+ enum GNUNET_TRANSPORT_PeerState state;
+ struct GNUNET_TIME_Absolute state_timeout;
+ struct GNUNET_HELLO_Address *address;
+};
+
+
+static int
+destroy_it (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
+{
+ struct MonitoredPeer *m = value;
+
+ GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_remove (monitored_peers,
+ key, value));
+ GNUNET_free_non_null (m->address);
+ GNUNET_free (value);
+ return GNUNET_OK;
+}
+
+
/**
* Task run in monitor mode when the user presses CTRL-C to abort.
* Stops monitoring activity.
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TIME_Relative duration;
+ struct ValidationResolutionContext *cur;
+ struct ValidationResolutionContext *next;
end = GNUNET_SCHEDULER_NO_TASK;
if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
{
GNUNET_TRANSPORT_monitor_peers_cancel (pic);
pic = NULL;
}
+ if (NULL != vic)
+ {
+ GNUNET_TRANSPORT_monitor_validation_entries_cancel (vic);
+ vic = NULL;
+ }
+
+ next = vc_head;
+ for (cur = next; NULL != cur; cur = next)
+ {
+ next = cur->next;
+
+ GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
+ GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, cur);
+ GNUNET_free (cur->transport);
+ GNUNET_HELLO_address_free (cur->addrcp);
+ GNUNET_free (cur);
+ }
+
if (NULL != th)
{
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
traffic_received,
GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
}
+
+ if (NULL != monitored_peers)
+ {
+ GNUNET_CONTAINER_multipeermap_iterate (monitored_peers, &destroy_it, NULL);
+ GNUNET_CONTAINER_multipeermap_destroy (monitored_peers);
+ monitored_peers = NULL;
+ }
}
-static struct ResolutionContext *rc_head;
-static struct ResolutionContext *rc_tail;
+static struct PeerResolutionContext *rc_head;
+static struct PeerResolutionContext *rc_tail;
-struct ResolutionContext
+struct PeerResolutionContext
{
- struct ResolutionContext *next;
- struct ResolutionContext *prev;
+ struct PeerResolutionContext *next;
+ struct PeerResolutionContext *prev;
+ struct GNUNET_PeerIdentity id;
struct GNUNET_HELLO_Address *addrcp;
struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+ enum GNUNET_TRANSPORT_PeerState state;
+ struct GNUNET_TIME_Absolute state_timeout;
+ char *transport;
int printed;
};
+
+
static void
operation_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct ResolutionContext *cur;
- struct ResolutionContext *next;
+ struct PeerResolutionContext *cur;
+ struct PeerResolutionContext *next;
op_timeout = GNUNET_SCHEDULER_NO_TASK;
if ((try_connect) || (benchmark_send) || (benchmark_receive))
{
GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, cur);
GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
+ GNUNET_free(cur->transport);
GNUNET_free(cur->addrcp);
GNUNET_free(cur);
}
+static void
+run_nat_test ();
+
/**
* Display the result of the test.
*
* @param result #GNUNET_YES on success
*/
static void
-display_test_result (struct TestContext *tc, int result)
+display_test_result (struct TestContext *tc, enum TestResult result)
{
+ switch (result) {
+ case NAT_TEST_FAIL:
+ FPRINTF (stderr, _("Configuration for plugin `%s' did not work!\n"),
+ tc->name);
+ break;
+ case NAT_TEST_SUCCESS:
+ FPRINTF (stderr, _("Configuration for plugin `%s' did work!\n"),
+ tc->name);
+ break;
+ case NAT_TEST_INTERNAL_FAIL:
+ FPRINTF (stderr, _("Internal NAT error while running test for plugin `%s'\n"),
+ tc->name);
+ break;
+ case NAT_TEST_FAILED_TO_START:
+ FPRINTF (stderr, _("Failed to start NAT test for plugin `%s'\n"),
+ tc->name);
+ break;
+ case NAT_TEST_TIMEOUT:
+ FPRINTF (stderr, _("Timeout while waiting for result of NAT test for plugin `%s'\n"),
+ tc->name);
+ break;
+ default:
+ break;
+ }
+
if (GNUNET_YES != result)
{
FPRINTF (stderr, "Configuration for plugin `%s' did not work!\n", tc->name);
GNUNET_NAT_test_stop (tc->tst);
tc->tst = NULL;
}
- GNUNET_free(tc);
- resolver_users--;
- if ((0 == resolver_users) && (NULL != resolver))
+
+ GNUNET_CONTAINER_DLL_remove (head, tail, tc);
+ GNUNET_free (tc->name);
+ GNUNET_free (tc);
+
+ if ((NULL == head) && (NULL != resolver))
{
GNUNET_break(0 == GNUNET_OS_process_kill (resolver, GNUNET_TERM_SIG));
GNUNET_OS_process_destroy (resolver);
resolver = NULL;
}
+ if (NULL != head)
+ run_nat_test ();
}
/**
- * Function called by NAT on success.
- * Clean up and update GUI (with success).
+ * Function called by NAT to report the outcome of the nat-test.
+ * Clean up and update GUI.
*
* @param cls test context
* @param success currently always #GNUNET_OK
* @param emsg error message, NULL on success
*/
static void
-result_callback (void *cls, int success, const char *emsg)
+result_callback (void *cls, enum GNUNET_NAT_FailureCode result)
{
struct TestContext *tc = cls;
-
- display_test_result (tc, success);
+ display_test_result (tc, result);
}
+static void
+resolve_validation_address (const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_HELLO_Address *address,
+ int numeric,
+ struct GNUNET_TIME_Absolute last_validation,
+ struct GNUNET_TIME_Absolute valid_until,
+ struct GNUNET_TIME_Absolute next_validation,
+ enum GNUNET_TRANSPORT_ValidationState state);
+
+
+
/**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
+ * Function to call with a textual representation of an address. This
+ * function will be called several times with different possible
+ * textual representations, and a last time with @address being NULL
+ * to signal the end of the iteration. Note that @address NULL
+ * always is the last call, regardless of the value in @a res.
*
- * @param cls test context
- * @param tc scheduler callback
+ * @param cls closure
+ * @param address NULL on end of iteration,
+ * otherwise 0-terminated printable UTF-8 string,
+ * in particular an empty string if @a res is #GNUNET_NO
+ * @param res result of the address to string conversion:
+ * if #GNUNET_OK: conversion successful
+ * if #GNUNET_NO: address was invalid (or not supported)
+ * if #GNUNET_SYSERR: communication error (IPC error)
*/
static void
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_validation_string (void *cls,
+ const char *address,
+ int res)
+{
+ struct ValidationResolutionContext *vc = cls;
+ char *s_valid;
+ char *s_last;
+ char *s_next;
+
+ if (NULL != address)
+ {
+ if (GNUNET_SYSERR == res)
+ {
+ FPRINTF (stderr,
+ "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
+ GNUNET_i2s (&vc->id),
+ vc->addrcp->transport_name,
+ vc->addrcp->address_length);
+ }
+ if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us)
+ s_valid = GNUNET_strdup ("never");
+ else
+ s_valid = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->valid_until));
+
+ if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->last_validation.abs_value_us)
+ s_last = GNUNET_strdup ("never");
+ else
+ s_last = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->last_validation));
+
+ if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->next_validation.abs_value_us)
+ s_next = GNUNET_strdup ("never");
+ else
+ s_next = GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (vc->next_validation));
+
+ FPRINTF (stdout,
+ _("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"),
+ GNUNET_i2s (&vc->id),
+ (GNUNET_OK == res) ? address : "<invalid address>",
+ (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "",
+ "Valid until : ", s_valid,
+ "Last validation: ",s_last,
+ "Next validation: ", s_next);
+ GNUNET_free (s_valid);
+ GNUNET_free (s_last);
+ GNUNET_free (s_next);
+ vc->printed = GNUNET_YES;
+ return;
+ }
+ /* last call, we are done */
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if ( (GNUNET_SYSERR == res) &&
+ (GNUNET_NO == vc->printed) )
+ {
+ if (numeric == GNUNET_NO)
+ {
+ /* Failed to resolve address, try numeric lookup
+ (note: this should be unnecessary, as
+ transport should fallback to numeric lookup
+ internally if DNS takes too long anyway) */
+ resolve_validation_address (&vc->id,
+ vc->addrcp,
+ GNUNET_NO,
+ vc->last_validation,
+ vc->valid_until,
+ vc->next_validation,
+ vc->state);
+ }
+ else
+ {
+ FPRINTF (stdout,
+ _("Peer `%s' %s `%s' \n"),
+ GNUNET_i2s (&vc->id),
+ "<unable to resolve address>",
+ GNUNET_TRANSPORT_vs2s (vc->state));
+ }
+ }
+ GNUNET_free (vc->transport);
+ GNUNET_free (vc->addrcp);
+ GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, vc);
+ GNUNET_free (vc);
+ if ((0 == address_resolutions) && (iterate_validation))
+ {
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ {
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ }
+ ret = 0;
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ }
+}
+
+
+
+static void
+resolve_validation_address (const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_HELLO_Address *address,
+ int numeric,
+ struct GNUNET_TIME_Absolute last_validation,
+ struct GNUNET_TIME_Absolute valid_until,
+ struct GNUNET_TIME_Absolute next_validation,
+ enum GNUNET_TRANSPORT_ValidationState state)
+{
+ struct ValidationResolutionContext *vc;
+
+ vc = GNUNET_new (struct ValidationResolutionContext);
+ GNUNET_assert(NULL != vc);
+ GNUNET_CONTAINER_DLL_insert(vc_head, vc_tail, vc);
+ address_resolutions++;
+
+ vc->id = (*id);
+ vc->transport = GNUNET_strdup(address->transport_name);
+ vc->addrcp = GNUNET_HELLO_address_copy (address);
+ vc->printed = GNUNET_NO;
+ vc->state = state;
+ vc->last_validation = last_validation;
+ vc->valid_until = valid_until;
+ vc->next_validation = next_validation;
+
+ /* Resolve address to string */
+ vc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ numeric,
+ RESOLUTION_TIMEOUT,
+ &process_validation_string, vc);
+}
+
+
+static void
+process_validation_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute last_validation,
+ struct GNUNET_TIME_Absolute valid_until,
+ struct GNUNET_TIME_Absolute next_validation,
+ enum GNUNET_TRANSPORT_ValidationState state)
{
- struct TestContext *tstc = cls;
+ if ((NULL == peer) && (NULL == address))
+ {
+ if (monitor_validation)
+ {
+ FPRINTF (stdout,
+ "%s",
+ _("Monitor disconnected from transport service. Reconnecting.\n"));
+ return;
+ }
+
+ /* done */
+ vic = NULL;
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ return;
+ }
+ if ((NULL == peer) || (NULL == address))
+ {
+ /* invalid response */
+ vic = NULL;
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ return;
+ }
+ resolve_validation_address (peer, address,
+ numeric, last_validation,
+ valid_until, next_validation, state);
+}
- tstc->tsk = GNUNET_SCHEDULER_NO_TASK;
- display_test_result (tstc, GNUNET_NO);
+
+static void
+run_nat_test ()
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Running test for plugin `%s' using bind port %u and advertised port %u \n",
+ head->name, (uint16_t) head->bnd_port, (uint16_t) head->adv_port);
+
+ head->tst = GNUNET_NAT_test_start (cfg,
+ (0 == strcasecmp (head->name, "udp")) ? GNUNET_NO : GNUNET_YES,
+ (uint16_t) head->bnd_port,
+ (uint16_t) head->adv_port,
+ TIMEOUT,
+ &result_callback, head);
}
+
/**
* Test our plugin's configuration (NAT traversal, etc.).
*
ret = 4;
return;
}
+
for (tok = strtok (plugins, " "); tok != NULL ; tok = strtok (NULL, " "))
{
char section[12 + strlen (tok)];
-
GNUNET_snprintf (section, sizeof(section), "transport-%s", tok);
if (GNUNET_OK
!= GNUNET_CONFIGURATION_get_value_number (cfg, section, "PORT",
_("No port configured for plugin `%s', cannot test it\n"), tok);
continue;
}
- if (GNUNET_OK
- != GNUNET_CONFIGURATION_get_value_number (cfg, section,
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, section,
"ADVERTISED_PORT", &adv_port))
adv_port = bnd_port;
- if (NULL == resolver)
- {
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
- resolver = GNUNET_OS_start_process (GNUNET_YES,
- GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary,
- "gnunet-service-resolver", NULL );
- GNUNET_free(binary);
- }
- resolver_users++;
- GNUNET_RESOLVER_connect (cfg);
+
tc = GNUNET_new (struct TestContext);
tc->name = GNUNET_strdup (tok);
- tc->tst = GNUNET_NAT_test_start (cfg,
- (0 == strcasecmp (tok, "udp")) ? GNUNET_NO : GNUNET_YES,
- (uint16_t) bnd_port, (uint16_t) adv_port, &result_callback, tc);
- if (NULL == tc->tst)
+ tc->adv_port = adv_port;
+ tc->bnd_port = bnd_port;
+ GNUNET_CONTAINER_DLL_insert_tail (head, tail, tc);
+ }
+ GNUNET_free(plugins);
+
+ if ((NULL != head) && (NULL == resolver))
+ {
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
+ resolver = GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, NULL,
+ binary,
+ "gnunet-service-resolver", NULL );
+ if (NULL == resolver)
{
- display_test_result (tc, GNUNET_SYSERR);
- continue;
+ FPRINTF (stderr, _("Failed to start resolver!\n"));
+ return;
}
- tc->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, tc);
+
+ GNUNET_free(binary);
+ GNUNET_RESOLVER_connect (cfg);
+ run_nat_test ();
}
- GNUNET_free(plugins);
}
/**
m->type = ntohs (GNUNET_MESSAGE_TYPE_DUMMY);
memset (&m[1], 52, size - sizeof(struct GNUNET_MessageHeader));
traffic_sent += size;
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid, BLOCKSIZE * 1024,
- 0, GNUNET_TIME_UNIT_FOREVER_REL, &transmit_data, NULL );
+ th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid,
+ BLOCKSIZE * 1024,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_data, NULL );
if (verbosity > 0)
FPRINTF (stdout, _("Transmitting %u bytes to %s\n"), (unsigned int) size,
GNUNET_i2s (&pid));
return size;
}
+
/**
* Function called to notify transport users that another
* peer connected to us.
start_time = GNUNET_TIME_absolute_get ();
if (NULL == th)
th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer,
- BLOCKSIZE * 1024, 0, GNUNET_TIME_UNIT_FOREVER_REL, &transmit_data,
- NULL );
+ BLOCKSIZE * 1024,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &transmit_data,
+ NULL);
else
GNUNET_break(0);
return;
* @param peer the peer that disconnected
*/
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+notify_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
return;
+ if (try_disconnect)
+ {
+ /* all done, terminate instantly */
+ FPRINTF (stdout, _("Successfully disconnected from `%s'\n"),
+ GNUNET_i2s_full (peer));
+ ret = 0;
+
+ if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ return;
+ }
+
if (NULL != th)
{
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
* @param peer the peer that connected
*/
static void
-monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
+monitor_notify_connect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
monitor_connect_counter++;
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
- FPRINTF (stdout, _("%24s: %-17s %4s (%u connections in total)\n"), now_str,
- _("Connected to"), GNUNET_i2s (peer), monitor_connect_counter);
+ FPRINTF (stdout,
+ _("%24s: %-17s %4s (%u connections in total)\n"),
+ now_str,
+ _("Connected to"),
+ GNUNET_i2s (peer),
+ monitor_connect_counter);
}
+
/**
* Function called to notify transport users that another
* peer disconnected from us.
* @param peer the peer that disconnected
*/
static void
-monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
+monitor_notify_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
GNUNET_assert(monitor_connect_counter > 0);
monitor_connect_counter--;
- FPRINTF (stdout, _("%24s: %-17s %4s (%u connections in total)\n"), now_str,
- _("Disconnected from"), GNUNET_i2s (peer), monitor_connect_counter);
+ FPRINTF (stdout,
+ _("%24s: %-17s %4s (%u connections in total)\n"),
+ now_str,
+ _("Disconnected from"),
+ GNUNET_i2s (peer),
+ monitor_connect_counter);
}
+
/**
* Function called by the transport for each received message.
*
* @param message the message
*/
static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+notify_receive (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message)
{
if (benchmark_receive)
{
if (GNUNET_MESSAGE_TYPE_DUMMY != ntohs (message->type))
return;
if (verbosity > 0)
- FPRINTF (stdout, _("Received %u bytes from %s\n"),
- (unsigned int) ntohs (message->size), GNUNET_i2s (peer));
+ FPRINTF (stdout,
+ _("Received %u bytes from %s\n"),
+ (unsigned int) ntohs (message->size),
+ GNUNET_i2s (peer));
if (traffic_received == 0)
start_time = GNUNET_TIME_absolute_get ();
}
}
+
static void
-resolve_address (const struct GNUNET_HELLO_Address *address, int numeric);
+resolve_peer_address (const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_HELLO_Address *address,
+ int numeric,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout);
+
static void
-process_string (void *cls, const char *address)
+print_info (const struct GNUNET_PeerIdentity *id,
+ const char *transport,
+ const char *addr,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout)
{
- struct ResolutionContext *rc = cls;
- struct GNUNET_HELLO_Address *addrcp = rc->addrcp;
- if (address != NULL )
+ if ( ((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) ||
+ (GNUNET_YES == monitor_connections) )
{
- FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (&addrcp->peer),
- addrcp->transport_name, address);
- rc->printed = GNUNET_YES;
+ FPRINTF (stdout,
+ _("Peer `%s': %s %s in state `%s' until %s\n"),
+ GNUNET_i2s (id),
+ (NULL == transport) ? "<none>" : transport,
+ (NULL == transport) ? "<none>" : addr,
+ GNUNET_TRANSPORT_ps2s (state),
+ GNUNET_STRINGS_absolute_time_to_string (state_timeout));
}
- else
+ else if ( (GNUNET_YES == iterate_connections) &&
+ (GNUNET_TRANSPORT_is_connected(state)) )
{
- /* done */
- GNUNET_assert(address_resolutions > 0);
- address_resolutions--;
- if (GNUNET_NO == rc->printed)
+ /* Only connected peers, skip state */
+ FPRINTF (stdout,
+ _("Peer `%s': %s %s\n"),
+ GNUNET_i2s (id),
+ transport,
+ addr);
+ }
+}
+
+
+/**
+ * Function called with a textual representation of an address. This
+ * function will be called several times with different possible
+ * textual representations, and a last time with @address being NULL
+ * to signal the end of the iteration. Note that @address NULL
+ * always is the last call, regardless of the value in @a res.
+ *
+ * @param cls closure
+ * @param address NULL on end of iteration,
+ * otherwise 0-terminated printable UTF-8 string,
+ * in particular an empty string if @a res is #GNUNET_NO
+ * @param res result of the address to string conversion:
+ * if #GNUNET_OK: conversion successful
+ * if #GNUNET_NO: address was invalid (or not supported)
+ * if #GNUNET_SYSERR: communication error (IPC error)
+ */
+static void
+process_peer_string (void *cls,
+ const char *address,
+ int res)
+{
+ struct PeerResolutionContext *rc = cls;
+
+ if (NULL != address)
+ {
+ if (GNUNET_SYSERR == res)
{
- if (numeric == GNUNET_NO)
- {
- resolve_address (rc->addrcp, GNUNET_YES); /* Failed to resolve address, try numeric lookup */
- }
- else
- FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"),
- GNUNET_i2s (&addrcp->peer), addrcp->transport_name);
+ FPRINTF (stderr,
+ "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
+ GNUNET_i2s (&rc->id),
+ rc->addrcp->transport_name,
+ rc->addrcp->address_length);
+ print_info (&rc->id,
+ rc->transport,
+ NULL,
+ rc->state,
+ rc->state_timeout);
+ rc->printed = GNUNET_YES;
+ return;
}
- GNUNET_free(rc->addrcp);
- GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, rc);
- GNUNET_free(rc);
- if ((0 == address_resolutions) && (iterate_connections))
+ if (GNUNET_OK == res)
{
- if (GNUNET_SCHEDULER_NO_TASK != end)
- {
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_NO_TASK;
- }
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
- {
- GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
- }
- ret = 0;
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ print_info (&rc->id,
+ rc->transport,
+ address,
+ rc->state,
+ rc->state_timeout);
+ rc->printed = GNUNET_YES;
+ return; /* Wait for done call */
+ }
+ /* GNUNET_NO == res: ignore, was simply not supported */
+ return;
+ }
+ /* NULL == address, last call, we are done */
+
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if (GNUNET_NO == rc->printed)
+ {
+ if (numeric == GNUNET_NO)
+ {
+ /* Failed to resolve address, try numeric lookup
+ (note: this should not be needed, as transport
+ should fallback to numeric conversion if DNS takes
+ too long) */
+ resolve_peer_address (&rc->id,
+ rc->addrcp,
+ GNUNET_YES,
+ rc->state,
+ rc->state_timeout);
+ }
+ else
+ {
+ print_info (&rc->id,
+ rc->transport,
+ NULL,
+ rc->state,
+ rc->state_timeout);
+ }
+ }
+ GNUNET_free (rc->transport);
+ GNUNET_free (rc->addrcp);
+ GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
+ GNUNET_free (rc);
+ if ((0 == address_resolutions) && (iterate_connections))
+ {
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ {
+ GNUNET_SCHEDULER_cancel (end);
+ end = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ {
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_NO_TASK;
}
+ ret = 0;
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
}
}
+
static void
-resolve_address (const struct GNUNET_HELLO_Address *address, int numeric)
+resolve_peer_address (const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_HELLO_Address *address,
+ int numeric,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout)
{
- struct ResolutionContext *rc;
+ struct PeerResolutionContext *rc;
- rc = GNUNET_new (struct ResolutionContext);
+ rc = GNUNET_new (struct PeerResolutionContext);
GNUNET_assert(NULL != rc);
GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc);
address_resolutions++;
+ rc->id = (*id);
+ rc->transport = GNUNET_strdup(address->transport_name);
rc->addrcp = GNUNET_HELLO_address_copy (address);
rc->printed = GNUNET_NO;
+ rc->state = state;
+ rc->state_timeout = state_timeout;
/* Resolve address to string */
- rc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
- RESOLUTION_TIMEOUT, &process_string, rc);
+ rc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ numeric,
+ RESOLUTION_TIMEOUT,
+ &process_peer_string, rc);
}
+
/**
- * Function called with information about a peers
+ * Function called with information about a peers during a one shot iteration
*
* @param cls closure
* @param peer identity of the peer, NULL for final callback when operation done
* NULL on disconnect or when done
* @param state current state this peer is in
* @param state_timeout time out for the current state
- *
*/
static void
-process_peer_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Address *address,
- enum GNUNET_TRANSPORT_PeerState state,
- struct GNUNET_TIME_Absolute state_timeout)
+process_peer_iteration_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout)
{
- if (peer == NULL )
+ if (NULL == peer)
{
/* done */
address_resolution_in_progress = GNUNET_NO;
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
return;
}
- if (address == NULL )
+
+ if ( (GNUNET_NO == iterate_all) &&
+ (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)) )
+ return; /* Display only connected peers */
+
+ if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout,
+ NULL);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received address for peer `%s': %s\n",
+ GNUNET_i2s (peer),
+ address->transport_name);
+
+ if (NULL != address)
+ resolve_peer_address (peer, address, numeric, state, state_timeout);
+ else
+ print_info (peer, NULL, NULL, state, state_timeout);
+}
+
+
+/**
+ * Function called with information about a peers
+ *
+ * @param cls closure
+ * @param peer identity of the peer, NULL for final callback when operation done
+ * @param address binary address used to communicate with this peer,
+ * NULL on disconnect or when done
+ * @param state current state this peer is in
+ * @param state_timeout time out for the current state
+ *
+ */
+static void
+process_peer_monitoring_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout)
+{
+ struct MonitoredPeer *m;
+
+ if (NULL == peer)
{
- FPRINTF (stdout, _("Peer `%s' disconnected\n"), GNUNET_i2s (peer));
+ FPRINTF (stdout,
+ "%s",
+ _("Monitor disconnected from transport service. Reconnecting.\n"));
return;
}
if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
- NULL );
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout,
+ NULL);
+
+ if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer)))
+ {
+ m = GNUNET_new (struct MonitoredPeer);
+ GNUNET_CONTAINER_multipeermap_put (monitored_peers, peer,
+ m, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ }
+ else
+ {
+ if ( (m->state == state) &&
+ (m->state_timeout.abs_value_us == state_timeout.abs_value_us) &&
+ ((NULL == address) && (NULL == m->address)) )
+ {
+ return; /* No real change */
+ }
+ if ( (m->state == state) && ((NULL != address) && (NULL != m->address)) &&
+ (0 == GNUNET_HELLO_address_cmp(m->address, address)) )
+ return; /* No real change */
+ }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received address for peer `%s': %s\n",
- GNUNET_i2s (peer), address->transport_name);
- resolve_address (address, numeric);
+ if (NULL != m->address)
+ {
+ GNUNET_free (m->address);
+ m->address = NULL;
+ }
+ if (NULL != address)
+ m->address = GNUNET_HELLO_address_copy (address);
+ m->state = state;
+ m->state_timeout = state_timeout;
+
+ if (NULL != address)
+ resolve_peer_address (peer,
+ m->address,
+ numeric,
+ m->state,
+ m->state_timeout);
+ else
+ print_info (peer,
+ NULL,
+ NULL,
+ m->state,
+ m->state_timeout);
}
+
static void
-try_connect_cb (void *cls, const int result)
+try_connect_cb (void *cls,
+ const int result)
{
static int retries = 0;
+
if (GNUNET_OK == result)
{
tc_handle = NULL;
tc_handle = GNUNET_TRANSPORT_try_connect (handle, &pid, try_connect_cb,
NULL );
else
+ {
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to send connect request to transport service\n") );
+ if (GNUNET_SCHEDULER_NO_TASK != end)
+ GNUNET_SCHEDULER_cancel (end);
+ ret = 1;
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ return;
+ }
+}
+
+
+static void
+try_disconnect_cb (void *cls,
+ const int result)
+{
+ static int retries = 0;
+ if (GNUNET_OK == result)
+ {
+ tc_handle = NULL;
+ return;
+ }
+ retries++;
+ if (retries < 10)
+ tc_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid, try_disconnect_cb,
+ NULL );
+ else
{
FPRINTF (stderr, "%s",
_("Failed to send connect request to transport service\n") );
}
}
+
/**
* Function called with the result of the check if the 'transport'
* service is running.
}
counter = benchmark_send + benchmark_receive + iterate_connections
- + monitor_connections + monitor_connects + try_connect;
+ + monitor_connections + monitor_connects + try_connect + try_disconnect +
+ + iterate_validation + monitor_validation;
if (1 < counter)
{
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
NULL );
+ }
+ else if (try_disconnect) /* -D: Disconnect from peer */
+ {
+ if (NULL == cpid)
+ {
+ FPRINTF (stderr, _("Option `%s' makes no sense without option `%s'.\n"),
+ "-D", "-p");
+ ret = 1;
+ return;
+ }
+ handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive,
+ ¬ify_connect, ¬ify_disconnect);
+ if (NULL == handle)
+ {
+ FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") );
+ ret = 1;
+ return;
+ }
+ tc_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid, try_disconnect_cb,
+ NULL );
+ if (NULL == tc_handle)
+ {
+ FPRINTF (stderr, "%s",
+ _("Failed to send request to transport service\n") );
+ ret = 1;
+ return;
+ }
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
+ NULL );
+
}
else if (benchmark_send) /* -s: Benchmark sending */
{
{
address_resolution_in_progress = GNUNET_YES;
pic = GNUNET_TRANSPORT_monitor_peers (cfg, (NULL == cpid) ? NULL : &pid,
- GNUNET_YES, TIMEOUT, &process_peer_cb, (void *) cfg);
+ GNUNET_YES, TIMEOUT, &process_peer_iteration_cb, (void *) cfg);
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
NULL );
}
else if (monitor_connections) /* -m: List information about peers continuously */
{
+ monitored_peers = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
address_resolution_in_progress = GNUNET_YES;
pic = GNUNET_TRANSPORT_monitor_peers (cfg, (NULL == cpid) ? NULL : &pid,
- GNUNET_NO, TIMEOUT, &process_peer_cb, (void *) cfg);
+ GNUNET_NO, TIMEOUT, &process_peer_monitoring_cb, (void *) cfg);
+ }
+ else if (iterate_validation) /* -d: Print information about validations */
+ {
+ vic = GNUNET_TRANSPORT_monitor_validation_entries (cfg,
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_YES, TIMEOUT, &process_validation_cb, (void *) cfg);
+ }
+ else if (monitor_validation) /* -f: Print information about validations continuously */
+ {
+ vic = GNUNET_TRANSPORT_monitor_validation_entries (cfg,
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_NO, TIMEOUT, &process_validation_cb, (void *) cfg);
}
else if (monitor_connects) /* -e : Monitor (dis)connect events continuously */
{
monitor_connect_counter = 0;
handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL,
- &monitor_notify_connect, &monitor_notify_disconnect);
+ &monitor_notify_connect,
+ &monitor_notify_disconnect);
if (NULL == handle)
{
FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") );
0, &GNUNET_GETOPT_set_one, &iterate_all },
{ 'b', "benchmark", NULL,
gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"),
- 0, &GNUNET_GETOPT_set_one, &benchmark_receive }, { 'C', "connect",
+ 0, &GNUNET_GETOPT_set_one, &benchmark_receive },
+ { 'C', "connect",
NULL, gettext_noop ("connect to a peer"), 0,
&GNUNET_GETOPT_set_one, &try_connect },
+ { 'D', "disconnect",
+ NULL, gettext_noop ("disconnect to a peer"), 0,
+ &GNUNET_GETOPT_set_one, &try_disconnect },
+ { 'd', "validation", NULL,
+ gettext_noop ("print information for all pending validations "),
+ 0, &GNUNET_GETOPT_set_one, &iterate_validation },
+ { 'f', "monitorvalidation", NULL,
+ gettext_noop ("print information for all pending validations continously"),
+ 0, &GNUNET_GETOPT_set_one, &monitor_validation },
{ 'i', "information", NULL,
gettext_noop ("provide information about all current connections (once)"),
0, &GNUNET_GETOPT_set_one, &iterate_connections },
projects / oweals / gnunet.git / blobdiff