7 files changed, 606 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 15a829f02..d0185ffe4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2020 GNUnet e.V.
+# (C) 2001--2021 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
@@ -1937,6 +1937,7 @@ src/datastore/Makefile
 src/datastore/datastore.conf
 src/dht/Makefile
 src/dht/dht.conf
+src/dhtu/Makefile
 src/dns/Makefile
 src/dns/dns.conf
 src/exit/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 996b8bda2..68b2f3e1f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -115,6 +115,8 @@ src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-service-dht_routing.c
 src/dht/gnunet_dht_profiler.c
 src/dht/plugin_block_dht.c
+src/dhtu/plugin_dhtu_gnunet.c
+src/dhtu/plugin_dhtu_ip.c
 src/dns/dns_api.c
 src/dns/gnunet-dns-monitor.c
 src/dns/gnunet-dns-redirector.c
@@ -313,7 +315,6 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
-src/reclaim/test.c
 src/regex/gnunet-daemon-regexprofiler.c
 src/regex/gnunet-regex-profiler.c
 src/regex/gnunet-regex-simulation-profiler.c
@@ -413,6 +414,10 @@ src/testbed/gnunet_testbed_mpi_spawn.c
 src/testbed/testbed_api.c
 src/testbed/testbed_api_barriers.c
 src/testbed/testbed_api_cmd_controller.c
+src/testbed/testbed_api_cmd_netjail_start.c
+src/testbed/testbed_api_cmd_netjail_start_testbed.c
+src/testbed/testbed_api_cmd_netjail_stop.c
+src/testbed/testbed_api_cmd_netjail_stop_testbed.c
 src/testbed/testbed_api_cmd_peer.c
 src/testbed/testbed_api_cmd_peer_store.c
 src/testbed/testbed_api_cmd_tng_connect.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 07b9cf1e9..5df85f9db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,7 @@ SUBDIRS = \
   $(TESTBED) \
   $(ATS_TESTS) \
   nse \
+  dhtu \
   dht \
   hostlist \
   topology \
