}
/**
- * 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);
}
-/**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
- *
- * @param cls test context
- * @param tc scheduler callback
- */
-static void
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct TestContext *tstc = cls;
-
- tstc->tsk = GNUNET_SCHEDULER_NO_TASK;
- display_test_result (tstc, NAT_TEST_TIMEOUT);
-}
-
-
static void
resolve_validation_address (const struct GNUNET_PeerIdentity *id,
const struct GNUNET_HELLO_Address *address,
enum GNUNET_TRANSPORT_ValidationState state);
+
+/**
+ * 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 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_validation_string (void *cls, const char *address)
+process_validation_string (void *cls,
+ const char *address,
+ int res)
{
struct ValidationResolutionContext *vc = cls;
char *s_valid;
char *s_last;
char *s_next;
- if (address != NULL )
+ 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");
+ s_valid = GNUNET_strdup ("never");
else
- s_valid = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->valid_until));
+ 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");
+ s_last = GNUNET_strdup ("never");
else
- s_last = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->last_validation));
+ 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");
+ s_next = GNUNET_strdup ("never");
else
- s_next = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string (vc->next_validation));
+ 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), address,
- (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "",
- "Valid until : ", s_valid,
- "Last validation: ",s_last,
- "Next validation: ", s_next);
+ _("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;
}
- else
+ /* last call, we are done */
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if ( (GNUNET_SYSERR == res) &&
+ (GNUNET_NO == vc->printed) )
{
- /* done */
- GNUNET_assert(address_resolutions > 0);
- address_resolutions--;
- if (GNUNET_NO == vc->printed)
+ if (numeric == GNUNET_NO)
{
- if (numeric == GNUNET_NO)
- {
- /* Failed to resolve address, try numeric lookup */
- 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));
- }
+ /* 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);
}
- 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))
+ else
{
- 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 );
+ 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)
+ 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->next_validation = next_validation;
/* Resolve address to string */
- vc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
- RESOLUTION_TIMEOUT, &process_validation_string, vc);
+ vc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ numeric,
+ RESOLUTION_TIMEOUT,
+ &process_validation_string, vc);
}
{
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)
(0 == strcasecmp (head->name, "udp")) ? GNUNET_NO : GNUNET_YES,
(uint16_t) head->bnd_port,
(uint16_t) head->adv_port,
+ TIMEOUT,
&result_callback, head);
- if (NULL == head->tst)
- {
- display_test_result (head, NAT_TEST_FAILED_TO_START);
- return;
- }
- head->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, head);
}
return size;
}
+
/**
* Function called to notify transport users that another
* peer connected to us.
* @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;
* @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 ();
if ( ((GNUNET_YES == iterate_connections) && (GNUNET_YES == iterate_all)) ||
(GNUNET_YES == monitor_connections) )
{
- 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));
+ 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 if ( (GNUNET_YES == iterate_connections) &&
(GNUNET_TRANSPORT_is_connected(state)) )
{
/* Only connected peers, skip state */
- FPRINTF (stdout, _("Peer `%s': %s %s\n"), GNUNET_i2s (id), transport, addr);
+ 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)
+process_peer_string (void *cls,
+ const char *address,
+ int res)
{
struct PeerResolutionContext *rc = cls;
- if (address != NULL )
+ if (NULL != address)
{
- print_info (&rc->id, rc->transport, address, rc->state, rc->state_timeout);
- rc->printed = GNUNET_YES;
+ if (GNUNET_SYSERR == res)
+ {
+ 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;
+ }
+ if (GNUNET_OK == res)
+ {
+ 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;
}
- else
+ /* NULL == address, last call, we are done */
+
+ GNUNET_assert (address_resolutions > 0);
+ address_resolutions--;
+ if (GNUNET_NO == rc->printed)
{
- /* done */
- GNUNET_assert(address_resolutions > 0);
- address_resolutions--;
- if (GNUNET_NO == rc->printed)
+ if (numeric == GNUNET_NO)
{
- if (numeric == GNUNET_NO)
- {
- /* Failed to resolve address, try numeric lookup */
- resolve_peer_address (&rc->id, rc->addrcp, GNUNET_YES,
- rc->state, rc->state_timeout);
- }
- else
- {
- print_info (&rc->id, rc->transport, "<unable to resolve address>",
- rc->state, rc->state_timeout);
- }
+ /* 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);
}
- 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))
+ else
{
- 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,
+ 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 );
+ }
}
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_peer_string, rc);
+ rc->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ address,
+ numeric,
+ RESOLUTION_TIMEOUT,
+ &process_peer_string, rc);
}
* 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_iteration_cb (void *cls,
{
if (NULL == peer)
{
- if (monitor_connections)
- {
- FPRINTF (stdout,
- _("Monitor disconnected from transport service. Reconnecting.\n"));
- return;
- }
/* done */
address_resolution_in_progress = GNUNET_NO;
pic = NULL;
return;
}
- if ((GNUNET_NO == iterate_all) && (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)) )
+ 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 );
+ 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);
+ 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);
*
*/
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)
+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 (peer == NULL )
+ if (NULL == peer)
{
- /* done */
- address_resolution_in_progress = GNUNET_NO;
- pic = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != end)
- GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+ 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->state_timeout = state_timeout;
if (NULL != address)
- resolve_peer_address (peer, m->address, numeric, m->state, m->state_timeout);
+ resolve_peer_address (peer,
+ m->address,
+ numeric,
+ m->state,
+ m->state_timeout);
else
- print_info (peer, NULL, NULL, m->state, m->state_timeout);
+ 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;
NULL );
else
{
- FPRINTF (stderr, "%s",
- _("Failed to send connect request to transport service\n") );
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to send connect request to transport service\n") );
if (GNUNET_SCHEDULER_NO_TASK != end)
GNUNET_SCHEDULER_cancel (end);
ret = 1;
}
}
+
static void
-try_disconnect_cb (void *cls, const int result)
+try_disconnect_cb (void *cls,
+ const int result)
{
static int retries = 0;
if (GNUNET_OK == result)
}
}
+
/**
* Function called with the result of the check if the 'transport'
* service is running.
{
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") );