[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31155 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31155 - gnunet/src/mesh |
Date: |
Fri, 6 Dec 2013 18:45:36 +0100 |
Author: bartpolot
Date: 2013-12-06 18:45:36 +0100 (Fri, 06 Dec 2013)
New Revision: 31155
Modified:
gnunet/src/mesh/gnunet-mesh.c
Log:
- wip
Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c 2013-12-06 17:13:08 UTC (rev 31154)
+++ gnunet/src/mesh/gnunet-mesh.c 2013-12-06 17:45:36 UTC (rev 31155)
@@ -91,7 +91,7 @@
-void
+static void
listen_stdio (void);
@@ -177,8 +177,13 @@
return;
}
- data_size = read (2, buf, 60000);
+ data_size = read (0, buf, 60000);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "stdio read %u bytes\n", data_size);
+ if (data_size < 1)
+ {
+ GNUNET_SCHEDULER_shutdown();
+ return;
+ }
GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
data_size
@@ -186,13 +191,17 @@
&data_ready, buf);
}
-void
+
+/**
+ * Start listening to stdin
+ */
+static void
listen_stdio (void)
{
struct GNUNET_NETWORK_FDSet *rs;
rs = GNUNET_NETWORK_fdset_create ();
- GNUNET_NETWORK_fdset_set_native (rs, 2);
+ GNUNET_NETWORK_fdset_set_native (rs, 0);
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_TIME_UNIT_FOREVER_REL,
rs, NULL,
@@ -241,7 +250,7 @@
* @return initial channel context for the channel
* (can be NULL -- that's not an error)
*/
-void *
+static void *
channel_incoming (void *cls,
struct GNUNET_MESH_Channel * channel,
const struct GNUNET_PeerIdentity * initiator,
@@ -312,7 +321,7 @@
* @return #GNUNET_OK to keep the channel open,
* #GNUNET_SYSERR to close it (signal serious error).
*/
-int
+static int
data_callback (void *cls,
struct GNUNET_MESH_Channel *channel,
void **channel_ctx,
@@ -543,6 +552,7 @@
main (int argc, char *const *argv)
{
int res;
+ const char helpstr[] = "Create channels and retreive info about meshs
status.";
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'a', "channel", "TUNNEL_ID:CHANNEL_ID",
gettext_noop ("provide information about a particular channel"),
@@ -569,9 +579,8 @@
return 2;
res = GNUNET_PROGRAM_run (argc, argv, "gnunet-mesh (OPTIONS | TARGET PORT)",
- gettext_noop
- ("Create channels and retreive info about meshs
status."),
- options, &run, NULL);
+ gettext_noop (helpstr),
+ options, &run, NULL);
GNUNET_free ((void *) argv);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31155 - gnunet/src/mesh,
gnunet <=