9 files changed, 140 insertions, 4 deletions

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d7584b2c4..6ad6dd70a 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = \
         util \
         arm \
         statistics \
+        peerstore \
         core \
         nat \
         nat-auto \
diff --git a/src/cli/gns/test_dns2gns.conf b/src/cli/gns/test_dns2gns.conf
index f484d4114..2f6bdc797 100644
--- a/src/cli/gns/test_dns2gns.conf
+++ b/src/cli/gns/test_dns2gns.conf
@@ -18,7 +18,7 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 ZONE_PUBLISH_TIME_WINDOW = 1 h
-DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
+.gnunet.org =
 
 [namestore]
 IMMEDIATE_START = YES
@@ -65,4 +65,5 @@ IMMEDIATE_START = YES
 RUN_PER_USER = YES
 BIND_TO = 127.0.0.1
 BIND_TO6 = ::1
-OPTIONS = -d 1.1.1.1 -p 12000
+PORT = 12000
+OPTIONS = -d 1.1.1.1
diff --git a/src/cli/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh
index 295bcc766..a6024ca3c 100755
--- a/src/cli/gns/test_dns2gns.sh
+++ b/src/cli/gns/test_dns2gns.sh
@@ -20,7 +20,7 @@ MY_EGO="localego"
 TEST_IP="127.0.0.1"
 TEST_IPV6="dead::beef"
 LABEL="fnord"
-TEST_DOMAIN="gnunet.org"
+TEST_DOMAIN="taler.net"
 
 gnunet-arm -s -c test_dns2gns.conf
 PKEY=`gnunet-identity -V -C $MY_EGO -c test_dns2gns.conf`
@@ -34,14 +34,16 @@ if nslookup -port=12000 $LABEL.$PKEY localhost && nslookup -port=12000 $LABEL.$M
   echo "PASS: GNS records can be resolved using dns2gns bridge"
 else
   echo "FAIL: GNS records can't be resolved using dns2gns bridge"
+  gnunet-arm -e -c test_dns2gns.conf
   rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME`
   exit 1
 fi
 
-if nslookup -port=12000 gnunet.org localhost; then
+if nslookup -port=12000 $TEST_DOMAIN localhost; then
   echo "PASS: DNS records can be resolved using dns2gns bridge"
 else
   echo "FAIL: DNS records can't be resolved using dns2gns bridge"
+  gnunet-arm -e -c test_dns2gns.conf
   rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME`
   exit 1
 fi
diff --git a/src/cli/identity/.gitignore b/src/cli/identity/.gitignore
new file mode 100644
index 000000000..1c5862dbb
--- /dev/null
+++ b/src/cli/identity/.gitignore
@@ -0,0 +1 @@
+gnunet-identity
diff --git a/src/cli/meson.build b/src/cli/meson.build
index 5c1fded1a..12662933d 100644
--- a/src/cli/meson.build
+++ b/src/cli/meson.build
@@ -1,6 +1,7 @@
 subdir('util')
 subdir('arm')
 subdir('statistics')
+subdir('peerstore')
 subdir('datastore')
 subdir('nat')
 subdir('nat-auto')
diff --git a/src/cli/peerstore/.gitignore b/src/cli/peerstore/.gitignore
new file mode 100644
index 000000000..3ae0f6c6c
--- /dev/null
+++ b/src/cli/peerstore/.gitignore
@@ -0,0 +1 @@
+gnunet-peerstore
diff --git a/src/cli/peerstore/Makefile.am b/src/cli/peerstore/Makefile.am
new file mode 100644
index 000000000..f5be82f09
--- /dev/null
+++ b/src/cli/peerstore/Makefile.am
@@ -0,0 +1,23 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+# This program does not do anything.
+noinst_PROGRAMS = \
+ gnunet-peerstore
+
+gnunet_peerstore_SOURCES = \
+ gnunet-peerstore.c
+gnunet_peerstore_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
+  $(GN_LIBINTL)
diff --git a/src/cli/peerstore/gnunet-peerstore.c b/src/cli/peerstore/gnunet-peerstore.c
new file mode 100644
index 000000000..84cae675f
--- /dev/null
+++ b/src/cli/peerstore/gnunet-peerstore.c
@@ -0,0 +1,97 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C)
+
+     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 peerstore/gnunet-peerstore.c
+ * @brief peerstore tool
+ * @author Omar Tarabai
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_peerstore_service.h"
+
+static int ret;
+
+/*
+ * Handle to PEERSTORE service
+ */
+static struct GNUNET_PEERSTORE_Handle *peerstore_handle;
+
+
+/**
+ * Run on shutdown
+ *
+ * @param cls unused
+ */
+static void
+shutdown_task (void *cls)
+{
+  if (NULL != peerstore_handle)
+  {
+    GNUNET_PEERSTORE_disconnect (peerstore_handle);
+    peerstore_handle = NULL;
+  }
+}
+
+
+/**
+ * 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)
+{
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
+  peerstore_handle = GNUNET_PEERSTORE_connect (cfg);
+  GNUNET_assert (NULL != peerstore_handle);
+  ret = 0;
+}
+
+
+/**
+ * The main function to peerstore.
+ *
+ * @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)
+{
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc, argv, "gnunet-peerstore [options [value]]",
+                              gettext_noop ("peerstore"), options, &run,
+                              NULL)) ? ret : 1;
+}
+
+
+/* end of gnunet-peerstore.c */
diff --git a/src/cli/peerstore/meson.build b/src/cli/peerstore/meson.build
new file mode 100644
index 000000000..1fd177734
--- /dev/null
+++ b/src/cli/peerstore/meson.build
@@ -0,0 +1,9 @@
+executable ('gnunet-peerstore',
+            'gnunet-peerstore.c',
+            dependencies: [libgnunetpeerstore_dep,
+                           libgnunetutil_dep
+                          ],
+            include_directories: [incdir, configuration_inc],
+            install: false,
+            install_dir: get_option('bindir'))
+