/*
This file is part of GNUnet.
- Copyright (C) 2012 GNUnet e.V.
+ Copyright (C) 2012, 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
* @file cadet/gnunet-cadet.c
* @brief Print information about cadet tunnels and peers.
* @author Bartlomiej Polot
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "cadet.h"
-/**
- * Option -m.
- */
-static int monitor_mode;
-
/**
* Option -P.
*/
*/
static char *target_port = "default";
-/**
- * Data pending in netcat mode.
- */
-static size_t data_size;
-
/**
* Cadet handle.
*/
*/
static struct GNUNET_CADET_Channel *ch;
-/**
- * Transmit handle.
- */
-static struct GNUNET_CADET_TransmitHandle *th;
-
/**
* HashCode of the given port string
*/
*/
struct GNUNET_CADET_Port *lp;
-/**
- * Shutdown task handle.
- */
-static struct GNUNET_SCHEDULER_Task *sd;
-
/**
* Task for reading from stdin.
*/
static struct GNUNET_SCHEDULER_Task *job;
+/**
+ * Wait for input on STDIO and send it out over the #ch.
+ */
static void
listen_stdio (void);
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Shutdown\n");
- if (NULL != th)
- {
- GNUNET_CADET_notify_transmit_ready_cancel (th);
- th = NULL;
- }
if (NULL != ch)
{
GNUNET_CADET_channel_destroy (ch);
ch = NULL;
}
- else if (NULL != target_id) {
- // FIXME: would be nicer to have proper NACK support from cadet_api
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Connection refused to %s\n",
- target_id);
- }
if (NULL != mh)
{
GNUNET_CADET_disconnect (mh);
/**
- * Function called to notify a client about the connection
- * begin ready to queue more data. "buf" will be
- * NULL and "size" zero if the connection was closed for
- * writing in the meantime.
- *
- * FIXME
+ * Task run in stdio mode, after some data is available at stdin.
*
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @param cls Closure (unused).
*/
-static size_t
-data_ready (void *cls, size_t size, void *buf)
+static void
+read_stdio (void *cls)
{
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_MessageHeader *msg;
- size_t total_size;
-
- th = NULL;
+ char buf[60000];
+ ssize_t data_size;
- if (NULL == buf || 0 == size)
+ rd_task = NULL;
+ data_size = read (0,
+ buf,
+ 60000);
+ if (data_size < 1)
{
GNUNET_SCHEDULER_shutdown();
- return 0;
+ return;
}
-
- total_size = data_size + sizeof (struct GNUNET_MessageHeader);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "sending %u bytes\n",
+ "Read %u bytes from stdio\n",
(unsigned int) data_size);
- GNUNET_assert (size >= total_size);
-
- msg = buf;
- msg->size = htons (total_size);
- msg->type = htons (GNUNET_MESSAGE_TYPE_CADET_CLI);
- GNUNET_memcpy (&msg[1], cls, data_size);
+ env = GNUNET_MQ_msg_extra (msg,
+ data_size,
+ GNUNET_MESSAGE_TYPE_CADET_CLI);
+ GNUNET_memcpy (&msg[1],
+ buf,
+ data_size);
+ GNUNET_MQ_send (GNUNET_CADET_get_mq (ch),
+ env);
if (GNUNET_NO == echo)
{
listen_stdio ();
{
echo_time = GNUNET_TIME_absolute_get ();
}
-
- return total_size;
-}
-
-
-/**
- * Task run in stdio mode, after some data is available at stdin.
- *
- * @param cls Closure (unused).
- */
-static void
-read_stdio (void *cls)
-{
- static char buf[60000];
-
- rd_task = NULL;
- data_size = read (0, buf, 60000);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "stdio read %u bytes\n",
- (unsigned int) data_size);
- if (data_size < 1)
- {
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- GNUNET_assert (NULL == th);
- th = GNUNET_CADET_notify_transmit_ready (ch, GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sizeof (struct GNUNET_MessageHeader)
- + data_size,
- &data_ready, buf);
}
/**
- * Start listening to stdin
+ * Wait for input on STDIO and send it out over the #ch.
*/
static void
-listen_stdio (void)
+listen_stdio ()
{
struct GNUNET_NETWORK_FDSet *rs;
+ /* FIXME: why use 'rs' here, seems overly complicated... */
rs = GNUNET_NETWORK_fdset_create ();
- GNUNET_NETWORK_fdset_set_native (rs, 0);
+ GNUNET_NETWORK_fdset_set_native (rs,
+ 0); /* STDIN */
rd_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_TIME_UNIT_FOREVER_REL,
- rs, NULL,
- &read_stdio, NULL);
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ rs,
+ NULL,
+ &read_stdio,
+ NULL);
GNUNET_NETWORK_fdset_destroy (rs);
}
*
* It must NOT call #GNUNET_CADET_channel_destroy on the channel.
*
- * @param cls closure (set from #GNUNET_CADET_connect)
+ * @param cls closure
* @param channel connection to the other end (henceforth invalid)
- * @param channel_ctx place where local state associated
- * with the channel is stored
*/
static void
channel_ended (void *cls,
- const struct GNUNET_CADET_Channel *channel,
- void *channel_ctx)
+ const struct GNUNET_CADET_Channel *channel)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Channel ended!\n");
- if (channel != ch)
- {
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ended: %p, expected: %p\n", channel, ch);
- }
- else
- {
- ch = NULL;
- }
- if (NULL != th)
- {
- GNUNET_CADET_notify_transmit_ready_cancel (th);
- th = NULL;
- }
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Channel ended!\n");
+ GNUNET_assert (channel == ch);
+ ch = NULL;
GNUNET_SCHEDULER_shutdown ();
}
* @param cls closure
* @param channel new handle to the channel
* @param initiator peer that started the channel
- * @param port Port this channel is for.
- * @param options CadetOption flag field, with all active option bits set to 1.
- *
- * @return initial channel context for the channel
- * (can be NULL -- that's not an error)
+ * @return initial channel context for the channel, we use @a channel
*/
static void *
channel_incoming (void *cls,
struct GNUNET_CADET_Channel *channel,
- const struct GNUNET_PeerIdentity *initiator,
- const struct GNUNET_HashCode *port,
- enum GNUNET_CADET_ChannelOption options)
+ const struct GNUNET_PeerIdentity *initiator)
{
GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "Connected from %s\n",
+ "Incoming connection from %s\n",
GNUNET_i2s_full (initiator));
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Incoming channel %p on port %s\n",
- channel, GNUNET_h2s (port));
- if (NULL != ch)
- {
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "A channel already exists (%p)\n", ch);
- /*
- * From now on multiple channels will be sending data to us
- * making the service of this command unpredictable in its
- * current implementation. So for now let's just bail out.
- */
- GNUNET_SCHEDULER_shutdown();
- return NULL;
- }
- if (NULL == listen_port)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Not listening to channels\n");
- return NULL;
- }
- // Closing the listen port currently breaks open connections.
- // Is this an intentional departure from POSIX socket behavior?
- //
- if (NULL != lp) {
- /* Now that we have our circuit up and running, let's not
- * get confused by further incoming connect requests.
- * You need to start another 'gnunet-cadet -o' process
- * to receive those.
- */
- GNUNET_CADET_close_port (lp);
- lp = NULL;
- }
+ GNUNET_assert (NULL == ch);
+ GNUNET_assert (NULL != lp);
+ GNUNET_CADET_close_port (lp);
+ lp = NULL;
ch = channel;
if (GNUNET_NO == echo)
- {
listen_stdio ();
- return NULL;
- }
- data_size = 0;
- return NULL;
+ return channel;
}
+
/**
* @brief Send an echo request to the remote peer.
*
static void
send_echo (void *cls)
{
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
echo_task = NULL;
if (NULL == ch)
return;
- GNUNET_assert (NULL == th);
- th = GNUNET_CADET_notify_transmit_ready (ch, GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sizeof (struct GNUNET_MessageHeader),
- &data_ready, NULL);
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_CADET_CLI);
+ GNUNET_MQ_send (GNUNET_CADET_get_mq (ch),
+ env);
}
request_dump (void *cls)
{
GNUNET_CADET_request_dump (mh);
- GNUNET_SCHEDULER_cancel (sd);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
/**
- * Call CADET's monitor API, get info of one connection.
+ * Check data message sanity. Does nothing so far (all messages are OK).
*
* @param cls Closure (unused).
+ * @param message The message to check.
+ * @return #GNUNET_OK to keep the channel open,
+ * #GNUNET_SYSERR to close it (signal serious error).
*/
-static void
-create_channel (void *cls)
+static int
+check_data (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_PeerIdentity pid;
- enum GNUNET_CADET_ChannelOption opt;
-
- GNUNET_assert (NULL == ch);
-
- if (GNUNET_OK !=
- GNUNET_CRYPTO_eddsa_public_key_from_string (target_id,
- strlen (target_id),
- &pid.public_key))
- {
- FPRINTF (stderr,
- _("Invalid target `%s'\n"),
- target_id);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to `%s'\n", target_id);
- opt = GNUNET_CADET_OPTION_DEFAULT | GNUNET_CADET_OPTION_RELIABLE;
- GNUNET_CRYPTO_hash (target_port, strlen(target_port), &porthash);
- ch = GNUNET_CADET_channel_create (mh, NULL, &pid, &porthash, opt);
- if (GNUNET_NO == echo)
- listen_stdio ();
- else
- echo_task = GNUNET_SCHEDULER_add_now (&send_echo, NULL);
+ return GNUNET_OK; /* all is well-formed */
}
* in order to receive the next message. This doesn't need to be immediate:
* can be delayed if some processing is done on the message.
*
- * @param cls Closure (set from #GNUNET_CADET_connect).
- * @param channel Connection to the other end.
- * @param channel_ctx Place to store local state associated with the channel.
+ * @param cls NULL
* @param message The actual message.
- * @return #GNUNET_OK to keep the channel open,
- * #GNUNET_SYSERR to close it (signal serious error).
*/
-static int
-data_callback (void *cls,
- struct GNUNET_CADET_Channel *channel,
- void **channel_ctx,
- const struct GNUNET_MessageHeader *message)
+static void
+handle_data (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
+ size_t payload_size = ntohs (message->size) - sizeof (*message);
uint16_t len;
ssize_t done;
uint16_t off;
const char *buf;
- GNUNET_break (ch == channel);
- GNUNET_CADET_receive_done (channel);
+ GNUNET_CADET_receive_done (ch);
if (GNUNET_YES == echo)
{
if (NULL != listen_port)
{
- /* Just listening to echo incoming messages*/
- if (NULL != th)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Last echo reply not yet sent, dropping current reply.\n");
- return GNUNET_OK;
- }
- th = GNUNET_CADET_notify_transmit_ready (channel, GNUNET_NO,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sizeof (struct GNUNET_MessageHeader),
- &data_ready, NULL);
- return GNUNET_OK;
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+
+ env = GNUNET_MQ_msg_extra (msg,
+ payload_size,
+ GNUNET_MESSAGE_TYPE_CADET_CLI);
+ GNUNET_memcpy (&msg[1],
+ &message[1],
+ payload_size);
+ GNUNET_MQ_send (GNUNET_CADET_get_mq (ch),
+ env);
+ return;
}
else
{
latency = GNUNET_TIME_absolute_get_duration (echo_time);
echo_time = GNUNET_TIME_UNIT_FOREVER_ABS;
- FPRINTF (stdout, "time: %s\n",
- GNUNET_STRINGS_relative_time_to_string (latency, GNUNET_NO));
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "time: %s\n",
+ GNUNET_STRINGS_relative_time_to_string (latency,
+ GNUNET_NO));
echo_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &send_echo, NULL);
+ &send_echo,
+ NULL);
}
}
len = ntohs (message->size) - sizeof (*message);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u bytes\n", len);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got %u bytes\n",
+ len);
buf = (const char *) &message[1];
off = 0;
while (off < len)
{
- done = write (1, &buf[off], len - off);
+ done = write (1,
+ &buf[off],
+ len - off);
if (done <= 0)
{
if (-1 == done)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"write");
- return GNUNET_SYSERR;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
off += done;
}
- return GNUNET_OK;
}
{
if (NULL == peer)
{
- if (GNUNET_YES != monitor_mode)
- {
- GNUNET_SCHEDULER_shutdown();
- }
+ GNUNET_SCHEDULER_shutdown();
return;
}
- FPRINTF (stdout, "%s tunnel: %c, paths: %u\n",
- GNUNET_i2s_full (peer), tunnel ? 'Y' : 'N', n_paths);
+ FPRINTF (stdout,
+ "%s tunnel: %c, paths: %u\n",
+ GNUNET_i2s_full (peer),
+ tunnel ? 'Y' : 'N',
+ n_paths);
}
+
/**
* Method called to retrieve information about a specific peer
* known to the service.
int tunnel,
int neighbor,
unsigned int n_paths,
- struct GNUNET_PeerIdentity *paths)
+ const struct GNUNET_PeerIdentity *paths)
{
unsigned int i;
- struct GNUNET_PeerIdentity *p;
+ const struct GNUNET_PeerIdentity *p;
- FPRINTF (stdout, "%s [TUNNEL: %s, NEIGHBOR: %s, PATHS: %u]\n",
+ FPRINTF (stdout,
+ "%s [TUNNEL: %s, NEIGHBOR: %s, PATHS: %u]\n",
GNUNET_i2s_full (peer),
- tunnel ? "Y" : "N", neighbor ? "Y" : "N", n_paths);
+ tunnel ? "Y" : "N",
+ neighbor ? "Y" : "N",
+ n_paths);
p = paths;
for (i = 0; i < n_paths && NULL != p;)
{
- FPRINTF (stdout, "%s ", GNUNET_i2s (p));
- if (0 == memcmp (p, peer, sizeof (*p)))
+ FPRINTF (stdout,
+ "%s ",
+ GNUNET_i2s (p));
+ if (0 == memcmp (p,
+ peer,
+ sizeof (*p)))
{
FPRINTF (stdout, "\n");
i++;
{
if (NULL == peer)
{
- if (GNUNET_YES != monitor_mode)
- {
- GNUNET_SCHEDULER_shutdown();
- }
+ GNUNET_SCHEDULER_shutdown();
return;
}
- FPRINTF (stdout, "%s [ENC: %s, CON: %s] CHs: %u, CONNs: %u\n",
+ FPRINTF (stdout,
+ "%s [ENC: %s, CON: %s] CHs: %u, CONNs: %u\n",
GNUNET_i2s_full (peer),
- enc_2s (estate), conn_2s (cstate),
- channels, connections);
+ enc_2s (estate),
+ conn_2s (cstate),
+ channels,
+ connections);
}
FPRINTF (stdout, "\tencryption state: %s\n", enc_2s (estate));
FPRINTF (stdout, "\tconnection state: %s\n", conn_2s (cstate));
}
- if (GNUNET_YES != monitor_mode)
- {
- GNUNET_SCHEDULER_shutdown ();
- }
- return;
+ GNUNET_SCHEDULER_shutdown ();
}
{
struct GNUNET_PeerIdentity pid;
+ job = NULL;
if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_public_key_from_string (tunnel_id,
strlen (tunnel_id),
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- static const struct GNUNET_CADET_MessageHandler handlers[] = {
- {&data_callback, GNUNET_MESSAGE_TYPE_CADET_CLI, 0},
- {NULL, 0, 0} /* FIXME add option to monitor msg types */
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_var_size (data,
+ GNUNET_MESSAGE_TYPE_CADET_CLI,
+ struct GNUNET_MessageHeader,
+ NULL),
+ GNUNET_MQ_handler_end ()
};
/* FIXME add option to monitor apps */
target_id = args[0];
- if (target_id && args[1]) target_port = args[1];
+ if (target_id && args[1])
+ target_port = args[1];
if ( (0 != (request_peers | request_tunnels)
- || 0 != monitor_mode
|| NULL != tunnel_id
|| NULL != conn_id
|| NULL != channel_id)
&& target_id != NULL)
{
FPRINTF (stderr,
- _("You must NOT give a TARGET "
- "when using 'request all' options\n"));
+ _("Extra arguments are not applicable "
+ "in combination with this option.\n"));
return;
}
if (GNUNET_YES == dump)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "requesting debug dump\n");
- GNUNET_SCHEDULER_add_now (&request_dump, NULL);
- }
- else if (NULL != target_id)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating channel to %s\n",
- target_id);
- GNUNET_SCHEDULER_add_now (&create_channel, NULL);
+ "Requesting debug dump\n");
+ job = GNUNET_SCHEDULER_add_now (&request_dump,
+ NULL);
}
else if (NULL != peer_id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show peer\n");
- job = GNUNET_SCHEDULER_add_now (&show_peer, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show peer\n");
+ job = GNUNET_SCHEDULER_add_now (&show_peer,
+ NULL);
}
else if (NULL != tunnel_id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show tunnel\n");
- job = GNUNET_SCHEDULER_add_now (&show_tunnel, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show tunnel\n");
+ job = GNUNET_SCHEDULER_add_now (&show_tunnel,
+ NULL);
}
else if (NULL != channel_id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show channel\n");
- job = GNUNET_SCHEDULER_add_now (&show_channel, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show channel\n");
+ job = GNUNET_SCHEDULER_add_now (&show_channel,
+ NULL);
}
else if (NULL != conn_id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show connection\n");
- job = GNUNET_SCHEDULER_add_now (&show_connection, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show connection\n");
+ job = GNUNET_SCHEDULER_add_now (&show_connection,
+ NULL);
}
else if (GNUNET_YES == request_peers)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show all peers\n");
- job = GNUNET_SCHEDULER_add_now (&get_peers, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show all peers\n");
+ job = GNUNET_SCHEDULER_add_now (&get_peers,
+ NULL);
}
else if (GNUNET_YES == request_tunnels)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show all tunnels\n");
- job = GNUNET_SCHEDULER_add_now (&get_tunnels, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Show all tunnels\n");
+ job = GNUNET_SCHEDULER_add_now (&get_tunnels,
+ NULL);
}
- else if (NULL == listen_port)
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to CADET service\n");
+ mh = GNUNET_CADET_connect (cfg);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
+ if (NULL == mh)
{
- FPRINTF (stderr, "No action requested\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET service\n");
- mh = GNUNET_CADET_connect (cfg,
- NULL, /* cls */
- &channel_ended, /* cleaner */
- handlers);
- if (NULL == mh)
- GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
- else
- sd = GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
-
if (NULL != listen_port)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening CADET listen port\n");
- GNUNET_CRYPTO_hash (listen_port, strlen(listen_port), &porthash);
- lp = GNUNET_CADET_open_port (mh, &porthash, &channel_incoming, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Opening CADET listen port\n");
+ GNUNET_CRYPTO_hash (listen_port,
+ strlen (listen_port),
+ &porthash);
+ lp = GNUNET_CADET_open_port (mh,
+ &porthash,
+ &channel_incoming,
+ NULL,
+ NULL /* window changes */,
+ &channel_ended,
+ handlers);
+ }
+ if (NULL != target_id)
+ {
+ struct GNUNET_PeerIdentity pid;
+ enum GNUNET_CADET_ChannelOption opt;
+
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_public_key_from_string (target_id,
+ strlen (target_id),
+ &pid.public_key))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ _("Invalid target `%s'\n"),
+ target_id);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting to `%s:%s'\n",
+ target_id,
+ target_port);
+ opt = GNUNET_CADET_OPTION_DEFAULT | GNUNET_CADET_OPTION_RELIABLE;
+ GNUNET_CRYPTO_hash (target_port,
+ strlen(target_port),
+ &porthash);
+ ch = GNUNET_CADET_channel_create (mh,
+ NULL,
+ &pid,
+ &porthash,
+ opt,
+ NULL /* window changes */,
+ &channel_ended,
+ handlers);
+ if (GNUNET_YES == echo)
+ {
+ echo_task = GNUNET_SCHEDULER_add_now (&send_echo,
+ NULL);
+ }
+ else
+ {
+ listen_stdio ();
+ }
+ }
+
+ if ( (NULL == lp) &&
+ (NULL == job) &&
+ (NULL == ch) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ _("No action requested\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
}
* @return 0 ok, 1 on error
*/
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
int res;
- const char helpstr[] = "Create channels and retreive info about cadets status.";
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-// {'a', "channel", "TUNNEL_ID:CHANNEL_ID",
-// gettext_noop ("provide information about a particular channel"),
-// GNUNET_YES, &GNUNET_GETOPT_set_string, &channel_id},
- {'C', "connection", "CONNECTION_ID",
- gettext_noop ("provide information about a particular connection"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &conn_id},
- {'e', "echo", NULL,
- gettext_noop ("activate echo mode"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &echo},
- {'d', "dump", NULL,
- gettext_noop ("dump debug information to STDERR"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &dump},
-// {'m', "monitor", NULL,
-// gettext_noop ("provide information about all events (continuously)"),
-// GNUNET_NO, &GNUNET_GETOPT_set_one, &monitor_mode},
- {'o', "open-port", NULL,
- gettext_noop ("port to listen to"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &listen_port},
- {'p', "peer", "PEER_ID",
- gettext_noop ("provide information about a patricular peer"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &peer_id},
- {'P', "peers", NULL,
- gettext_noop ("provide information about all peers"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &request_peers},
- {'t', "tunnel", "TUNNEL_ID",
- gettext_noop ("provide information about a particular tunnel"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &tunnel_id},
- {'T', "tunnels", NULL,
- gettext_noop ("provide information about all tunnels"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &request_tunnels},
+ const char helpstr[] = "Create tunnels and retrieve info about CADET's status.";
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ /* I would use the terminology 'circuit' here... --lynX */
+ GNUNET_GETOPT_option_string ('C',
+ "connection",
+ "CONNECTION_ID",
+ gettext_noop ("Provide information about a particular connection"),
+ &conn_id),
+
+ GNUNET_GETOPT_option_flag ('e',
+ "echo",
+ gettext_noop ("Activate echo mode"),
+ &echo),
+
+ GNUNET_GETOPT_option_flag ('d',
+ "dump",
+ gettext_noop ("Dump debug information to STDERR"),
+ &dump),
+
+ GNUNET_GETOPT_option_string ('o',
+ "open-port",
+ "SHARED_SECRET",
+ gettext_noop ("Listen for connections using a shared secret among sender and recipient"),
+ &listen_port),
+
+
+ GNUNET_GETOPT_option_string ('p',
+ "peer",
+ "PEER_ID",
+ gettext_noop ("Provide information about a patricular peer"),
+ &peer_id),
+
+
+ GNUNET_GETOPT_option_flag ('P',
+ "peers",
+ gettext_noop ("Provide information about all peers"),
+ &request_peers),
+
+ GNUNET_GETOPT_option_string ('t',
+ "tunnel",
+ "TUNNEL_ID",
+ gettext_noop ("Provide information about a particular tunnel"),
+ &tunnel_id),
+
+
+ GNUNET_GETOPT_option_flag ('T',
+ "tunnels",
+ gettext_noop ("Provide information about all tunnels"),
+ &request_tunnels),
GNUNET_GETOPT_OPTION_END
};
- monitor_mode = GNUNET_NO;
-
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc, argv,
+ &argc, &argv))
return 2;
- res = GNUNET_PROGRAM_run (argc, argv, "gnunet-cadet (OPTIONS | TARGET PORT)",
+ res = GNUNET_PROGRAM_run (argc, argv,
+ "gnunet-cadet (OPTIONS | PEER_ID SHARED_SECRET)",
gettext_noop (helpstr),
options, &run, NULL);
if (GNUNET_OK == res)
return 0;
- else
- return 1;
+ return 1;
}
/* end of gnunet-cadet.c */
projects / oweals / gnunet.git / blobdiff