4 files changed, 305 insertions, 0 deletions

diff --git a/src/cli/core/.gitignore b/src/cli/core/.gitignore
new file mode 100644
index 000000000..95169ed2b
--- /dev/null
+++ b/src/cli/core/.gitignore
@@ -0,0 +1 @@
+gnunet-core
diff --git a/src/cli/core/Makefile.am b/src/cli/core/Makefile.am
new file mode 100644
index 000000000..97abf0db2
--- /dev/null
+++ b/src/cli/core/Makefile.am
@@ -0,0 +1,24 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+plugindir = $(libdir)/gnunet
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-core
+
+gnunet_core_SOURCES = \
+ gnunet-core.c
+gnunet_core_LDADD = \
+  $(top_builddir)/src/service/core/libgnunetcore.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_core_LDFLAGS = \
+  $(GN_LIBINTL)
diff --git a/src/cli/core/gnunet-core.c b/src/cli/core/gnunet-core.c
new file mode 100644
index 000000000..00b08eefc
--- /dev/null
+++ b/src/cli/core/gnunet-core.c
@@ -0,0 +1,274 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2011, 2012, 2014 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file core/gnunet-core.c
+ * @brief Print information about other peers known to CORE.
+ * @author Nathan Evans
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_core_service.h"
+
+
+/**
+ * Option -m.
+ */
+static int monitor_connections;
+
+/**
+ * Option -i.
+ */
+static int show_pid;
+
+/**
+ * Option -s.
+ */
+static int show_conns;
+
+/**
+ * Handle to the CORE monitor.
+ */
+static struct GNUNET_CORE_MonitorHandle *mh;
+
+
+/**
+ * Task run in monitor mode when the user presses CTRL-C to abort.
+ * Stops monitoring activity.
+ *
+ * @param cls NULL
+ */
+static void
+shutdown_task (void *cls)
+{
+  (void) cls;
+  if (NULL != mh)
+  {
+    GNUNET_CORE_monitor_stop (mh);
+    mh = NULL;
+  }
+}
+
+
+/**
+ * Function called to notify core users that another
+ * peer changed its state with us.
+ *
+ * @param cls closure
+ * @param peer the peer that changed state
+ * @param state new state of the peer
+ * @param timeout timeout for the new state
+ */
+static void
+monitor_cb (void *cls,
+            const struct GNUNET_PeerIdentity *peer,
+            enum GNUNET_CORE_KxState state,
+            struct GNUNET_TIME_Absolute timeout)
+{
+  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+  const char *now_str;
+  const char *state_str;
+
+  (void) cls;
+  if (((NULL == peer) || (GNUNET_CORE_KX_ITERATION_FINISHED == state)) &&
+      (GNUNET_NO == monitor_connections))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  switch (state)
+  {
+  case GNUNET_CORE_KX_STATE_DOWN:
+    /* should never happen, as we immediately send the key */
+    state_str = _ ("fresh connection");
+    break;
+
+  case GNUNET_CORE_KX_STATE_KEY_SENT:
+    state_str = _ ("key sent");
+    break;
+
+  case GNUNET_CORE_KX_STATE_KEY_RECEIVED:
+    state_str = _ ("key received");
+    break;
+
+  case GNUNET_CORE_KX_STATE_UP:
+    state_str = _ ("connection established");
+    break;
+
+  case GNUNET_CORE_KX_STATE_REKEY_SENT:
+    state_str = _ ("rekeying");
+    break;
+
+  case GNUNET_CORE_KX_PEER_DISCONNECT:
+    state_str = _ ("disconnected");
+    break;
+
+  case GNUNET_CORE_KX_ITERATION_FINISHED:
+    return;
+
+  case GNUNET_CORE_KX_CORE_DISCONNECT:
+    fprintf (stderr,
+             "%s\n",
+             _ ("Connection to CORE service lost (reconnecting)"));
+    return;
+
+  default:
+    state_str = _ ("unknown state");
+    break;
+  }
+  now_str = GNUNET_STRINGS_absolute_time_to_string (now);
+  fprintf (stdout,
+           _ ("%24s: %-30s %4s (timeout in %6s)\n"),
+           now_str,
+           state_str,
+           GNUNET_i2s (peer),
+           GNUNET_STRINGS_relative_time_to_string (
+             GNUNET_TIME_absolute_get_remaining (timeout),
+             GNUNET_YES));
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_CRYPTO_EddsaPrivateKey pk;
+  struct GNUNET_CRYPTO_EddsaPublicKey pub;
+  char *keyfile;
+  (void) cls;
+  (void) cfgfile;
+  if (NULL != args[0])
+  {
+    fprintf (stderr, _ ("Invalid command line argument `%s'\n"), args[0]);
+    return;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "PEER",
+                                               "PRIVATE_KEY",
+                                               &keyfile))
+  {
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_ERROR,
+      _ ("Core service is lacking HOSTKEY configuration setting.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_SYSERR ==
+      GNUNET_CRYPTO_eddsa_key_from_file (keyfile,
+                                         GNUNET_YES,
+                                         &pk))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to read peer's private key!\n");
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_free (keyfile);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&pk, &pub);
+  if (show_pid)
+    fprintf (stdout,
+             _ ("Current local peer identity: %s\n"),
+             GNUNET_i2s_full ((struct GNUNET_PeerIdentity*) &pub));
+  if (show_conns || monitor_connections)
+  {
+    mh = GNUNET_CORE_monitor_start (cfg, &monitor_cb, NULL);
+    if (NULL == mh)
+    {
+      fprintf (stderr, "%s", _ ("Failed to connect to CORE service!\n"));
+      GNUNET_free (keyfile);
+      return;
+    }
+  }
+  if (! show_pid && ! show_conns && ! monitor_connections)
+  {
+    fprintf (stderr, "%s", _ ("No argument given.\n"));
+    GNUNET_free (keyfile);
+    return;
+  }
+  GNUNET_free (keyfile);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
+}
+
+
+/**
+ * The main function to obtain peer information from CORE.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  int res;
+  struct GNUNET_GETOPT_CommandLineOption options[] =
+  { GNUNET_GETOPT_option_flag (
+      'm',
+      "monitor",
+      gettext_noop (
+        "provide information about all current connections (continuously)"),
+      &monitor_connections),
+    GNUNET_GETOPT_option_flag (
+      'i',
+      "show-identity",
+      gettext_noop (
+        "Show our current peer identity"
+        ),
+      &show_pid),
+    GNUNET_GETOPT_option_flag (
+      's',
+      "connection-status",
+      gettext_noop (
+        "Show current connections"
+        ),
+      &show_conns),
+    GNUNET_GETOPT_OPTION_END };
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+  res = GNUNET_PROGRAM_run (argc,
+                            argv,
+                            "gnunet-core",
+                            gettext_noop (
+                              "Print information about connected peers."),
+                            options,
+                            &run,
+                            NULL);
+
+  GNUNET_free_nz ((void *) argv);
+  if (GNUNET_OK == res)
+    return 0;
+  return 1;
+}
+
+
+/* end of gnunet-core.c */
diff --git a/src/cli/core/meson.build b/src/cli/core/meson.build
new file mode 100644
index 000000000..db246a3c4
--- /dev/null
+++ b/src/cli/core/meson.build
@@ -0,0 +1,6 @@
+executable ('gnunet-core',
+            ['gnunet-core.c'],
+            dependencies: [libgnunetcore_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))