diff --git a/src/dhtu/Makefile.am b/src/dhtu/Makefile.am
new file mode 100644
index 000000000..72b422812
--- /dev/null
+++ b/src/dhtu/Makefile.am
@@ -0,0 +1,24 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_dhtu_ip.la
+
+libgnunet_plugin_dhtu_ip_la_SOURCES = \
+  plugin_dhtu_ip.c
+libgnunet_plugin_dhtu_ip_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_dhtu_ip_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
diff --git a/src/dhtu/plugin_dhtu_gnunet.c b/src/dhtu/plugin_dhtu_gnunet.c
new file mode 100644
index 000000000..d6cd75242
--- /dev/null
+++ b/src/dhtu/plugin_dhtu_gnunet.c
@@ -0,0 +1,285 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2021 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
+ */
+
+/**
+ * @author Christian Grothoff
+ *
+ * @file plugin_dhtu_ip.c
+ * @brief plain IP based DHT network underlay
+ */
+#include "platform.h"
+#incluce "gnunet_dhtu_plugin.h"
+
+/**
+ * Opaque handle that the underlay offers for our address to be used when
+ * sending messages to another peer.
+ */
+struct GNUNET_DHTU_Source
+{
+
+  /**
+   * Application context for this source.
+   */
+  void *app_ctx;
+};
+
+
+/**
+ * Opaque handle that the underlay offers for the target peer when sending
+ * messages to another peer.
+ */
+struct GNUNET_DHTU_Target
+{
+  
+  /**
+   * Application context for this target.
+   */
+  void *app_ctx;
+
+  /**
+   * Head of preferences expressed for this target.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *ph_head;
+
+  /**
+   * Tail of preferences expressed for this target.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *ph_tail;
+
+  /**
+   * Preference counter, length of the @a ph_head DLL.
+   */
+  unsigned int ph_count;
+
+};
+
+/**
+ * Opaque handle expressing a preference of the DHT to
+ * keep a particular target connected.
+ */
+struct GNUNET_DHTU_PreferenceHandle
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *prev;
+
+  /**
+   * Target a preference was expressed for.
+   */
+  struct GNUNET_DHTU_Target *target;
+};
+
+
+/**
+ * Opaque handle for a private key used by this underlay.
+ */
+struct GNUNET_DHTU_PrivateKey
+{
+  /* we are IP, we do not do crypto */
+};
+
+
+/**
+ * Closure for all plugin functions.
+ */
+struct Plugin
+{
+  /** 
+   * Callbacks into the DHT.
+   */
+  struct GNUNET_DHTU_PluginEnvironment *env;
+};
+
+
+/**
+ * Use our private key to sign a message.
+ *
+ * @param cls closure
+ * @param pk our private key to sign with
+ * @param purpose what to sign
+ * @param[out] signature, allocated on heap and returned
+ * @return -1 on error, otherwise number of bytes in @a sig
+ */
+static ssize_t
+ip_sign (void *cls,
+         const struct GNUNET_DHTU_PrivateKey *pk,
+         const struct GNUNET_DHTU_SignaturePurpose *purpose,
+         void **sig)
+{
+  return 0;
+}
+
+
+/**
+ * Verify signature in @a sig over @a purpose.
+ *
+ * @param cls closure
+ * @param pk public key to verify signature of
+ * @param purpose what was being signed
+ * @param sig signature data
+ * @param sig_size number of bytes in @a sig
+ * @return #GNUNET_OK if signature is valid
+ *         #GNUNET_NO if signatures are not supported
+ *         #GNUNET_SYSERR if signature is invalid
+ */
+static enum GNUNET_GenericReturnValue
+ip_verify (void *cls,
+           const struct GNUNET_DHTU_PublicKey *pk,
+           const struct GNUNET_DHTU_SignaturePurpose *purpose,
+           const void *sig,
+           size_t sig_size)
+{
+  return GNUNET_NO;
+}
+
+
+/**
+ * Request creation of a session with a peer at the given @a address.
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param address target address to connect to
+ */
+static void
+ip_try_connect (void *cls,
+                const char *address)
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Request underlay to keep the connection to @a target alive if possible.
+ * Hold may be called multiple times to express a strong preference to
+ * keep a connection, say because a @a target is in multiple tables.
+ * 
+ * @param cls closure
+ * @param target connection to keep alive
+ */
+static struct GNUNET_DHTU_PreferenceHandle *
+ip_hold (void *cls,
+         struct GNUNET_DHTU_Target *target)
+{
+  struct GNUNET_DHTU_PreferenceHandle *ph;
+
+  ph = GNUNET_new (struct GNUNET_DHTU_PreferenceHandle);
+  ph->target = target;
+  GNUNET_CONTAINER_DLL_insert (target->ph_head,
+                               target->ph_tail,
+                               ph);
+  target->ph_count++;
+  return ph;
+}
+
+
+/**
+ * Do no long request underlay to keep the connection alive.
+ * 
+ * @param cls closure
+ * @param target connection to keep alive
+ */
+static void
+ip_drop (struct GNUNET_DHTU_PreferenceHandle *ph)
+{
+  struct GNUNET_DHTU_Target *target = ph->target;
+  
+  GNUNET_CONTAINER_DLL_remove (target->ph_head,
+                               target->ph_tail,
+                               ph);
+  target->ph_count--;
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Send message to some other participant over the network.  Note that
+ * sending is not guaranteeing that the other peer actually received the
+ * message.  For any given @a target, the DHT must wait for the @a
+ * finished_cb to be called before calling send() again.
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param target receiver identification
+ * @param msg message
+ * @param msg_size number of bytes in @a msg
+ * @param finished_cb function called once transmission is done
+ *        (not called if @a target disconnects, then only the
+ *         disconnect_cb is called). 
+ * @param finished_cb_cls closure for @a finished_cb
+ */
+static void
+ip_send (void *cls,
+         struct GNUNET_DHTU_Target *target,
+         const void *msg,
+         size_t msg_size,
+         GNUNET_SCHEDULER_TaskCallback finished_cb,
+         void *finished_cb_cls)
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls closure (the `struct GNUNET_DHTU_PluginEnvironment`)
+ * @return the plugin's API
+ */
+void *
+libgnunet_plugin_dhtu_ip_init (void *cls)
+{
+  struct GNUNET_DHTU_PluginEnvironment *env = cls;
+  struct GNUNET_DHTU_PluginFunctions *api;
+  struct Plugin *plugin;
+
+  plugin = GNUNET_new (struct Plugin);
+  plugin->env = env;
+  api = GNUNET_new (struct GNUNET_DHTU_PluginFunctions);
+  api->cls = plugin;
+  api->sign = &ip_sign;
+  api->verify = &ip_verify;
+  api->try_connect = &ip_try_connect;
+  api->hold = &ip_hold;
+  api->drop = &ip_drop;
+  api->send = &ip_send;
+  return api;
+}
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls closure (our `struct Plugin`)
+ * @return NULL
+ */
+void *
+libgnunet_plugin_dhtu_gnunet_done (void *cls)
+{
+  struct GNUNET_DHTU_PluginFunctions *api = cls;
+  struct Plugin *plugin = api->cls;
+
+  GNUNET_free (plugin);
+  GNUNET_free (api);
+  return NULL;
+}
diff --git a/src/dhtu/plugin_dhtu_ip.c b/src/dhtu/plugin_dhtu_ip.c
new file mode 100644
index 000000000..554c096e1
--- /dev/null
+++ b/src/dhtu/plugin_dhtu_ip.c
@@ -0,0 +1,285 @@
+/*
+     This file is part of GNUnet
+     Copyright (C) 2021 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
+ */
+
+/**
+ * @author Christian Grothoff
+ *
+ * @file plugin_dhtu_ip.c
+ * @brief plain IP based DHT network underlay
+ */
+#include "platform.h"
+#include "gnunet_dhtu_plugin.h"
+
+/**
+ * Opaque handle that the underlay offers for our address to be used when
+ * sending messages to another peer.
+ */
+struct GNUNET_DHTU_Source
+{
+
+  /**
+   * Application context for this source.
+   */
+  void *app_ctx;
+};
+
+
+/**
+ * Opaque handle that the underlay offers for the target peer when sending
+ * messages to another peer.
+ */
+struct GNUNET_DHTU_Target
+{
+  
+  /**
+   * Application context for this target.
+   */
+  void *app_ctx;
+
+  /**
+   * Head of preferences expressed for this target.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *ph_head;
+
+  /**
+   * Tail of preferences expressed for this target.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *ph_tail;
+
+  /**
+   * Preference counter, length of the @a ph_head DLL.
+   */
+  unsigned int ph_count;
+
+};
+
+/**
+ * Opaque handle expressing a preference of the DHT to
+ * keep a particular target connected.
+ */
+struct GNUNET_DHTU_PreferenceHandle
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct GNUNET_DHTU_PreferenceHandle *prev;
+
+  /**
+   * Target a preference was expressed for.
+   */
+  struct GNUNET_DHTU_Target *target;
+};
+
+
+/**
+ * Opaque handle for a private key used by this underlay.
+ */
+struct GNUNET_DHTU_PrivateKey
+{
+  /* we are IP, we do not do crypto */
+};
+
+
+/**
+ * Closure for all plugin functions.
+ */
+struct Plugin
+{
+  /** 
+   * Callbacks into the DHT.
+   */
+  struct GNUNET_DHTU_PluginEnvironment *env;
+};
+
+
+/**
+ * Use our private key to sign a message.
+ *
+ * @param cls closure
+ * @param pk our private key to sign with
+ * @param purpose what to sign
+ * @param[out] signature, allocated on heap and returned
+ * @return -1 on error, otherwise number of bytes in @a sig
+ */
+static ssize_t
+ip_sign (void *cls,
+         const struct GNUNET_DHTU_PrivateKey *pk,
+         const struct GNUNET_DHTU_SignaturePurpose *purpose,
+         void **sig)
+{
+  return 0;
+}
+
+
+/**
+ * Verify signature in @a sig over @a purpose.
+ *
+ * @param cls closure
+ * @param pk public key to verify signature of
+ * @param purpose what was being signed
+ * @param sig signature data
+ * @param sig_size number of bytes in @a sig
+ * @return #GNUNET_OK if signature is valid
+ *         #GNUNET_NO if signatures are not supported
+ *         #GNUNET_SYSERR if signature is invalid
+ */
+static enum GNUNET_GenericReturnValue
+ip_verify (void *cls,
+           const struct GNUNET_DHTU_PublicKey *pk,
+           const struct GNUNET_DHTU_SignaturePurpose *purpose,
+           const void *sig,
+           size_t sig_size)
+{
+  return GNUNET_NO;
+}
+
+
+/**
+ * Request creation of a session with a peer at the given @a address.
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param address target address to connect to
+ */
+static void
+ip_try_connect (void *cls,
+                const char *address)
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Request underlay to keep the connection to @a target alive if possible.
+ * Hold may be called multiple times to express a strong preference to
+ * keep a connection, say because a @a target is in multiple tables.
+ * 
+ * @param cls closure
+ * @param target connection to keep alive
+ */
+static struct GNUNET_DHTU_PreferenceHandle *
+ip_hold (void *cls,
+         struct GNUNET_DHTU_Target *target)
+{
+  struct GNUNET_DHTU_PreferenceHandle *ph;
+
+  ph = GNUNET_new (struct GNUNET_DHTU_PreferenceHandle);
+  ph->target = target;
+  GNUNET_CONTAINER_DLL_insert (target->ph_head,
+                               target->ph_tail,
+                               ph);
+  target->ph_count++;
+  return ph;
+}
+
+
+/**
+ * Do no long request underlay to keep the connection alive.
+ * 
+ * @param cls closure
+ * @param target connection to keep alive
+ */
+static void
+ip_drop (struct GNUNET_DHTU_PreferenceHandle *ph)
+{
+  struct GNUNET_DHTU_Target *target = ph->target;
+  
+  GNUNET_CONTAINER_DLL_remove (target->ph_head,
+                               target->ph_tail,
+                               ph);
+  target->ph_count--;
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Send message to some other participant over the network.  Note that
+ * sending is not guaranteeing that the other peer actually received the
+ * message.  For any given @a target, the DHT must wait for the @a
+ * finished_cb to be called before calling send() again.
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param target receiver identification
+ * @param msg message
+ * @param msg_size number of bytes in @a msg
+ * @param finished_cb function called once transmission is done
+ *        (not called if @a target disconnects, then only the
+ *         disconnect_cb is called). 
+ * @param finished_cb_cls closure for @a finished_cb
+ */
+static void
+ip_send (void *cls,
+         struct GNUNET_DHTU_Target *target,
+         const void *msg,
+         size_t msg_size,
+         GNUNET_SCHEDULER_TaskCallback finished_cb,
+         void *finished_cb_cls)
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls closure (the `struct GNUNET_DHTU_PluginEnvironment`)
+ * @return the plugin's API
+ */
+void *
+libgnunet_plugin_dhtu_ip_init (void *cls)
+{
+  struct GNUNET_DHTU_PluginEnvironment *env = cls;
+  struct GNUNET_DHTU_PluginFunctions *api;
+  struct Plugin *plugin;
+
+  plugin = GNUNET_new (struct Plugin);
+  plugin->env = env;
+  api = GNUNET_new (struct GNUNET_DHTU_PluginFunctions);
+  api->cls = plugin;
+  api->sign = &ip_sign;
+  api->verify = &ip_verify;
+  api->try_connect = &ip_try_connect;
+  api->hold = &ip_hold;
+  api->drop = &ip_drop;
+  api->send = &ip_send;
+  return api;
+}
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls closure (our `struct Plugin`)
+ * @return NULL
+ */
+void *
+libgnunet_plugin_dhtu_ip_done (void *cls)
+{
+  struct GNUNET_DHTU_PluginFunctions *api = cls;
+  struct Plugin *plugin = api->cls;
+
+  GNUNET_free (plugin);
+  GNUNET_free (api);
+  return NULL;
+}
diff --git a/src/include/gnunet_dhtu_plugin.h b/src/include/gnunet_dhtu_plugin.h
index f87d36719..bcf61eaa2 100644
--- a/src/include/gnunet_dhtu_plugin.h
+++ b/src/include/gnunet_dhtu_plugin.h
@@ -27,6 +27,9 @@
 #ifndef PLUGIN_DHTU_H
 #define PLUGIN_DHTU_H
 
+#include "gnunet_util_lib.h"
+
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -270,7 +273,6 @@ struct GNUNET_DHTU_PluginFunctions
    * Request creation of a session with a peer at the given @a address.
    *
    * @param cls closure (internal context for the plugin)
-   * @param pk public key of the target
    * @param address target address to connect to
    */
   void