/*
This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
struct ValidationResolutionContext *prev;
- /**
- * Peer identity
- */
- struct GNUNET_PeerIdentity id;
-
/**
* Address to resolve
*/
*/
struct PeerResolutionContext *prev;
- /**
- * The peer id
- */
- struct GNUNET_PeerIdentity id;
-
/**
* address to resolve
*/
/**
* Task identifier for the timeout.
*/
- GNUNET_SCHEDULER_TaskIdentifier tsk;
+ struct GNUNET_SCHEDULER_Task * tsk;
/**
* Name of plugin under test.
/**
* Task scheduled for cleanup / termination of the process.
*/
-static GNUNET_SCHEDULER_TaskIdentifier end;
+static struct GNUNET_SCHEDULER_Task * end;
/**
* Task for operation timeout
*/
-static GNUNET_SCHEDULER_TaskIdentifier op_timeout;
+static struct GNUNET_SCHEDULER_Task * op_timeout;
/**
* Selected level of verbosity.
struct GNUNET_TIME_Relative duration;
struct ValidationResolutionContext *cur;
struct ValidationResolutionContext *next;
+ struct PeerResolutionContext *rc;
- end = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ end = NULL;
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
if (NULL != tc_handle)
{
next = cur->next;
GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
- GNUNET_CONTAINER_DLL_remove (vc_head, vc_tail, cur);
+ GNUNET_CONTAINER_DLL_remove (vc_head,
+ vc_tail,
+ cur);
GNUNET_free (cur->transport);
GNUNET_HELLO_address_free (cur->addrcp);
GNUNET_free (cur);
}
-
+ while (NULL != (rc = rc_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (rc_head,
+ rc_tail,
+ rc);
+ GNUNET_TRANSPORT_address_to_string_cancel (rc->asc);
+ GNUNET_free (rc->transport);
+ GNUNET_free (rc->addrcp);
+ GNUNET_free (rc);
+ }
if (NULL != th)
{
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
{
struct PeerResolutionContext *cur;
struct PeerResolutionContext *next;
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
if ((try_connect) || (benchmark_send) || (benchmark_receive))
{
FPRINTF (stdout,
_("Failed to connect to `%s'\n"),
GNUNET_i2s_full (&pid));
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
ret = 1;
FPRINTF (stdout,
"%s",
_("Failed to list connections, timeout occured\n"));
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
ret = 1;
static void
-run_nat_test ();
+run_nat_test (void);
/**
tc->name);
break;
default:
+ FPRINTF (stderr,
+ _("Configuration for plugin `%s' did not work!\n"),
+ tc->name);
break;
}
-
- if (GNUNET_YES != result)
- {
- FPRINTF (stderr,
- _("Configuration for plugin `%s' did not work!\n"),
- tc->name);
- }
- else
- {
- FPRINTF (stderr,
- _("Configuration for plugin `%s' is working!\n"),
- tc->name);
- }
- if (GNUNET_SCHEDULER_NO_TASK != tc->tsk)
+ if (NULL != tc->tsk)
{
GNUNET_SCHEDULER_cancel (tc->tsk);
- tc->tsk = GNUNET_SCHEDULER_NO_TASK;
+ tc->tsk = NULL;
}
if (NULL != tc->tst)
{
run_nat_test ();
}
+
/**
* Function called by NAT to report the outcome of the nat-test.
* Clean up and update GUI.
{
struct TestContext *tc = cls;
- display_test_result (tc, result);
+ display_test_result (tc,
+ result);
}
/**
* Resolve address we got a validation state for to a string.
*
- * @param id peer identity the address is for
* @param address the address itself
* @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup
* @param last_validation when was the address validated last
* @param state where are we in the validation state machine
*/
static void
-resolve_validation_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_validation_address (const struct GNUNET_HELLO_Address *address,
int numeric,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
{
FPRINTF (stderr,
"Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
vc->addrcp->transport_name,
(unsigned int) vc->addrcp->address_length);
}
FPRINTF (stdout,
_("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"),
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
(GNUNET_OK == res) ? address : "<invalid address>",
(monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "",
"Valid until : ", s_valid,
(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,
+ resolve_validation_address (vc->addrcp,
GNUNET_NO,
vc->last_validation,
vc->valid_until,
{
FPRINTF (stdout,
_("Peer `%s' %s `%s' \n"),
- GNUNET_i2s (&vc->id),
+ GNUNET_i2s (&vc->addrcp->peer),
"<unable to resolve address>",
GNUNET_TRANSPORT_vs2s (vc->state));
}
GNUNET_free (vc);
if ((0 == address_resolutions) && (iterate_validation))
{
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
{
GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_NO_TASK;
+ end = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
ret = 0;
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
/**
* Resolve address we got a validation state for to a string.
*
- * @param id peer identity the address is for
* @param address the address itself
* @param numeric #GNUNET_YES to disable DNS, #GNUNET_NO to try reverse lookup
* @param last_validation when was the address validated last
* @param state where are we in the validation state machine
*/
static void
-resolve_validation_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_validation_address (const struct GNUNET_HELLO_Address *address,
int numeric,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
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;
* Resolve address we got a validation state for to a string.
*
* @param cls NULL
- * @param peer peer identity the address is for
* @param address the address itself
* @param last_validation when was the address validated last
* @param valid_until until when is the address valid
*/
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)
{
- if ((NULL == peer) && (NULL == address))
+ if (NULL == address)
{
if (monitor_validation)
{
_("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)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
- resolve_validation_address (peer,
- address,
+ resolve_validation_address (address,
numeric,
last_validation,
valid_until,
(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);
+ (0 == strcasecmp (head->name, "udp"))
+ ? GNUNET_NO : GNUNET_YES,
+ (uint16_t) head->bnd_port,
+ (uint16_t) head->adv_port,
+ TIMEOUT,
+ &result_callback, head);
}
GNUNET_i2s_full (peer));
ret = 0;
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
if (benchmark_send)
{
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
if (verbosity > 0)
FPRINTF (stdout,
GNUNET_i2s_full (peer));
ret = 0;
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
{
FPRINTF (stdout, _("Disconnected from peer `%s' while benchmarking\n"),
GNUNET_i2s (&pid));
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
return;
}
}
+/**
+ * Convert address to a printable format.
+ *
+ * @param address the address
+ * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO
+ * to try to use reverse DNS
+ * @param state state the peer is in
+ * @param state_timeout when will the peer's state expire
+ */
static void
-resolve_peer_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_peer_address (const struct GNUNET_HELLO_Address *address,
int numeric,
enum GNUNET_TRANSPORT_PeerState state,
struct GNUNET_TIME_Absolute state_timeout);
{
FPRINTF (stderr,
"Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
- GNUNET_i2s (&rc->id),
+ GNUNET_i2s (&rc->addrcp->peer),
rc->addrcp->transport_name,
(unsigned int) rc->addrcp->address_length);
- print_info (&rc->id,
+ print_info (&rc->addrcp->peer,
rc->transport,
NULL,
rc->state,
}
if (GNUNET_OK == res)
{
- print_info (&rc->id,
+ print_info (&rc->addrcp->peer,
rc->transport,
address,
rc->state,
}
/* NULL == address, last call, we are done */
+ rc->asc = NULL;
GNUNET_assert (address_resolutions > 0);
address_resolutions--;
if (GNUNET_NO == rc->printed)
(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,
+ resolve_peer_address (rc->addrcp,
GNUNET_YES,
rc->state,
rc->state_timeout);
}
else
{
- print_info (&rc->id,
+ print_info (&rc->addrcp->peer,
rc->transport,
NULL,
rc->state,
GNUNET_free (rc);
if ((0 == address_resolutions) && (iterate_connections))
{
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
{
GNUNET_SCHEDULER_cancel (end);
- end = GNUNET_SCHEDULER_NO_TASK;
+ end = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = GNUNET_SCHEDULER_NO_TASK;
+ op_timeout = NULL;
}
ret = 0;
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task,
+ NULL);
}
}
+/**
+ * Convert address to a printable format and print it
+ * together with the given state data.
+ *
+ * @param address the address
+ * @param numeric #GNUNET_YES to convert to numeric format, #GNUNET_NO
+ * to try to use reverse DNS
+ * @param state state the peer is in
+ * @param state_timeout when will the peer's state expire
+ */
static void
-resolve_peer_address (const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_HELLO_Address *address,
+resolve_peer_address (const struct GNUNET_HELLO_Address *address,
int numeric,
enum GNUNET_TRANSPORT_PeerState state,
struct GNUNET_TIME_Absolute state_timeout)
struct PeerResolutionContext *rc;
rc = GNUNET_new (struct PeerResolutionContext);
- GNUNET_assert(NULL != rc);
- GNUNET_CONTAINER_DLL_insert(rc_head, rc_tail, rc);
+ GNUNET_CONTAINER_DLL_insert (rc_head,
+ rc_tail,
+ rc);
address_resolutions++;
-
- rc->id = (*id);
- rc->transport = GNUNET_strdup(address->transport_name);
+ rc->transport = GNUNET_strdup (address->transport_name);
rc->addrcp = GNUNET_HELLO_address_copy (address);
rc->printed = GNUNET_NO;
rc->state = state;
/* done */
address_resolution_in_progress = GNUNET_NO;
pic = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
(GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)))
return; /* Display only connected peers */
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
GNUNET_SCHEDULER_cancel (op_timeout);
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
&operation_timeout,
address->transport_name);
if (NULL != address)
- resolve_peer_address (peer, address, numeric, state, state_timeout);
+ resolve_peer_address (address,
+ numeric,
+ state,
+ state_timeout);
else
- print_info (peer, NULL, NULL, state, state_timeout);
+ print_info (peer,
+ NULL,
+ NULL,
+ state,
+ state_timeout);
}
/**
* Function called with information about a peers
*
- * @param cls closure
+ * @param cls closure, NULL
* @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,
return;
}
- if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
+ if (NULL != op_timeout)
GNUNET_SCHEDULER_cancel (op_timeout);
op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
&operation_timeout,
NULL);
- if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer)))
+ 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);
+ 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)))
+ (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)))
+ if ( (m->state == state) &&
+ (NULL != address) &&
+ (NULL != m->address) &&
+ (0 == GNUNET_HELLO_address_cmp(m->address, address)) )
return; /* No real change */
}
m->state_timeout = state_timeout;
if (NULL != address)
- resolve_peer_address (peer,
- m->address,
+ resolve_peer_address (m->address,
numeric,
m->state,
m->state_timeout);
FPRINTF (stderr,
"%s",
_("Failed to send connect request to transport service\n"));
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
ret = 1;
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
FPRINTF (stderr, "%s",
_("Failed to send disconnect request to transport service\n"));
- if (GNUNET_SCHEDULER_NO_TASK != end)
+ if (NULL != end)
GNUNET_SCHEDULER_cancel (end);
ret = 1;
end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
else if (monitor_connections) /* -m: List information about peers continuously */
{
- monitored_peers = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ 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_monitoring_cb, (void *) cfg);
+ pic = GNUNET_TRANSPORT_monitor_peers (cfg,
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_NO,
+ TIMEOUT,
+ &process_peer_monitoring_cb, NULL);
}
else if (monitor_plugins) /* -P: List information about plugins continuously */
{