/*
This file is part of GNUnet.
- Copyright (C) 2011-2014 GNUnet e.V.
+ 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/>.
*/
/**
* @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_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)
+#include "gnunet_transport_core_service.h"
/**
* Timeout for a name resolution
};
-/**
- * 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;
-
-};
-
-
-/**
- *
- */
-enum TestResult
-{
- /**
- * NAT returned success
- */
- NAT_TEST_SUCCESS = GNUNET_OK,
-
- /**
- * NAT returned failure
- */
- NAT_TEST_FAIL = GNUNET_NO,
-
- /**
- * NAT returned failure while running test
- */
- NAT_TEST_INTERNAL_FAIL = GNUNET_SYSERR,
-
- /**
- * We could not start the test
- */
- NAT_TEST_FAILED_TO_START = 2,
-
- /**
- * We had a timeout while running the test
- */
- NAT_TEST_TIMEOUT = 3
-};
-
-
/**
* Benchmarking block size in KB
*/
#define BLOCKSIZE 4
-/**
- * Which peer should we connect to?
- */
-static char *cpid;
-
/**
* Handle to transport service.
*/
-static struct GNUNET_TRANSPORT_Handle *handle;
+static struct GNUNET_TRANSPORT_CoreHandle *handle;
/**
* Configuration handle
*/
static int iterate_all;
-/**
- * Option -t.
- */
-static int test_configuration;
-
/**
* Option -c.
*/
*/
static struct GNUNET_TIME_Absolute start_time;
-/**
- * Handle for current transmission request.
- */
-static struct GNUNET_TRANSPORT_TransmitHandle *th;
-
/**
* Map storing information about monitored peers
*/
/**
* Identity of the peer we transmit to / connect to.
- * (equivalent to 'cpid' string).
+ * ('-p' command-line option).
*/
static struct GNUNET_PeerIdentity pid;
-/**
- * Task scheduled for cleanup / termination of the process.
- */
-static struct GNUNET_SCHEDULER_Task * end;
-
/**
* Task for operation timeout
*/
-static struct GNUNET_SCHEDULER_Task * op_timeout;
+static struct GNUNET_SCHEDULER_Task *op_timeout;
/**
* 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
- */
-struct TestContext *head;
-
-/**
- * DLL for NAT Test Contexts: tail
- */
-struct TestContext *tail;
-
/**
* DLL: head of validation resolution entries
*/
struct ValidationResolutionContext *next;
struct PeerResolutionContext *rc;
- end = NULL;
if (NULL != op_timeout)
{
GNUNET_SCHEDULER_cancel (op_timeout);
GNUNET_free (rc->addrcp);
GNUNET_free (rc);
}
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
if (NULL != handle)
{
- GNUNET_TRANSPORT_disconnect (handle);
+ GNUNET_TRANSPORT_core_disconnect (handle);
handle = NULL;
}
if (benchmark_send)
_("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)
{
_("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;
}
_("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,
}
-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 TestResult result)
-{
- switch (result) {
- case NAT_TEST_FAIL:
- FPRINTF (stderr,
- _("Configuration for plugin `%s' did not work!\n"),
- tc->name);
- break;
- case NAT_TEST_SUCCESS:
- FPRINTF (stderr,
- _("Configuration for plugin `%s' did work!\n"),
- tc->name);
- break;
- case NAT_TEST_INTERNAL_FAIL:
- FPRINTF (stderr,
- _("Internal NAT error while running test for plugin `%s'\n"),
- tc->name);
- break;
- case NAT_TEST_FAILED_TO_START:
- FPRINTF (stderr,
- _("Failed to start NAT test for plugin `%s'\n"),
- tc->name);
- break;
- case NAT_TEST_TIMEOUT:
- FPRINTF (stderr,
- _("Timeout while waiting for result of NAT test for plugin `%s'\n"),
- tc->name);
- break;
- default:
- FPRINTF (stderr,
- _("Configuration for plugin `%s' did not work!\n"),
- tc->name);
- break;
- }
- 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. @a buf will be
- * NULL and @a size zero if the socket was closed for
- * writing in the meantime.
+ * begin ready to queue more data. Sends another message.
*
- * @param cls closure
- * @param size number of bytes available in @a buf
- * @param buf where the callee should write the message
- * @return number of bytes written to @a buf
+ * @param cls closure with the message queue
*/
-static size_t
-transmit_data (void *cls,
- size_t size,
- void *buf)
+static void
+do_send (void *cls)
{
- struct GNUNET_MessageHeader *m = buf;
-
- if ((NULL == buf) || (0 == size))
- {
- th = NULL;
- return 0;
- }
-
- GNUNET_assert(size >= sizeof(struct GNUNET_MessageHeader));
- GNUNET_assert(size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- m->size = ntohs (size);
- m->type = ntohs (GNUNET_MESSAGE_TYPE_DUMMY);
- memset (&m[1], 52, size - sizeof(struct GNUNET_MessageHeader));
- traffic_sent += size;
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, &pid,
- BLOCKSIZE * 1024,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_data, NULL);
+ struct GNUNET_MQ_Handle *mq = cls;
+ 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));
+ traffic_sent += BLOCKSIZE * 1024;
+ GNUNET_MQ_notify_sent (env,
+ &do_send,
+ mq);
if (verbosity > 0)
- FPRINTF (stdout, _("Transmitting %u bytes to %s\n"), (unsigned int) size,
- GNUNET_i2s (&pid));
- return size;
+ FPRINTF (stdout,
+ _("Transmitting %u bytes\n"),
+ (unsigned int) BLOCKSIZE * 1024);
+ GNUNET_MQ_send (mq,
+ env);
}
*
* @param cls closure
* @param peer the peer that connected
+ * @param mq message queue for sending to @a peer
*/
-static void
+static void *
notify_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
- if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
- return;
+ if (0 != memcmp (&pid,
+ peer,
+ sizeof(struct GNUNET_PeerIdentity)))
+ return NULL;
ret = 0;
- if (benchmark_send)
+ if (! benchmark_send)
+ return NULL;
+ if (NULL != op_timeout)
{
- if (NULL != op_timeout)
- {
- GNUNET_SCHEDULER_cancel (op_timeout);
- op_timeout = NULL;
- }
- if (verbosity > 0)
- FPRINTF (stdout,
- _("Successfully connected to `%s', starting to send benchmark data in %u Kb blocks\n"),
- GNUNET_i2s (&pid), BLOCKSIZE);
- start_time = GNUNET_TIME_absolute_get ();
- if (NULL == th)
- th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer,
- BLOCKSIZE * 1024,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_data,
- NULL);
- else
- GNUNET_break(0);
- return;
+ GNUNET_SCHEDULER_cancel (op_timeout);
+ 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);
+ start_time = GNUNET_TIME_absolute_get ();
+ do_send (mq);
+ return mq;
}
*
* @param cls closure
* @param peer the peer that disconnected
+ * @param internal_cls what we returned from #notify_connect()
*/
static void
notify_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
- if (0 != memcmp (&pid, peer, sizeof(struct GNUNET_PeerIdentity)))
- return;
-
- if (NULL != th)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
- th = NULL;
- }
- if (benchmark_send)
- {
- FPRINTF (stdout, _("Disconnected from peer `%s' while benchmarking\n"),
- GNUNET_i2s (&pid));
- if (NULL != end)
- GNUNET_SCHEDULER_cancel (end);
+ 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));
}
*
* @param cls closure
* @param peer the peer that connected
+ * @param mq for sending messages to @a peer
+ * @return NULL
*/
-static void
+static void *
monitor_notify_connect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
- monitor_connect_counter++;
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"),
now_str,
_("Connected to"),
GNUNET_i2s (peer),
monitor_connect_counter);
+ return NULL;
}
*
* @param cls closure
* @param peer the peer that disconnected
+ * @param internal_cls what we returned from #monitor_notify_connect()
*/
static void
monitor_notify_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
const char *now_str = GNUNET_STRINGS_absolute_time_to_string (now);
* Function called by the transport for each received message.
*
* @param cls closure
- * @param peer (claimed) identity of the other peer
* @param message the message
+ * @return #GNUNET_OK
*/
-static void
-notify_receive (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static int
+check_dummy (void *cls,
+ 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));
+ return GNUNET_OK; /* all messages are fine */
+}
+
- if (traffic_received == 0)
- start_time = GNUNET_TIME_absolute_get ();
- traffic_received += ntohs (message->size);
+/**
+ * Function called by the transport for each received message.
+ *
+ * @param cls closure
+ * @param message the message
+ */
+static void
+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));
+ 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)) ||
+ if ( ((GNUNET_YES == iterate_connections) &&
+ (GNUNET_YES == iterate_all)) ||
(GNUNET_YES == monitor_connections))
{
FPRINTF (stdout,
GNUNET_STRINGS_absolute_time_to_string (state_timeout));
}
else if ( (GNUNET_YES == iterate_connections) &&
- (GNUNET_TRANSPORT_is_connected(state)))
+ (GNUNET_TRANSPORT_is_connected(state)) )
{
/* Only connected peers, skip state */
FPRINTF (stdout,
}
GNUNET_free (rc->transport);
GNUNET_free (rc->addrcp);
- GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
+ GNUNET_CONTAINER_DLL_remove (rc_head,
+ rc_tail,
+ rc);
GNUNET_free (rc);
if ((0 == address_resolutions) && (iterate_connections))
{
address,
numeric,
RESOLUTION_TIMEOUT,
- &process_peer_string, rc);
+ &process_peer_string,
+ rc);
}
}
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)
{
/**
- * Function called with the result of the check if the 'transport'
- * service is running.
+ * Main function that will be run by the scheduler.
*
- * @param cls closure with our configuration
- * @param result #GNUNET_YES if transport is running
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param mycfg configuration
*/
static void
-testservice_task (void *cls,
- int result)
+run (void *cls,
+ char * const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *mycfg)
{
+ static struct GNUNET_PeerIdentity zero_pid;
int counter = 0;
ret = 1;
- if (GNUNET_YES != result)
- {
- FPRINTF (stderr, _("Service `%s' is not running\n"), "transport");
- 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;
- }
+ cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
counter = benchmark_send + benchmark_receive + iterate_connections
+ monitor_connections + monitor_connects + do_disconnect +
{
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");
+ "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");
+ _("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"),
}
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");
+ FPRINTF (stderr,
+ _("Option `%s' makes no sense without option `%s'.\n"),
+ "-s", "-p");
ret = 1;
return;
}
- handle = GNUNET_TRANSPORT_connect (cfg,
- NULL,
- NULL,
- ¬ify_receive,
- ¬ify_connect,
- ¬ify_disconnect);
+ handle = GNUNET_TRANSPORT_core_connect (cfg,
+ 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;
}
}
else if (benchmark_receive) /* -b: Benchmark receiving */
{
- handle = GNUNET_TRANSPORT_connect (cfg,
- NULL,
- NULL,
- ¬ify_receive,
- NULL,
- NULL);
+ 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);
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);
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_connects) /* -e : Monitor (dis)connect events continuously */
{
monitor_connect_counter = 0;
- handle = GNUNET_TRANSPORT_connect (cfg,
- NULL,
- NULL,
- NULL,
- &monitor_notify_connect,
- &monitor_notify_disconnect);
+ handle = GNUNET_TRANSPORT_core_connect (cfg,
+ NULL,
+ NULL,
+ NULL,
+ &monitor_notify_connect,
+ &monitor_notify_disconnect,
+ NULL);
if (NULL == handle)
{
FPRINTF (stderr,
}
-/**
- * Main function that will be run by the scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param mycfg configuration
- */
-static void
-run (void *cls,
- char * const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *mycfg)
-{
- cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
- if (test_configuration)
- {
- do_test_configuration (cfg);
- return;
- }
- GNUNET_CLIENT_service_test ("transport",
- cfg,
- GNUNET_TIME_UNIT_SECONDS,
- &testservice_task,
- (void *) cfg);
-}
-
-
int
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),
+ 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
};
gettext_noop ("Direct access to transport service."),
options,
&run, NULL);
- GNUNET_free((void *) argv);
+ GNUNET_free ((void *) argv);
if (GNUNET_OK == res)
return ret;
return 1;