[GNUnet-SVN] r36686 - gnunet/src/rps

[gnunet]

Author: ch3
Date: 2015-11-23 17:54:14 +0100 (Mon, 23 Nov 2015)
New Revision: 36686

Modified:
   gnunet/src/rps/gnunet-rps.c
Log:
implemented CLI

Modified: gnunet/src/rps/gnunet-rps.c
===================================================================
--- gnunet/src/rps/gnunet-rps.c 2015-11-23 08:47:51 UTC (rev 36685)
+++ gnunet/src/rps/gnunet-rps.c 2015-11-23 16:54:14 UTC (rev 36686)
@@ -20,7 +20,7 @@
 
 /**
  * @file rps/gnunet-rps.c
- * @brief rps tool
+ * @brief random peer sampling
  * @author Julius Bünger
  */
 #include "platform.h"
@@ -30,6 +30,110 @@
 static int ret;
 
 /**
+ * RPS handle
+ */
+static struct GNUNET_RPS_Handle *rps_handle;
+
+/**
+ * Request handle
+ */
+static struct GNUNET_RPS_Request_Handle *req_handle;
+
+/**
+ * PeerID (Option --seed)
+ */
+static struct GNUNET_PeerIdentity *peer_id;
+
+
+/**
+ * Shutdown task
+ */
+static struct GNUNET_SCHEDULER_Task *shutdown_task;
+
+
+/**
+ * Set an option of type 'struct GNUNET_PeerIdentity *' from the command line.
+ * A pointer to this function should be passed as part of the
+ * 'struct GNUNET_GETOPT_CommandLineOption' array to initialize options
+ * of this type.  It should be followed by a pointer to a value of
+ * type 'struct GNUNET_PeerIdentity *', which will be allocated with the 
requested string.
+ *
+ * @param ctx command line processing context
+ * @param scls additional closure (will point to the 'char *',
+ *             which will be allocated)
+ * @param option name of the option
+ * @param value actual value of the option (a PeerID)
+ * @return #GNUNET_OK
+ */
+static int
+GNUNET_GETOPT_set_peerid (struct GNUNET_GETOPT_CommandLineProcessorContext 
*ctx,
+                          void *scls, const char *option, const char *value)
+{
+  struct GNUNET_PeerIdentity **val = (struct GNUNET_PeerIdentity **) scls;
+
+  GNUNET_assert (NULL != value);
+  GNUNET_free_non_null (*val);
+  /* Not quite sure whether that is a sane way */
+  *val = GNUNET_new (struct GNUNET_PeerIdentity);
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_eddsa_public_key_from_string (value,
+                                                  strlen (value),
+                                                  &((*val)->public_key)))
+  {
+    FPRINTF (stderr, "Invalid peer ID %s\n", value);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Task run when user presses CTRL-C to abort.
+ * Cancels pending request and disconnects.
+ *
+ * @param cls NULL
+ * @param tc scheduler context
+ */
+static void
+do_shutdown (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  shutdown_task = NULL;
+  if (NULL != req_handle)
+    GNUNET_RPS_request_cancel (req_handle);
+  GNUNET_RPS_disconnect (rps_handle);
+}
+
+
+/**
+ * Callback called on receipt of reply.
+ * Prints replied PeerIDs.
+ *
+ * @param cls closure
+ * @param n number of peers
+ * @param recv_peers the received peers
+ */
+static void
+reply_handle (void *cls,
+              uint64_t n,
+              const struct GNUNET_PeerIdentity *recv_peers)
+{
+  uint64_t i;
+
+  req_handle = NULL;
+  for (i = 0; i < n; i++)
+  {
+    FPRINTF (stdout, "%s\n",
+        GNUNET_i2s_full (&recv_peers[i]));
+  }
+  ret = 0;
+
+  GNUNET_SCHEDULER_cancel (shutdown_task);
+  GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+}
+
+
+/**
  * Main function that will be run by the scheduler.
  *
  * @param cls closure
@@ -43,7 +147,27 @@
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  ret = 0;
+  static uint64_t num_peers;
+
+  rps_handle = GNUNET_RPS_connect (cfg);
+
+  if (NULL == peer_id)
+  { /* Request n PeerIDs */
+    /* If number was specified use it, else request single peer. */
+    num_peers = (NULL == args[0]) ? 1 : atoi (args[0]);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+        "Requesting %u PeerIDs\n", num_peers);
+    req_handle = GNUNET_RPS_request_peers (rps_handle, num_peers, 
reply_handle, NULL);
+    shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+        &do_shutdown, NULL);
+  }
+  else
+  { /* Seed PeerID */
+    GNUNET_RPS_seed_ids (rps_handle, 1, peer_id);
+    FPRINTF (stdout, "Seeded PeerID %s\n", GNUNET_i2s_full (peer_id));
+    ret = 0;
+    GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+  }
 }
 
 /**
@@ -56,15 +180,20 @@
 int
 main (int argc, char *const *argv)
 {
+  const char helpstr[] =
+    "Get random GNUnet peers. If none is specified a single is requested.";
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'s', "seed", "PEER_ID",
+      gettext_noop ("Seed a PeerID"),
+      GNUNET_YES, &GNUNET_GETOPT_set_peerid, &peer_id},
     GNUNET_GETOPT_OPTION_END
   };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,
-                              "gnunet-rps [options [value]]",
+                              "gnunet-rps [NUMBER_OF_PEERS]",
                               gettext_noop
-                              ("rps"),
+                              (helpstr),
                               options, &run, NULL)) ? ret : 1;
 }