[GNUnet-SVN] r31154 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-12-06 18:13:08 +0100 (Fri, 06 Dec 2013)
New Revision: 31154

Modified:
   gnunet/src/mesh/gnunet-mesh.c
Log:
gnunet-mesh has netcat capabilities


Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c       2013-12-06 16:33:00 UTC (rev 31153)
+++ gnunet/src/mesh/gnunet-mesh.c       2013-12-06 17:13:08 UTC (rev 31154)
@@ -68,6 +68,10 @@
  */
 static uint32_t target_port;
 
+/**
+ * Data pending in netcat mode.
+ */
+size_t data_size;
 
 
 /**
@@ -75,6 +79,9 @@
  */
 static struct GNUNET_MESH_Handle *mh;
 
+/**
+ * Channel handle.
+ */
 static struct GNUNET_MESH_Channel *ch;
 
 /**
@@ -82,6 +89,13 @@
  */
 GNUNET_SCHEDULER_TaskIdentifier sd;
 
+
+
+void
+listen_stdio (void);
+
+
+
 /**
  * Task run in monitor mode when the user presses CTRL-C to abort.
  * Stops monitoring activity.
@@ -107,6 +121,86 @@
 
 
 /**
+ * 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
+ *
+ * @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
+ */
+size_t
+data_ready (void *cls, size_t size, void *buf)
+{
+  struct GNUNET_MessageHeader *msg;
+  size_t total_size;
+
+  if (NULL == buf || 0 == size)
+  {
+    GNUNET_SCHEDULER_shutdown();
+    return 0;
+  }
+
+  total_size = data_size + sizeof (struct GNUNET_MessageHeader);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending %u bytes\n", data_size);
+  GNUNET_assert (size >= total_size);
+
+  msg = buf;
+  msg->size = ntohs (total_size);
+  msg->type = ntohs (GNUNET_MESSAGE_TYPE_MESH_CLI);
+  memcpy (&msg[1], cls, data_size);
+  listen_stdio ();
+
+  return total_size;
+}
+
+
+/**
+ * Task run in monitor mode when the user presses CTRL-C to abort.
+ * Stops monitoring activity.
+ *
+ * @param cls Closure (unused).
+ * @param tc scheduler context
+ */
+static void
+read_stdio (void *cls,
+            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  char buf[60000];
+
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+  {
+    return;
+  }
+
+  data_size = read (2, buf, 60000);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "stdio read %u bytes\n", data_size);
+  GNUNET_MESH_notify_transmit_ready (ch, GNUNET_NO,
+                                     GNUNET_TIME_UNIT_FOREVER_REL,
+                                     data_size
+                                     + sizeof (struct GNUNET_MessageHeader),
+                                     &data_ready, buf);
+}
+
+void
+listen_stdio (void)
+{
+  struct GNUNET_NETWORK_FDSet *rs;
+
+  rs = GNUNET_NETWORK_fdset_create ();
+  GNUNET_NETWORK_fdset_set_native (rs, 2);
+  GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+                               GNUNET_TIME_UNIT_FOREVER_REL,
+                               rs, NULL,
+                               &read_stdio, NULL);
+}
+
+
+/**
  * Function called whenever a channel is destroyed.  Should clean up
  * any associated state.
  *
@@ -153,7 +247,9 @@
                   const struct GNUNET_PeerIdentity * initiator,
                   uint32_t port, enum MeshOption options)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Incoming channel %p on port %u\n", 
channel, port);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Incoming channel %p on port %u\n",
+              channel, port);
   if (NULL != ch)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "A channel already exists\n");
@@ -165,6 +261,7 @@
     return NULL;
   }
   ch = channel;
+  listen_stdio ();
   return NULL;
 }
 
@@ -197,6 +294,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to `%s'\n", target_id);
   ch = GNUNET_MESH_channel_create (mh, NULL, &pid, target_port,
                                    GNUNET_MESH_OPTION_DEFAULT);
+  listen_stdio ();
 }
 
 
@@ -224,6 +322,7 @@
   GNUNET_break (ch == channel);
 
   len = ntohs (message->size) - sizeof (*message);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u bytes\n", len);
   FPRINTF (stdout, "%.*s", len, (char *) &message[1]);
   return GNUNET_OK;
 }