This file is part of GNUnet.
Copyright (C) 2011-2014, 2016, 2017 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @brief Tool to help configure, measure and control the transport subsystem.
* @author Christian Grothoff
* @author Nathan Evans
- *
- * This utility can be used to test if a transport mechanism for
- * GNUnet is properly configured.
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_resolver_service.h"
#include "gnunet_protocols.h"
#include "gnunet_transport_service.h"
-#include "gnunet_transport_core_service.h"
-#include "gnunet_nat_lib.h"
-
-/**
- * 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, 20)
/**
* Timeout for a name resolution
*/
-#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define RESOLUTION_TIMEOUT \
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
/**
* Timeout for an operation
};
-/**
- * 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.
- */
- struct GNUNET_NAT_Test *tst;
-
- /**
- * Task identifier for the timeout.
- */
- struct GNUNET_SCHEDULER_Task *tsk;
-
- /**
- * Name of plugin under test.
- */
- char *name;
-
- /**
- * Bound port
- */
- unsigned long long bnd_port;
-
- /**
- * Advertised ports
- */
- unsigned long long adv_port;
-
-};
-
-
/**
* Benchmarking block size in KB
*/
#define BLOCKSIZE 4
-/**
- * Which peer should we connect to?
- */
-static char *cpid;
-
/**
* Handle to transport service.
*/
*/
static int iterate_all;
-/**
- * Option -t.
- */
-static int test_configuration;
-
/**
* Option -c.
*/
/**
* Identity of the peer we transmit to / connect to.
- * (equivalent to 'cpid' string).
+ * ('-p' command-line option).
*/
static struct GNUNET_PeerIdentity pid;
/**
* Selected level of verbosity.
*/
-static int verbosity;
+static unsigned int verbosity;
/**
* Resolver process handle.
*/
static unsigned int address_resolutions;
-/**
- * DLL for NAT Test Contexts: head
- */
-static struct TestContext *head;
-
-/**
- * DLL for NAT Test Contexts: tail
- */
-static struct TestContext *tail;
-
/**
* DLL: head of validation resolution entries
*/
* @return #GNUNET_OK (continue to iterate)
*/
static int
-destroy_it (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
+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_assert (
+ GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_remove (monitored_peers, key, value));
GNUNET_free_non_null (m->address);
GNUNET_free (value);
return GNUNET_OK;
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_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
GNUNET_TRANSPORT_address_to_string_cancel (rc->asc);
GNUNET_free (rc->transport);
GNUNET_free (rc->addrcp);
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
FPRINTF (stdout,
- _("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
+ _ ("Transmitted %llu bytes/s (%llu bytes in %s)\n"),
1000LL * 1000LL * traffic_sent / (1 + duration.rel_value_us),
traffic_sent,
- GNUNET_STRINGS_relative_time_to_string (duration,
- GNUNET_YES));
+ GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
}
if (benchmark_receive)
{
duration = GNUNET_TIME_absolute_get_duration (start_time);
FPRINTF (stdout,
- _("Received %llu bytes/s (%llu bytes in %s)\n"),
+ _ ("Received %llu bytes/s (%llu bytes in %s)\n"),
1000LL * 1000LL * traffic_received / (1 + duration.rel_value_us),
traffic_received,
- GNUNET_STRINGS_relative_time_to_string (duration,
- GNUNET_YES));
+ 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_iterate (monitored_peers, &destroy_it, NULL);
GNUNET_CONTAINER_multipeermap_destroy (monitored_peers);
monitored_peers = NULL;
}
if (NULL != monitored_plugins)
{
- GNUNET_break (0 ==
- GNUNET_CONTAINER_multipeermap_size (monitored_plugins));
+ GNUNET_break (0 == GNUNET_CONTAINER_multipeermap_size (monitored_plugins));
GNUNET_CONTAINER_multipeermap_destroy (monitored_plugins);
monitored_plugins = NULL;
}
op_timeout = NULL;
if ((benchmark_send) || (benchmark_receive))
{
- FPRINTF (stdout,
- _("Failed to connect to `%s'\n"),
- GNUNET_i2s_full (&pid));
+ FPRINTF (stdout, _ ("Failed to connect to `%s'\n"), GNUNET_i2s_full (&pid));
GNUNET_SCHEDULER_shutdown ();
ret = 1;
return;
{
next = cur->next;
FPRINTF (stdout,
- _("Failed to resolve address for peer `%s'\n"),
+ _ ("Failed to resolve address for peer `%s'\n"),
GNUNET_i2s (&cur->addrcp->peer));
- GNUNET_CONTAINER_DLL_remove(rc_head, rc_tail, cur);
+ 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);
-
+ GNUNET_free (cur->transport);
+ GNUNET_free (cur->addrcp);
+ GNUNET_free (cur);
}
FPRINTF (stdout,
"%s",
- _("Failed to list connections, timeout occured\n"));
+ _ ("Failed to list connections, timeout occurred\n"));
GNUNET_SCHEDULER_shutdown ();
ret = 1;
return;
}
-static void
-run_nat_test (void);
-
-
-/**
- * Display the result of the test.
- *
- * @param tc test context
- * @param result #GNUNET_YES on success
- */
-static void
-display_test_result (struct TestContext *tc,
- enum GNUNET_NAT_StatusCode result)
-{
- FPRINTF (stderr,
- _("NAT plugin `%s' reports: %s\n"),
- tc->name,
- GNUNET_NAT_status2string (result));
- if (NULL != tc->tsk)
- {
- GNUNET_SCHEDULER_cancel (tc->tsk);
- tc->tsk = NULL;
- }
- if (NULL != tc->tst)
- {
- GNUNET_NAT_test_stop (tc->tst);
- tc->tst = NULL;
- }
-
- 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 to report the outcome of the nat-test.
- * Clean up and update GUI.
- *
- * @param cls test context
- * @param result status code
- */
-static void
-result_callback (void *cls,
- enum GNUNET_NAT_StatusCode result)
-{
- struct TestContext *tc = cls;
-
- display_test_result (tc,
- result);
-}
-
-
-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.).
- *
- * @param cfg configuration to test
- */
-static void
-do_test_configuration (const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- char *plugins;
- char *tok;
- unsigned long long bnd_port;
- unsigned long long adv_port;
- struct TestContext *tc;
- char *binary;
-
- if (GNUNET_OK
- != GNUNET_CONFIGURATION_get_value_string (cfg, "transport", "plugins",
- &plugins))
- {
- FPRINTF (stderr, "%s", _
- ("No transport plugins configured, peer will never communicate\n"));
- 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",
- &bnd_port))
- {
- FPRINTF (stderr,
- _("No port configured for plugin `%s', cannot test it\n"), tok);
- continue;
- }
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg, section,
- "ADVERTISED_PORT", &adv_port))
- adv_port = bnd_port;
-
- tc = GNUNET_new (struct TestContext);
- tc->name = GNUNET_strdup (tok);
- 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)
- {
- FPRINTF (stderr, _("Failed to start resolver!\n"));
- return;
- }
-
- GNUNET_free(binary);
- GNUNET_RESOLVER_connect (cfg);
- run_nat_test ();
- }
-}
-
-
/**
* Function called to notify a client about the socket
* begin ready to queue more data. Sends another message.
struct GNUNET_MessageHeader *m;
struct GNUNET_MQ_Envelope *env;
- env = GNUNET_MQ_msg_extra (m,
- BLOCKSIZE * 1024,
- GNUNET_MESSAGE_TYPE_DUMMY);
- memset (&m[1],
- 52,
- BLOCKSIZE * 1024 - sizeof(struct GNUNET_MessageHeader));
+ env = GNUNET_MQ_msg_extra (m, BLOCKSIZE * 1024, GNUNET_MESSAGE_TYPE_DUMMY);
+ memset (&m[1], 52, BLOCKSIZE * 1024 - sizeof (struct GNUNET_MessageHeader));
traffic_sent += BLOCKSIZE * 1024;
- GNUNET_MQ_notify_sent (env,
- &do_send,
- mq);
+ GNUNET_MQ_notify_sent (env, &do_send, mq);
if (verbosity > 0)
FPRINTF (stdout,
- _("Transmitting %u bytes\n"),
- (unsigned int) BLOCKSIZE * 1024);
- GNUNET_MQ_send (mq,
- env);
+ _ ("Transmitting %u bytes\n"),
+ (unsigned int) BLOCKSIZE * 1024);
+ GNUNET_MQ_send (mq, env);
}
static void *
notify_connect (void *cls,
const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_MQ_Handle *mq)
+ struct GNUNET_MQ_Handle *mq)
{
- if (0 != memcmp (&pid,
- peer,
- sizeof(struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
return NULL;
ret = 0;
if (! benchmark_send)
op_timeout = NULL;
}
if (verbosity > 0)
- FPRINTF (stdout,
- _("Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"),
- GNUNET_i2s (peer),
- BLOCKSIZE);
+ FPRINTF (
+ stdout,
+ _ (
+ "Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"),
+ GNUNET_i2s (peer),
+ BLOCKSIZE);
start_time = GNUNET_TIME_absolute_get ();
do_send (mq);
return mq;
static void
notify_disconnect (void *cls,
const struct GNUNET_PeerIdentity *peer,
- void *internal_cls)
+ void *internal_cls)
{
- if (0 != memcmp (&pid,
- peer,
- sizeof(struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&pid, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
if (NULL == internal_cls)
return; /* not about target peer */
if (! benchmark_send)
return; /* not transmitting */
FPRINTF (stdout,
- _("Disconnected from peer `%s' while benchmarking\n"),
- GNUNET_i2s (&pid));
+ _ ("Disconnected from peer `%s' while benchmarking\n"),
+ GNUNET_i2s (&pid));
}
static void *
monitor_notify_connect (void *cls,
const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_MQ_Handle *mq)
+ struct GNUNET_MQ_Handle *mq)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
monitor_connect_counter++;
FPRINTF (stdout,
- _("%24s: %-17s %4s (%u connections in total)\n"),
+ _ ("%24s: %-17s %4s (%u connections in total)\n"),
now_str,
- _("Connected to"),
+ _ ("Connected to"),
GNUNET_i2s (peer),
monitor_connect_counter);
return NULL;
static void
monitor_notify_disconnect (void *cls,
const struct GNUNET_PeerIdentity *peer,
- void *internal_cls)
+ void *internal_cls)
{
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);
+ GNUNET_assert (monitor_connect_counter > 0);
monitor_connect_counter--;
FPRINTF (stdout,
- _("%24s: %-17s %4s (%u connections in total)\n"),
+ _ ("%24s: %-17s %4s (%u connections in total)\n"),
now_str,
- _("Disconnected from"),
+ _ ("Disconnected from"),
GNUNET_i2s (peer),
monitor_connect_counter);
}
* @return #GNUNET_OK
*/
static int
-check_dummy (void *cls,
- const struct GNUNET_MessageHeader *message)
+check_dummy (void *cls, const struct GNUNET_MessageHeader *message)
{
return GNUNET_OK; /* all messages are fine */
}
* @param message the message
*/
static void
-handle_dummy (void *cls,
- const struct GNUNET_MessageHeader *message)
+handle_dummy (void *cls, const struct GNUNET_MessageHeader *message)
{
if (! benchmark_receive)
return;
if (verbosity > 0)
FPRINTF (stdout,
- _("Received %u bytes\n"),
- (unsigned int) ntohs (message->size));
+ _ ("Received %u bytes\n"),
+ (unsigned int) ntohs (message->size));
if (0 == traffic_received)
start_time = GNUNET_TIME_absolute_get ();
traffic_received += ntohs (message->size);
struct GNUNET_TIME_Absolute state_timeout)
{
- if ( ((GNUNET_YES == iterate_connections) &&
- (GNUNET_YES == iterate_all)) ||
- (GNUNET_YES == monitor_connections))
+ 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"),
+ _ ("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)) )
+ else if ((GNUNET_YES == iterate_connections) &&
+ (GNUNET_TRANSPORT_is_connected (state)))
{
/* Only connected peers, skip state */
FPRINTF (stdout,
- _("Peer `%s': %s %s\n"),
+ _ ("Peer `%s': %s %s\n"),
GNUNET_i2s (id),
transport,
addr);
* if #GNUNET_SYSERR: communication error (IPC error)
*/
static void
-process_peer_string (void *cls,
- const char *address,
- int res)
+process_peer_string (void *cls, const char *address, int res)
{
struct PeerResolutionContext *rc = cls;
{
if (GNUNET_SYSERR == res)
{
- FPRINTF (stderr,
- "Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
- GNUNET_i2s (&rc->addrcp->peer),
- rc->addrcp->transport_name,
- (unsigned int) rc->addrcp->address_length);
+ FPRINTF (
+ stderr,
+ "Failed to convert address for peer `%s' plugin `%s' length %u to string \n",
+ GNUNET_i2s (&rc->addrcp->peer),
+ rc->addrcp->transport_name,
+ (unsigned int) rc->addrcp->address_length);
print_info (&rc->addrcp->peer,
rc->transport,
NULL,
struct PeerResolutionContext *rc;
rc = GNUNET_new (struct PeerResolutionContext);
- GNUNET_CONTAINER_DLL_insert (rc_head,
- rc_tail,
- rc);
+ GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
address_resolutions++;
rc->transport = GNUNET_strdup (address->transport_name);
rc->addrcp = GNUNET_HELLO_address_copy (address);
numeric,
RESOLUTION_TIMEOUT,
&process_peer_string,
- rc);
+ rc);
}
return;
}
- if ( (GNUNET_NO == iterate_all) &&
- (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)))
- return; /* Display only connected peers */
+ if ((GNUNET_NO == iterate_all) &&
+ (GNUNET_NO == GNUNET_TRANSPORT_is_connected (state)))
+ return; /* Display only connected peers */
if (NULL != 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",
address ? address->transport_name : "");
if (NULL != address)
- resolve_peer_address (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);
}
*/
static void
print_plugin_event_info (struct PluginMonitorAddress *addr,
- const struct GNUNET_TRANSPORT_SessionInfo *info)
+ const struct GNUNET_TRANSPORT_SessionInfo *info)
{
const char *state;
"%s: state %s timeout in %s @ %s%s\n",
GNUNET_i2s (&info->address->peer),
state,
- GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (info->session_timeout),
- GNUNET_YES),
- addr->str,
+ GNUNET_STRINGS_relative_time_to_string (
+ GNUNET_TIME_absolute_get_remaining (info->session_timeout),
+ GNUNET_YES),
+ addr->str,
(info->is_inbound == GNUNET_YES) ? " (INBOUND)" : "");
fprintf (stdout,
"%s: queue has %3u messages and %6u bytes\n",
GNUNET_i2s (&info->address->peer),
info->num_msg_pending,
info->num_bytes_pending);
- if (0 != GNUNET_TIME_absolute_get_remaining (info->receive_delay).rel_value_us)
+ if (0 !=
+ GNUNET_TIME_absolute_get_remaining (info->receive_delay).rel_value_us)
fprintf (stdout,
- "%s: receiving blocked until %s\n",
- GNUNET_i2s (&info->address->peer),
- GNUNET_STRINGS_absolute_time_to_string (info->receive_delay));
+ "%s: receiving blocked until %s\n",
+ GNUNET_i2s (&info->address->peer),
+ GNUNET_STRINGS_absolute_time_to_string (info->receive_delay));
}
* if #GNUNET_SYSERR: communication error (IPC error)
*/
static void
-address_cb (void *cls,
- const char *address,
- int res)
+address_cb (void *cls, const char *address, int res)
{
struct PluginMonitorAddress *addr = cls;
if (NULL != addr->str)
return;
addr->str = GNUNET_strdup (address);
- print_plugin_event_info (addr,
- &addr->si);
+ print_plugin_event_info (addr, &addr->si);
}
{
struct PluginMonitorAddress *addr;
- if ( (NULL == info) &&
- (NULL == session) )
+ if ((NULL == info) && (NULL == session))
return; /* in sync with transport service */
addr = *session_ctx;
if (NULL == info)
}
return; /* shutdown */
}
- if ( (NULL != cpid) &&
- (0 != memcmp (&info->address->peer,
- cpid,
- sizeof (struct GNUNET_PeerIdentity))) )
+ if (0 !=
+ memcmp (&info->address->peer, &pid, sizeof (struct GNUNET_PeerIdentity)))
return; /* filtered */
if (NULL == addr)
{
addr = GNUNET_new (struct PluginMonitorAddress);
- addr->asc = GNUNET_TRANSPORT_address_to_string (cfg,
- info->address,
- numeric,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &address_cb,
- addr);
+ addr->asc =
+ GNUNET_TRANSPORT_address_to_string (cfg,
+ info->address,
+ numeric,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &address_cb,
+ addr);
*session_ctx = addr;
}
if (NULL == addr->str)
addr->si = *info;
else
- print_plugin_event_info (addr,
- info);
+ print_plugin_event_info (addr, info);
if (GNUNET_TRANSPORT_SS_DONE == info->state)
{
if (NULL != addr->asc)
{
FPRINTF (stdout,
"%s",
- _("Monitor disconnected from transport service. Reconnecting.\n"));
+ _ (
+ "Monitor disconnected from transport service. Reconnecting.\n"));
return;
}
if (NULL != 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)))
+ 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) )
+ 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)) )
+ 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 (m->address,
- numeric,
- m->state,
- m->state_timeout);
+ resolve_peer_address (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);
}
* @return #GNUNET_OK if the connection is allowed, #GNUNET_SYSERR if not
*/
static int
-blacklist_cb (void *cls,
- const struct GNUNET_PeerIdentity *cpid)
+blacklist_cb (void *cls, const struct GNUNET_PeerIdentity *cpid)
{
- if (0 == memcmp (cpid,
- &pid,
- sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (cpid, &pid, sizeof (struct GNUNET_PeerIdentity)))
return GNUNET_SYSERR;
return GNUNET_OK;
}
*/
static void
run (void *cls,
- char * const *args,
+ char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *mycfg)
{
+ static struct GNUNET_PeerIdentity zero_pid;
int counter = 0;
ret = 1;
cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
- if (test_configuration)
- {
- do_test_configuration (cfg);
- return;
- }
- if ( (NULL != cpid) &&
- (GNUNET_OK !=
- GNUNET_CRYPTO_eddsa_public_key_from_string (cpid,
- strlen (cpid),
- &pid.public_key)))
- {
- FPRINTF (stderr,
- _("Failed to parse peer identity `%s'\n"),
- cpid);
- return;
- }
- counter = benchmark_send + benchmark_receive + iterate_connections
- + monitor_connections + monitor_connects + do_disconnect +
- monitor_plugins;
+ counter = benchmark_send + benchmark_receive + iterate_connections +
+ monitor_connections + monitor_connects + do_disconnect +
+ monitor_plugins;
if (1 < counter)
{
- FPRINTF (stderr,
- _("Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"),
- "disconnect",
- "benchmark send",
- "benchmark receive",
- "information",
- "monitor",
- "events",
- "plugins");
+ FPRINTF (
+ stderr,
+ _ (
+ "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, %s, %s %s\n"),
+ "disconnect",
+ "benchmark send",
+ "benchmark receive",
+ "information",
+ "monitor",
+ "events",
+ "plugins");
return;
}
if (0 == counter)
{
- FPRINTF (stderr,
- _("No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"),
- "disconnect",
- "benchmark send",
- "benchmark receive",
- "information",
- "monitor",
- "events",
- "plugins");
+ FPRINTF (
+ stderr,
+ _ (
+ "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"),
+ "disconnect",
+ "benchmark send",
+ "benchmark receive",
+ "information",
+ "monitor",
+ "events",
+ "plugins");
return;
}
if (do_disconnect) /* -D: Disconnect from peer */
{
- if (NULL == cpid)
+ if (0 == memcmp (&zero_pid, &pid, sizeof (pid)))
{
FPRINTF (stderr,
- _("Option `%s' makes no sense without option `%s'.\n"),
- "-D", "-p");
+ _ ("Option `%s' makes no sense without option `%s'.\n"),
+ "-D",
+ "-p");
ret = 1;
return;
}
- blacklist = GNUNET_TRANSPORT_blacklist (cfg,
- &blacklist_cb,
- NULL);
+ blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_cb, NULL);
if (NULL == blacklist)
{
FPRINTF (stderr,
"%s",
- _("Failed to connect to transport service for disconnection\n"));
+ _ (
+ "Failed to connect to transport service for disconnection\n"));
ret = 1;
return;
}
FPRINTF (stdout,
"%s",
- _("Blacklisting request in place, stop with CTRL-C\n"));
+ _ ("Blacklisting request in place, stop with CTRL-C\n"));
}
else if (benchmark_send) /* -s: Benchmark sending */
{
- if (NULL == cpid)
+ if (0 == memcmp (&zero_pid, &pid, sizeof (pid)))
{
FPRINTF (stderr,
- _("Option `%s' makes no sense without option `%s'.\n"),
- "-s", "-p");
+ _ ("Option `%s' makes no sense without option `%s'.\n"),
+ "-s",
+ "-p");
ret = 1;
return;
}
handle = GNUNET_TRANSPORT_core_connect (cfg,
- NULL,
- NULL,
- NULL,
- ¬ify_connect,
- ¬ify_disconnect,
- NULL);
+ NULL,
+ NULL,
+ NULL,
+ ¬ify_connect,
+ ¬ify_disconnect,
+ NULL);
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;
}
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 */
{
- struct GNUNET_MQ_MessageHandler handlers[] = {
- GNUNET_MQ_hd_var_size (dummy,
- GNUNET_MESSAGE_TYPE_DUMMY,
- struct GNUNET_MessageHeader,
- NULL),
- GNUNET_MQ_handler_end ()
- };
-
+ struct GNUNET_MQ_MessageHandler handlers[] =
+ {GNUNET_MQ_hd_var_size (dummy,
+ GNUNET_MESSAGE_TYPE_DUMMY,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ()};
+
handle = GNUNET_TRANSPORT_core_connect (cfg,
- NULL,
- handlers,
- NULL,
- NULL,
- NULL,
- NULL);
+ NULL,
+ handlers,
+ NULL,
+ NULL,
+ NULL,
+ NULL);
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;
}
if (verbosity > 0)
- FPRINTF (stdout,
- "%s",
- _("Starting to receive benchmark data\n"));
+ FPRINTF (stdout, "%s", _ ("Starting to receive benchmark data\n"));
start_time = GNUNET_TIME_absolute_get ();
-
}
else if (iterate_connections) /* -i: List information about peers once */
{
pic = GNUNET_TRANSPORT_monitor_peers (cfg,
- (NULL == cpid) ? NULL : &pid,
+ &pid,
GNUNET_YES,
&process_peer_iteration_cb,
(void *) cfg);
- op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
- &operation_timeout,
- NULL);
+ op_timeout =
+ GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout, NULL);
}
- else if (monitor_connections) /* -m: List information about peers continuously */
+ 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);
pic = GNUNET_TRANSPORT_monitor_peers (cfg,
- (NULL == cpid) ? NULL : &pid,
+ &pid,
GNUNET_NO,
&process_peer_monitoring_cb,
NULL);
}
- else if (monitor_plugins) /* -P: List information about plugins continuously */
+ 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);
+ pm = GNUNET_TRANSPORT_monitor_plugins (cfg, &plugin_monitoring_cb, NULL);
}
else if (monitor_connects) /* -e : Monitor (dis)connect events continuously */
{
monitor_connect_counter = 0;
handle = GNUNET_TRANSPORT_core_connect (cfg,
- NULL,
- NULL,
- NULL,
- &monitor_notify_connect,
- &monitor_notify_disconnect,
- NULL);
+ NULL,
+ NULL,
+ NULL,
+ &monitor_notify_connect,
+ &monitor_notify_disconnect,
+ NULL);
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;
}
}
else
{
- GNUNET_break(0);
+ GNUNET_break (0);
return;
}
- GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
- NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
}
int
-main (int argc,
- char * const *argv)
+main (int argc, char *const *argv)
{
int res;
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- { 'a', "all", NULL,
- gettext_noop ("print information for all peers (instead of only connected peers)"),
- 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 },
- { 'D', "disconnect",
- NULL, gettext_noop ("disconnect from a peer"), 0,
- &GNUNET_GETOPT_set_one, &do_disconnect },
- { 'i', "information", NULL,
- gettext_noop ("provide information about all current connections (once)"),
- 0, &GNUNET_GETOPT_set_one, &iterate_connections },
- { 'm', "monitor", NULL,
- gettext_noop ("provide information about all current connections (continuously)"),
- 0, &GNUNET_GETOPT_set_one, &monitor_connections },
- { 'e', "events", NULL,
- gettext_noop ("provide information about all connects and disconnect events (continuously)"),
- 0, &GNUNET_GETOPT_set_one, &monitor_connects },
- { 'n', "numeric",
- NULL, gettext_noop ("do not resolve hostnames"), 0,
- &GNUNET_GETOPT_set_one, &numeric },
- { '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 },
- { 't', "test", NULL,
- gettext_noop ("test transport configuration (involves external server)"),
- 0, &GNUNET_GETOPT_set_one, &test_configuration },
- GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
- GNUNET_GETOPT_OPTION_END
- };
+ struct GNUNET_GETOPT_CommandLineOption options[] =
+ {GNUNET_GETOPT_option_flag (
+ 'a',
+ "all",
+ gettext_noop (
+ "print information for all peers (instead of only connected peers)"),
+ &iterate_all),
+ GNUNET_GETOPT_option_flag (
+ 'b',
+ "benchmark",
+ gettext_noop (
+ "measure how fast we are receiving data from all peers (until CTRL-C)"),
+ &benchmark_receive),
+ GNUNET_GETOPT_option_flag ('D',
+ "disconnect",
+ gettext_noop ("disconnect from a peer"),
+ &do_disconnect),
+ GNUNET_GETOPT_option_flag (
+ 'i',
+ "information",
+ gettext_noop (
+ "provide information about all current connections (once)"),
+ &iterate_connections),
+ GNUNET_GETOPT_option_flag (
+ 'm',
+ "monitor",
+ gettext_noop (
+ "provide information about all current connections (continuously)"),
+ &monitor_connections),
+ GNUNET_GETOPT_option_flag (
+ 'e',
+ "events",
+ gettext_noop (
+ "provide information about all connects and disconnect events (continuously)"),
+ &monitor_connects),
+ GNUNET_GETOPT_option_flag ('n',
+ "numeric",
+ gettext_noop ("do not resolve hostnames"),
+ &numeric),
+ GNUNET_GETOPT_option_base32_auto ('p',
+ "peer",
+ "PEER",
+ gettext_noop ("peer identity"),
+ &pid),
+ GNUNET_GETOPT_option_flag ('P',
+ "plugins",
+ gettext_noop ("monitor plugin sessions"),
+ &monitor_plugins),
+ GNUNET_GETOPT_option_flag (
+ 's',
+ "send",
+ gettext_noop (
+ "send data for benchmarking to the other peer (until CTRL-C)"),
+ &benchmark_send),
+ GNUNET_GETOPT_option_verbose (&verbosity),
+ GNUNET_GETOPT_OPTION_END};
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- res = GNUNET_PROGRAM_run (argc, argv,
- "gnunet-transport",
- gettext_noop ("Direct access to transport service."),
- options,
- &run, NULL);
- GNUNET_free((void *) argv);
+ res =
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-transport",
+ gettext_noop ("Direct access to transport service."),
+ options,
+ &run,
+ NULL);
+ GNUNET_free ((void *) argv);
if (GNUNET_OK == res)
return ret;
return 1;
projects / oweals / gnunet.git / blobdiff