static char *channel_id;
/**
- * Port to listen on (-p).
+ * Port to listen on (-o).
*/
-static uint32_t listen_port;
+static char *listen_port;
/**
* Request echo service
/**
* Port to connect to
*/
-static uint32_t target_port;
+static char *target_port = "default";
/**
* Data pending in netcat mode.
*/
static struct GNUNET_CADET_TransmitHandle *th;
+/**
+ * HashCode of the given port string
+ */
+static struct GNUNET_HashCode porthash;
+
+/**
+ * Data structure for ongoing reception of incoming virtual circuits.
+ */
+struct GNUNET_CADET_Port *lp;
+
/**
* Shutdown task handle.
*/
/**
- * Task run in monitor mode when the user presses CTRL-C to abort.
- * Stops monitoring activity.
+ * Task to shut down this application.
*
* @param cls Closure (unused).
*/
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);
* Only called (once) upon reception of data with a message type which was
* subscribed to in #GNUNET_CADET_connect.
*
- * A call to #GNUNET_CADET_channel_destroy causes te channel to be ignored. In
- * this case the handler MUST return NULL.
+ * A call to #GNUNET_CADET_channel_destroy causes the channel to be ignored.
+ * In this case the handler MUST return NULL.
*
* @param cls closure
* @param channel new handle to the channel
*/
static void *
channel_incoming (void *cls,
- struct GNUNET_CADET_Channel * channel,
- const struct GNUNET_PeerIdentity * initiator,
- uint32_t port, enum GNUNET_CADET_ChannelOption options)
+ struct GNUNET_CADET_Channel *channel,
+ const struct GNUNET_PeerIdentity *initiator,
+ const struct GNUNET_HashCode *port,
+ enum GNUNET_CADET_ChannelOption options)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Incoming channel %p on port %u\n",
- channel, port);
+ GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ "Connected 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);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Incoming channel %p on port %u\n", channel, port);
+ /*
+ * 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 (0 == listen_port)
+ if (NULL == listen_port)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not listening to channels\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Not listening to channels\n");
return NULL;
}
+#if 0
+ // 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.
+ */
+ GNUNET_CADET_close_port (lp);
+ lp = NULL;
+ }
+#endif
ch = channel;
if (GNUNET_NO == echo)
{
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to `%s'\n", target_id);
opt = GNUNET_CADET_OPTION_DEFAULT | GNUNET_CADET_OPTION_RELIABLE;
- ch = GNUNET_CADET_channel_create (mh, NULL, &pid, target_port, opt);
+ 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
*/
static int
data_callback (void *cls,
- struct GNUNET_CADET_Channel *channel,
- void **channel_ctx,
- const struct GNUNET_MessageHeader *message)
+ struct GNUNET_CADET_Channel *channel,
+ void **channel_ctx,
+ const struct GNUNET_MessageHeader *message)
{
uint16_t len;
ssize_t done;
if (GNUNET_YES == echo)
{
- if (0 != listen_port)
+ if (NULL != listen_port)
{
/* Just listening to echo incoming messages*/
if (NULL != th)
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- GNUNET_CADET_InboundChannelNotificationHandler *newch = NULL;
- GNUNET_CADET_ChannelEndHandler *endch = NULL;
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 */
};
- static uint32_t *ports = NULL;
+
/* FIXME add option to monitor apps */
target_id = args[0];
- target_port = args[0] && args[1] ? atoi(args[1]) : 0;
+ if (target_id && args[1]) target_port = args[1];
+
if ( (0 != (request_peers | request_tunnels)
|| 0 != monitor_mode
|| NULL != tunnel_id
"Creating channel to %s\n",
target_id);
GNUNET_SCHEDULER_add_now (&create_channel, NULL);
- endch = &channel_ended;
- }
- else if (0 != listen_port)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Listen\n");
- newch = &channel_incoming;
- endch = &channel_ended;
- ports = GNUNET_malloc (sizeof (uint32_t) * 2);
- ports[0] = listen_port;
}
else if (NULL != peer_id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Show all tunnels\n");
job = GNUNET_SCHEDULER_add_now (&get_tunnels, NULL);
}
- else
+ else if (NULL == listen_port)
{
FPRINTF (stderr, "No action requested\n");
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to cadet\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET service\n");
mh = GNUNET_CADET_connect (cfg,
NULL, /* cls */
- newch, /* new channel */
- endch, /* cleaner */
- handlers,
- ports);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Done\n");
+ &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);
+ }
}
// 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 (default; 0)"),
- GNUNET_YES, &GNUNET_GETOPT_set_uint, &listen_port},
+ 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},
projects / oweals / gnunet.git / blobdiff