/*
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
* Should match NAT_SERVER_TIMEOUT in 'nat_test.c'.
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
+
+/**
+ * Timeout for a name resolution
+ */
#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
+/**
+ * Timeout for an operations
+ */
#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+/**
+ * Context to store name resolutions for valiation
+ */
struct ValidationResolutionContext
{
+ /**
+ * Next in DLL
+ */
struct ValidationResolutionContext *next;
+ /**
+ * Previous in DLL
+ */
struct ValidationResolutionContext *prev;
- struct GNUNET_PeerIdentity id;
-
+ /**
+ * Address to resolve
+ */
struct GNUNET_HELLO_Address *addrcp;
+ /**
+ * Time of last validation
+ */
struct GNUNET_TIME_Absolute last_validation;
+ /**
+ * Address is valid until
+ */
struct GNUNET_TIME_Absolute valid_until;
+ /**
+ * Time of next validation
+ */
struct GNUNET_TIME_Absolute next_validation;
+ /**
+ * state of validation process
+ */
enum GNUNET_TRANSPORT_ValidationState state;
+ /**
+ * Tranport conversion handle
+ */
struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+ /**
+ * plugin name
+ */
char *transport;
+ /**
+ * was the entry printed
+ */
int printed;
};
-
+/**
+ * Struct to store information about peers in monitor mode
+ */
struct MonitoredPeer
{
+ /**
+ * State of the peer
+ */
enum GNUNET_TRANSPORT_PeerState state;
+ /**
+ * Timeout
+ */
struct GNUNET_TIME_Absolute state_timeout;
+ /**
+ * The address to convert
+ */
struct GNUNET_HELLO_Address *address;
};
-
+/**
+ * Context to store name resolutions for valiation
+ */
struct PeerResolutionContext
{
+ /**
+ * Next in DLL
+ */
struct PeerResolutionContext *next;
+
+ /**
+ * Prev in DLL
+ */
struct PeerResolutionContext *prev;
- struct GNUNET_PeerIdentity id;
+
+ /**
+ * address to resolve
+ */
struct GNUNET_HELLO_Address *addrcp;
+
+ /**
+ * transport conversiion context
+ */
struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+
+ /**
+ * peer state
+ */
enum GNUNET_TRANSPORT_PeerState state;
+
+ /**
+ * state timeout
+ */
struct GNUNET_TIME_Absolute state_timeout;
+
+ /**
+ * transport plugin
+ */
char *transport;
+
+ /**
+ * was the entry printed
+ */
int printed;
};
/**
* Task identifier for the timeout.
*/
- GNUNET_SCHEDULER_TaskIdentifier tsk;
+ struct GNUNET_SCHEDULER_Task * tsk;
/**
* Name of plugin under test.
static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Try_connect handle
+ * Try connect handle
*/
struct GNUNET_TRANSPORT_TryConnectHandle *tc_handle;
+/**
+ * Try disconnect handle
+ */
+struct GNUNET_TRANSPORT_TryDisconnectHandle *td_handle;
+
/**
* Option -s.
*/
*/
static int monitor_validation;
+/**
+ * Option -P.
+ */
+static int monitor_plugins;
+
/**
* Option -C.
*/
static struct GNUNET_CONTAINER_MultiPeerMap *monitored_peers;
/**
- *
+ * Map storing information about monitored plugins's sessions.
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *monitored_plugins;
+
+/**
+ * Handle if we are monitoring peers at the transport level.
*/
static struct GNUNET_TRANSPORT_PeerMonitoringContext *pic;
/**
- *
+ * Handle if we are monitoring transport validation activity.
*/
static struct GNUNET_TRANSPORT_ValidationMonitoringContext *vic;
+/**
+ * Handle if we are monitoring plugin session activity.
+ */
+static struct GNUNET_TRANSPORT_PluginMonitor *pm;
+
/**
* Identity of the peer we transmit to / connect to.
* (equivalent to 'cpid' string).
/**
* 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 TestContext *tail;
+/**
+ * DLL: head of validation resolution entries
+ */
static struct ValidationResolutionContext *vc_head;
+/**
+ * DLL: tail of validation resolution entries
+ */
static struct ValidationResolutionContext *vc_tail;
+/**
+ * DLL: head of resolution entries
+ */
static struct PeerResolutionContext *rc_head;
+/**
+ * DLL: head of resolution entries
+ */
static struct PeerResolutionContext *rc_tail;
+/**
+ * Function called to release data stored in the #monitored_peers map.
+ *
+ * @param cls unused
+ * @param key the peer identity
+ * @param value a `struct MonitoredPeer` to release
+ * @return #GNUNET_OK (continue to iterate)
+ */
static int
destroy_it (void *cls,
const struct GNUNET_PeerIdentity *key,
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)
{
GNUNET_TRANSPORT_monitor_validation_entries_cancel (vic);
vic = NULL;
}
+ if (NULL != pm)
+ {
+ GNUNET_TRANSPORT_monitor_plugins_cancel (pm);
+ pm = 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_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);
GNUNET_CONTAINER_multipeermap_destroy (monitored_peers);
monitored_peers = NULL;
}
+ if (NULL != monitored_plugins)
+ {
+ GNUNET_break (0 ==
+ GNUNET_CONTAINER_multipeermap_size (monitored_plugins));
+ GNUNET_CONTAINER_multipeermap_destroy (monitored_plugins);
+ monitored_plugins = NULL;
+ }
}
{
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.
*
* @param cls test context
- * @param success currently always #GNUNET_OK
- * @param emsg error message, NULL on success
+ * @param result status code
*/
static void
result_callback (void *cls,
{
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,
/**
* 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
+ * textual representations, and a last time with @a address being NULL
+ * to signal the end of the iteration. Note that @a address NULL
* always is the last call, regardless of the value in @a res.
*
* @param cls closure
if (GNUNET_SYSERR == res)
{
FPRINTF (stderr,
- "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
- GNUNET_i2s (&vc->id),
+ "Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
+ GNUNET_i2s (&vc->addrcp->peer),
vc->addrcp->transport_name,
- vc->addrcp->address_length);
+ (unsigned int) vc->addrcp->address_length);
}
if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us)
s_valid = GNUNET_strdup ("never");
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);
/**
* 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
+ * textual representations, and a last time with @a address being NULL
+ * to signal the end of the iteration. Note that @a address NULL
* always is the last call, regardless of the value in @a res.
*
* @param cls closure
if (GNUNET_SYSERR == res)
{
FPRINTF (stderr,
- "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
- GNUNET_i2s (&rc->id),
+ "Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
+ GNUNET_i2s (&rc->addrcp->peer),
rc->addrcp->transport_name,
- rc->addrcp->address_length);
- print_info (&rc->id,
+ (unsigned int) rc->addrcp->address_length);
+ 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
+ * Context for address resolution by #plugin_monitoring_cb().
+ */
+struct PluginMonitorAddress
+{
+
+ /**
+ * Ongoing resolution request.
+ */
+ struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+
+ /**
+ * Resolved address as string.
+ */
+ char *str;
+};
+
+
+/**
+ * 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 @a address being NULL
+ * to signal the end of the iteration. Note that @a 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
+address_cb (void *cls,
+ const char *address,
+ int res)
+{
+ struct PluginMonitorAddress *addr = cls;
+
+ if (NULL == address)
+ {
+ addr->asc = NULL;
+ return;
+ }
+ if (NULL != addr->str)
+ return;
+ addr->str = GNUNET_strdup (address);
+}
+
+
+/**
+ * Function called by the plugin with information about the
+ * current sessions managed by the plugin (for monitoring).
+ *
+ * @param cls closure (NULL)
+ * @param session session handle this information is about,
+ * NULL to indicate that we are "in sync" (initial
+ * iteration complete)
+ * @param session_ctx storage location where the application
+ * can store data; will point to NULL on #GNUNET_TRANSPORT_SS_INIT,
+ * and must be reset to NULL on #GNUNET_TRANSPORT_SS_DONE
+ * @param info information about the state of the session,
+ * NULL if @a session is also NULL and we are
+ * merely signalling that the initial iteration is over;
+ * NULL with @a session being non-NULL if the monitor
+ * was being cancelled while sessions were active
+ */
+static void
+plugin_monitoring_cb (void *cls,
+ struct GNUNET_TRANSPORT_PluginSession *session,
+ void **session_ctx,
+ const struct GNUNET_TRANSPORT_SessionInfo *info)
+{
+ const char *state;
+ struct PluginMonitorAddress *addr;
+
+ if ( (NULL == info) &&
+ (NULL == session) )
+ return; /* in sync with transport service */
+ addr = *session_ctx;
+ if (NULL == info)
+ {
+ if (NULL != addr)
+ {
+ if (NULL != addr->asc)
+ {
+ GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
+ addr->asc = NULL;
+ }
+ GNUNET_free_non_null (addr->str);
+ GNUNET_free (addr);
+ *session_ctx = NULL;
+ }
+ return; /* shutdown */
+ }
+ if ( (NULL != cpid) &&
+ (0 != memcmp (&info->address->peer,
+ cpid,
+ sizeof (struct GNUNET_PeerIdentity))) )
+ return; /* filtered */
+ if (NULL == addr)
+ {
+ addr = GNUNET_new (struct PluginMonitorAddress);
+ addr->asc = GNUNET_TRANSPORT_address_to_string (cfg,
+ info->address,
+ GNUNET_NO,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &address_cb,
+ addr);
+ *session_ctx = addr;
+ }
+ switch (info->state)
+ {
+ case GNUNET_TRANSPORT_SS_INIT:
+ state = "INIT";
+ break;
+ case GNUNET_TRANSPORT_SS_HANDSHAKE:
+ state = "HANDSHAKE";
+ break;
+ case GNUNET_TRANSPORT_SS_UP:
+ state = "UP";
+ break;
+ case GNUNET_TRANSPORT_SS_UPDATE:
+ state = "UPDATE";
+ break;
+ case GNUNET_TRANSPORT_SS_DONE:
+ state = "DONE";
+ break;
+ default:
+ state = "UNKNOWN";
+ break;
+ }
+ fprintf (stdout,
+ "%s: %s %s (# %u/%u b) blocked until %s timeout in %s [%s]\n",
+ GNUNET_i2s (&info->address->peer),
+ addr->str,
+ (info->is_inbound == GNUNET_YES) ? "<-" : ((info->is_inbound == GNUNET_NO) ? "->" : "<>"),
+ info->num_msg_pending,
+ info->num_bytes_pending,
+ GNUNET_STRINGS_absolute_time_to_string (info->receive_delay),
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (info->session_timeout),
+ GNUNET_YES),
+ state);
+ if (GNUNET_TRANSPORT_SS_DONE == info->state)
+ {
+ if (NULL != addr->asc)
+ {
+ GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
+ addr->asc = NULL;
+ }
+ GNUNET_free_non_null (addr->str);
+ GNUNET_free (addr);
+ *session_ctx = NULL;
+ }
+}
+
+
+/**
+ * Function called with information about a peers
+ *
+ * @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);
}
+/**
+ * Function called with our result of trying to connect to a peer
+ * using the transport service. Will retry 10 times, and if we still
+ * fail to connect terminate with an error message.
+ *
+ * @param cls NULL
+ * @param result #GNUNET_OK if we connected to the service
+ */
static void
try_connect_cb (void *cls,
const int result)
{
static int retries = 0;
+ tc_handle = NULL;
if (GNUNET_OK == result)
- {
- tc_handle = NULL;
return;
- }
retries++;
if (retries < 10)
- 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);
+ tc_handle = GNUNET_TRANSPORT_try_connect (handle,
+ &pid,
+ &try_connect_cb,
+ NULL);
return;
}
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to send connect request to transport service\n"));
+ if (NULL != end)
+ GNUNET_SCHEDULER_cancel (end);
+ ret = 1;
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
+/**
+ * Function called with our result of trying to disconnect a peer
+ * using the transport service. Will retry 10 times, and if we still
+ * fail to disconnect, terminate with an error message.
+ *
+ * @param cls NULL
+ * @param result #GNUNET_OK if we connected to the service
+ */
static void
try_disconnect_cb (void *cls,
const int result)
{
static int retries = 0;
+
+ td_handle = NULL;
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"));
- if (GNUNET_SCHEDULER_NO_TASK != end)
- GNUNET_SCHEDULER_cancel (end);
- ret = 1;
- end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+ td_handle = GNUNET_TRANSPORT_try_disconnect (handle,
+ &pid,
+ &try_disconnect_cb,
+ NULL);
return;
}
+ FPRINTF (stderr, "%s",
+ _("Failed to send disconnect request to transport service\n"));
+ if (NULL != end)
+ GNUNET_SCHEDULER_cancel (end);
+ ret = 1;
+ end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
* @param result #GNUNET_YES if transport is running
*/
static void
-testservice_task (void *cls, int result)
+testservice_task (void *cls,
+ int result)
{
int counter = 0;
ret = 1;
counter = benchmark_send + benchmark_receive + iterate_connections
+ monitor_connections + monitor_connects + try_connect + try_disconnect +
- + iterate_validation + monitor_validation;
+ + iterate_validation + monitor_validation + monitor_plugins;
if (1 < counter)
{
FPRINTF (stderr,
- _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s\n"),
+ _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"),
"connect", "benchmark send", "benchmark receive", "information",
- "monitor", "events");
+ "monitor", "events", "plugins");
return;
}
if (0 == counter)
{
FPRINTF (stderr,
- _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"),
+ _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"),
"connect", "benchmark send", "benchmark receive", "information",
- "monitor", "events");
+ "monitor", "events", "plugins");
return;
}
ret = 1;
return;
}
- tc_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid, try_disconnect_cb,
- NULL);
- if (NULL == tc_handle)
+ td_handle = GNUNET_TRANSPORT_try_disconnect (handle, &pid,
+ &try_disconnect_cb,
+ NULL);
+ if (NULL == td_handle)
{
FPRINTF (stderr, "%s",
_("Failed to send request to transport service\n"));
ret = 1;
return;
}
- handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
+ 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_connect (handle, &pid, try_connect_cb,
- NULL);
+ tc_handle = GNUNET_TRANSPORT_try_connect (handle,
+ &pid,
+ &try_connect_cb,
+ NULL);
if (NULL == tc_handle)
{
FPRINTF (stderr, "%s",
return;
}
start_time = GNUNET_TIME_absolute_get ();
- op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
- NULL);
+ op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
+ &operation_timeout,
+ NULL);
}
else if (benchmark_receive) /* -b: Benchmark receiving */
{
}
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 */
+ {
+ monitored_plugins = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+ pm = GNUNET_TRANSPORT_monitor_plugins (cfg,
+ &plugin_monitoring_cb,
+ NULL);
}
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);
+ (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);
+ (NULL == cpid) ? NULL : &pid,
+ GNUNET_NO, TIMEOUT,
+ &process_validation_cb, (void *) cfg);
}
else if (monitor_connects) /* -e : Monitor (dis)connect events continuously */
{
&monitor_notify_disconnect);
if (NULL == handle)
{
- FPRINTF (stderr, "%s", _("Failed to connect to transport service\n"));
+ FPRINTF (stderr,
+ "%s",
+ _("Failed to connect to transport service\n"));
ret = 1;
return;
}
end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
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"),
+ gettext_noop ("print information for all pending validations continuously"),
0, &GNUNET_GETOPT_set_one, &monitor_validation },
{ 'i', "information", NULL,
gettext_noop ("provide information about all current connections (once)"),
{ 'p', "peer", "PEER",
gettext_noop ("peer identity"), 1, &GNUNET_GETOPT_set_string,
&cpid },
+ { 'P', "plugins", NULL,
+ gettext_noop ("monitor plugin sessions"), 0, &GNUNET_GETOPT_set_one,
+ &monitor_plugins },
{ 's', "send", NULL, gettext_noop
("send data for benchmarking to the other peer (until CTRL-C)"), 0,
&GNUNET_GETOPT_set_one, &benchmark_send },