fix out-of-tree build of GNUnet

56 files changed, 216 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index 431ba2669..8f88dddba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ pkgconfig/*.pc
 src/*/*.conf
 stamp-h1
 test-driver
+INSTALL
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ChangeLog
diff --git a/configure.ac b/configure.ac
index 4453acff2..d839f8b4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,6 +269,13 @@ AC_ARG_ENABLE(linker-hardening,
 fi])
 
 
+AC_ARG_ENABLE(sanitizer,
+  AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer),
+[if test x$enableval = xyes; then
+   LDFLAGS="$CFLAGS -fsanitize=address,undefined,unsigned-integer-overflow -fsanitize-recover=all -fno-omit-frame-pointer"
+fi])
+
+
 extra_logging=GNUNET_NO
 AC_ARG_ENABLE([logging],
    AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),
diff --git a/contrib/.gitignore b/contrib/.gitignore
new file mode 100644
index 000000000..d8a442c35
--- /dev/null
+++ b/contrib/.gitignore
@@ -0,0 +1,5 @@
+gnunet_janitor.py
+gnunet_pyexpect.py
+pydiffer.py
+terminate.py
+timeout_watchdog
diff --git a/gnunet-dev.nix b/gnunet-dev.nix
index 09baefe5e..89b65f6b4 100644
--- a/gnunet-dev.nix
+++ b/gnunet-dev.nix
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
     "--enable-gcc-hardening"
     "--enable-linker-hardening"
 
+    "--enable-poisoning"
+    "--enable-sanitizer"
     "--enable-experimental"
     "--enable-logging=verbose"
-    "--enable-poisoning"
   ];
 
   preConfigure = ''
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 000000000..c4c8d2915
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,6 @@
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+wchar_t.m4
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 000000000..0a6b78acb
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,3 @@
+POTFILES
+gnunet.pot
+remove-potcdate.sed
diff --git a/src/arm/.gitignore b/src/arm/.gitignore
new file mode 100644
index 000000000..0ea685353
--- /dev/null
+++ b/src/arm/.gitignore
@@ -0,0 +1,3 @@
+mockup-service
+gnunet-arm
+gnunet-service-arm
diff --git a/src/ats-tests/.gitignore b/src/ats-tests/.gitignore
new file mode 100644
index 000000000..9e4a44df5
--- /dev/null
+++ b/src/ats-tests/.gitignore
@@ -0,0 +1,2 @@
+gnunet-solver-eval
+gnunet-ats-sim
diff --git a/src/ats-tool/.gitignore b/src/ats-tool/.gitignore
new file mode 100644
index 000000000..2de03f0e8
--- /dev/null
+++ b/src/ats-tool/.gitignore
@@ -0,0 +1 @@
+gnunet-ats
diff --git a/src/ats/.gitignore b/src/ats/.gitignore
new file mode 100644
index 000000000..7b70f84a5
--- /dev/null
+++ b/src/ats/.gitignore
@@ -0,0 +1 @@
+gnunet-service-ats
diff --git a/src/cadet/.gitignore b/src/cadet/.gitignore
new file mode 100644
index 000000000..096ee06eb
--- /dev/null
+++ b/src/cadet/.gitignore
@@ -0,0 +1,21 @@
+gnunet-service-cadet
+gnunet-cadet
+gnunet-cadet-profiler
+test_cadet_2_forward
+test_cadet_2_keepalive
+test_cadet_2_signal
+test_cadet_2_speed
+test_cadet_2_speed_ack
+test_cadet_2_speed_backwards
+test_cadet_2_speed_reliable
+test_cadet_2_speed_reliable_backwards
+test_cadet_5_forward
+test_cadet_5_keepalive
+test_cadet_5_signal
+test_cadet_5_speed
+test_cadet_5_speed_ack
+test_cadet_5_speed_backwards
+test_cadet_5_speed_reliable
+test_cadet_5_speed_reliable_backwards
+test_cadet_local
+test_cadet_single
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index 55dd10d33..9b11ebf18 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -96,6 +96,11 @@ static unsigned long long dht_replication_level;
 static struct GNUNET_SCHEDULER_Task * announce_id_task;
 
 /**
+ * Delay for the next ID announce.
+ */
+static struct GNUNET_TIME_Relative announce_delay;
+
+/**
  * GET requests to stop on shutdown.
  */
 static struct GNUNET_CONTAINER_MultiHashMap32 *get_requests;
@@ -214,26 +219,27 @@ announce_id (void *cls)
   const struct GNUNET_HELLO_Message *hello;
   size_t size;
   struct GNUNET_TIME_Absolute expiration;
+  struct GNUNET_TIME_Relative next_put;
 
   announce_id_task = NULL;
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Announce ID\n");
-  /* TODO
-   * - Set data expiration in function of X
-   * - Adapt X to churn
-   */
   hello = GCH_get_mine ();
-  if (NULL == hello || (size = GNUNET_HELLO_size (hello)) == 0)
+  size = NULL != hello ? GNUNET_HELLO_size (hello) : 0;
+  if (NULL == hello || 0 == size)
   {
-    /* Peerinfo gave us no hello yet, try again in a second. */
-    announce_id_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                                     &announce_id, cls);
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "  no hello, waiting!\n");
+    /* Peerinfo gave us no hello yet, try again soon. */
+    LOG (GNUNET_ERROR_TYPE_INFO, "  no hello, waiting!\n");
     GNUNET_STATISTICS_update (stats, "# DHT announce skipped (no hello)",
                               1, GNUNET_NO);
-
-    return;
+    expiration = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
+                                           announce_delay);
+    announce_delay = GNUNET_TIME_STD_BACKOFF (announce_delay);
+  }
+  else
+  {
+    expiration = GNUNET_HELLO_get_last_expiration (hello);
+    announce_delay = GNUNET_TIME_UNIT_SECONDS;
   }
-  expiration = GNUNET_HELLO_get_last_expiration (hello);
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Hello %p size: %u\n", hello, size);
   GNUNET_STATISTICS_update (stats, "# DHT announce",
@@ -251,8 +257,13 @@ announce_id (void *cls)
                   expiration,  /* Data expiration */
                   NULL,         /* Continuation */
                   NULL);        /* Continuation closure */
-  announce_id_task =
-      GNUNET_SCHEDULER_add_delayed (id_announce_time, &announce_id, cls);
+
+  /* Call again in id_announce_time, unless HELLO expires first,
+   * but wait at least 1s. */
+  next_put = GNUNET_TIME_absolute_get_remaining (expiration);
+  next_put = GNUNET_TIME_relative_min (next_put, id_announce_time);
+  next_put = GNUNET_TIME_relative_max (next_put, GNUNET_TIME_UNIT_SECONDS);
+  announce_id_task = GNUNET_SCHEDULER_add_delayed (next_put, &announce_id, cls);
 }
 
 /**
@@ -291,11 +302,12 @@ GCD_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "init\n");
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (c, "CADET", "DHT_REPLICATION_LEVEL",
+      GNUNET_CONFIGURATION_get_value_number (c, "CADET",
+                                             "DHT_REPLICATION_LEVEL",
                                              &dht_replication_level))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
-                               "CADET", "DHT_REPLICATION_LEVEL", "USING DEFAULT");
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING, "CADET",
+                               "DHT_REPLICATION_LEVEL", "USING DEFAULT");
     dht_replication_level = 3;
   }
 
@@ -303,8 +315,8 @@ GCD_init (const struct GNUNET_CONFIGURATION_Handle *c)
       GNUNET_CONFIGURATION_get_value_time (c, "CADET", "ID_ANNOUNCE_TIME",
                                            &id_announce_time))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "CADET", "ID_ANNOUNCE_TIME", "MISSING");
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "CADET",
+                               "ID_ANNOUNCE_TIME", "MISSING");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -315,6 +327,7 @@ GCD_init (const struct GNUNET_CONFIGURATION_Handle *c)
     GNUNET_break (0);
   }
 
+  announce_delay = GNUNET_TIME_UNIT_SECONDS;
   announce_id_task = GNUNET_SCHEDULER_add_now (&announce_id, NULL);
   get_requests = GNUNET_CONTAINER_multihashmap32_create (32);
 }
diff --git a/src/consensus/.gitignore b/src/consensus/.gitignore
new file mode 100644
index 000000000..8bb7caafe
--- /dev/null
+++ b/src/consensus/.gitignore
@@ -0,0 +1,3 @@
+gnunet-service-evil-consensus
+gnunet-consensus-profiler
+gnunet-service-consensus
diff --git a/src/conversation/.gitignore b/src/conversation/.gitignore
new file mode 100644
index 000000000..0e4345a8b
--- /dev/null
+++ b/src/conversation/.gitignore
@@ -0,0 +1,5 @@
+gnunet-service-conversation
+gnunet-conversation
+gnunet-conversation-test
+gnunet-helper-audio-playback
+gnunet-helper-audio-record
diff --git a/src/core/.gitignore b/src/core/.gitignore
new file mode 100644
index 000000000..42b7030b3
--- /dev/null
+++ b/src/core/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-core
+gnunet-core
diff --git a/src/datastore/.gitignore b/src/datastore/.gitignore
new file mode 100644
index 000000000..38dff9993
--- /dev/null
+++ b/src/datastore/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-datastore
+gnunet-datastore
diff --git a/src/dht/.gitignore b/src/dht/.gitignore
new file mode 100644
index 000000000..b8b0ff7d4
--- /dev/null
+++ b/src/dht/.gitignore
@@ -0,0 +1,7 @@
+gnunet-service-dht-xvine
+gnunet-dht-get
+gnunet-dht-monitor
+gnunet-dht-profiler
+gnunet-dht-put
+gnunet-service-dht
+gnunet-service-dht-whanau
diff --git a/src/dns/.gitignore b/src/dns/.gitignore
new file mode 100644
index 000000000..ef9125c50
--- /dev/null
+++ b/src/dns/.gitignore
@@ -0,0 +1,4 @@
+gnunet-service-dns
+gnunet-dns-monitor
+gnunet-dns-redirector
+gnunet-helper-dns
diff --git a/src/dv/.gitignore b/src/dv/.gitignore
new file mode 100644
index 000000000..b3068b1c4
--- /dev/null
+++ b/src/dv/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-dv
+gnunet-dv
diff --git a/src/exit/.gitignore b/src/exit/.gitignore
new file mode 100644
index 000000000..9b75bba9a
--- /dev/null
+++ b/src/exit/.gitignore
@@ -0,0 +1,2 @@
+gnunet-helper-exit
+gnunet-daemon-exit
diff --git a/src/fs/.gitignore b/src/fs/.gitignore
new file mode 100644
index 000000000..cdfb27108
--- /dev/null
+++ b/src/fs/.gitignore
@@ -0,0 +1,11 @@
+gnunet-unindex
+gnunet-auto-share
+gnunet-daemon-fsprofiler
+gnunet-directory
+gnunet-download
+gnunet-fs
+gnunet-fs-profiler
+gnunet-helper-fs-publish
+gnunet-publish
+gnunet-search
+gnunet-service-fs
diff --git a/src/gns/.gitignore b/src/gns/.gitignore
new file mode 100644
index 000000000..5aecfd51d
--- /dev/null
+++ b/src/gns/.gitignore
@@ -0,0 +1,5 @@
+gnunet-service-gns
+gnunet-bcd
+gnunet-dns2gns
+gnunet-gns
+gnunet-gns-proxy
diff --git a/src/hello/.gitignore b/src/hello/.gitignore
new file mode 100644
index 000000000..237e1a10e
--- /dev/null
+++ b/src/hello/.gitignore
@@ -0,0 +1 @@
+gnunet-hello
diff --git a/src/hostlist/.gitignore b/src/hostlist/.gitignore
new file mode 100644
index 000000000..f20bc2d58
--- /dev/null
+++ b/src/hostlist/.gitignore
@@ -0,0 +1 @@
+gnunet-daemon-hostlist
diff --git a/src/identity-provider/.gitignore b/src/identity-provider/.gitignore
new file mode 100644
index 000000000..ef77fccdc
--- /dev/null
+++ b/src/identity-provider/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-identity-provider
+gnunet-identity-token
diff --git a/src/identity/.gitignore b/src/identity/.gitignore
new file mode 100644
index 000000000..cbabc187e
--- /dev/null
+++ b/src/identity/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-identity
+gnunet-identity
diff --git a/src/integration-tests/.gitignore b/src/integration-tests/.gitignore
new file mode 100644
index 000000000..c4d1568f0
--- /dev/null
+++ b/src/integration-tests/.gitignore
@@ -0,0 +1,2 @@
+gnunet_testing.py
+gnunet_pyexpect.py
diff --git a/src/multicast/.gitignore b/src/multicast/.gitignore
new file mode 100644
index 000000000..0f386fb40
--- /dev/null
+++ b/src/multicast/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-multicast
+gnunet-multicast
diff --git a/src/namecache/.gitignore b/src/namecache/.gitignore
new file mode 100644
index 000000000..7f6924c27
--- /dev/null
+++ b/src/namecache/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-namecache
+gnunet-namecache
diff --git a/src/namestore/.gitignore b/src/namestore/.gitignore
new file mode 100644
index 000000000..15482dd69
--- /dev/null
+++ b/src/namestore/.gitignore
@@ -0,0 +1,3 @@
+gnunet-service-namestore
+gnunet-namestore
+gnunet-namestore-fcfsd
diff --git a/src/nat/.gitignore b/src/nat/.gitignore
new file mode 100644
index 000000000..868abab4b
--- /dev/null
+++ b/src/nat/.gitignore
@@ -0,0 +1,5 @@
+gnunet-service-nat
+gnunet-helper-nat-client
+gnunet-helper-nat-server
+gnunet-nat
+gnunet-nat-server
diff --git a/src/nse/.gitignore b/src/nse/.gitignore
new file mode 100644
index 000000000..4e6257696
--- /dev/null
+++ b/src/nse/.gitignore
@@ -0,0 +1,3 @@
+gnunet-service-nse
+gnunet-nse
+gnunet-nse-profiler
diff --git a/src/peerinfo-tool/.gitignore b/src/peerinfo-tool/.gitignore
new file mode 100644
index 000000000..dc2209862
--- /dev/null
+++ b/src/peerinfo-tool/.gitignore
@@ -0,0 +1 @@
+gnunet-peerinfo
diff --git a/src/peerinfo/.gitignore b/src/peerinfo/.gitignore
new file mode 100644
index 000000000..950ed60a6
--- /dev/null
+++ b/src/peerinfo/.gitignore
@@ -0,0 +1 @@
+gnunet-service-peerinfo
diff --git a/src/peerstore/.gitignore b/src/peerstore/.gitignore
new file mode 100644
index 000000000..a07db8a36
--- /dev/null
+++ b/src/peerstore/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-peerstore
+gnunet-peerstore
diff --git a/src/psyc/.gitignore b/src/psyc/.gitignore
new file mode 100644
index 000000000..e12b3210c
--- /dev/null
+++ b/src/psyc/.gitignore
@@ -0,0 +1 @@
+gnunet-service-psyc
diff --git a/src/psycstore/.gitignore b/src/psycstore/.gitignore
new file mode 100644
index 000000000..fc2e4cf8e
--- /dev/null
+++ b/src/psycstore/.gitignore
@@ -0,0 +1 @@
+gnunet-service-psycstore
diff --git a/src/pt/.gitignore b/src/pt/.gitignore
new file mode 100644
index 000000000..22f803ed6
--- /dev/null
+++ b/src/pt/.gitignore
@@ -0,0 +1 @@
+gnunet-daemon-pt
diff --git a/src/regex/.gitignore b/src/regex/.gitignore
new file mode 100644
index 000000000..014e54347
--- /dev/null
+++ b/src/regex/.gitignore
@@ -0,0 +1,5 @@
+perf-regex
+gnunet-daemon-regexprofiler
+gnunet-regex-profiler
+gnunet-regex-simulation-profiler
+gnunet-service-regex
diff --git a/src/rest/.gitignore b/src/rest/.gitignore
new file mode 100644
index 000000000..07e69218e
--- /dev/null
+++ b/src/rest/.gitignore
@@ -0,0 +1 @@
+gnunet-rest-server
diff --git a/src/revocation/.gitignore b/src/revocation/.gitignore
new file mode 100644
index 000000000..dee463129
--- /dev/null
+++ b/src/revocation/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-revocation
+gnunet-revocation
diff --git a/src/rps/.gitignore b/src/rps/.gitignore
new file mode 100644
index 000000000..0d460e62c
--- /dev/null
+++ b/src/rps/.gitignore
@@ -0,0 +1,3 @@
+gnunet-service-rps
+gnunet-rps
+gnunet-rps-profiler
diff --git a/src/scalarproduct/.gitignore b/src/scalarproduct/.gitignore
new file mode 100644
index 000000000..e244f1108
--- /dev/null
+++ b/src/scalarproduct/.gitignore
@@ -0,0 +1,5 @@
+gnunet-service-scalarproduct-ecc-bob
+gnunet-scalarproduct
+gnunet-service-scalarproduct-alice
+gnunet-service-scalarproduct-bob
+gnunet-service-scalarproduct-ecc-alice
diff --git a/src/secretsharing/.gitignore b/src/secretsharing/.gitignore
new file mode 100644
index 000000000..bb169f0c4
--- /dev/null
+++ b/src/secretsharing/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-secretsharing
+gnunet-secretsharing-profiler
diff --git a/src/set/.gitignore b/src/set/.gitignore
new file mode 100644
index 000000000..10f1da0d6
--- /dev/null
+++ b/src/set/.gitignore
@@ -0,0 +1,3 @@
+gnunet-set-profiler
+gnunet-service-set
+gnunet-set-ibf-profiler
diff --git a/src/social/.gitignore b/src/social/.gitignore
new file mode 100644
index 000000000..41954615f
--- /dev/null
+++ b/src/social/.gitignore
@@ -0,0 +1,2 @@
+gnunet-social
+gnunet-service-social
diff --git a/src/statistics/.gitignore b/src/statistics/.gitignore
new file mode 100644
index 000000000..55f015bce
--- /dev/null
+++ b/src/statistics/.gitignore
@@ -0,0 +1,2 @@
+gnunet-statistics
+gnunet-service-statistics
diff --git a/src/template/.gitignore b/src/template/.gitignore
new file mode 100644
index 000000000..6e6ad861c
--- /dev/null
+++ b/src/template/.gitignore
@@ -0,0 +1,2 @@
+gnunet-template
+gnunet-service-template
diff --git a/src/testbed-logger/.gitignore b/src/testbed-logger/.gitignore
new file mode 100644
index 000000000..eb2ed00b0
--- /dev/null
+++ b/src/testbed-logger/.gitignore
@@ -0,0 +1 @@
+gnunet-service-testbed-logger
diff --git a/src/testbed/.gitignore b/src/testbed/.gitignore
new file mode 100644
index 000000000..acffa9b91
--- /dev/null
+++ b/src/testbed/.gitignore
@@ -0,0 +1,7 @@
+gnunet-testbed-profiler
+generate-underlay-topology
+gnunet-daemon-latency-logger
+gnunet-daemon-testbed-blacklist
+gnunet-daemon-testbed-underlay
+gnunet-helper-testbed
+gnunet-service-testbed
diff --git a/src/testing/.gitignore b/src/testing/.gitignore
new file mode 100644
index 000000000..212ed2ad3
--- /dev/null
+++ b/src/testing/.gitignore
@@ -0,0 +1,2 @@
+list-keys
+gnunet-testing
diff --git a/src/topology/.gitignore b/src/topology/.gitignore
new file mode 100644
index 000000000..9ac8c7c47
--- /dev/null
+++ b/src/topology/.gitignore
@@ -0,0 +1 @@
+gnunet-daemon-topology
diff --git a/src/transport/.gitignore b/src/transport/.gitignore
new file mode 100644
index 000000000..eab8d3146
--- /dev/null
+++ b/src/transport/.gitignore
@@ -0,0 +1,9 @@
+gnunet-transport-wlan-sender
+gnunet-helper-transport-bluetooth
+gnunet-helper-transport-wlan
+gnunet-helper-transport-wlan-dummy
+gnunet-service-transport
+gnunet-transport
+gnunet-transport-certificate-creation
+gnunet-transport-profiler
+gnunet-transport-wlan-receiver
diff --git a/src/util/.gitignore b/src/util/.gitignore
new file mode 100644
index 000000000..cbb349827
--- /dev/null
+++ b/src/util/.gitignore
@@ -0,0 +1,9 @@
+test_common_logging_dummy
+gnunet-config
+gnunet-config-diff
+gnunet-ecc
+gnunet-qr
+gnunet-resolver
+gnunet-scrypt
+gnunet-service-resolver
+gnunet-uri
diff --git a/src/vpn/.gitignore b/src/vpn/.gitignore
new file mode 100644
index 000000000..b76ea0f93
--- /dev/null
+++ b/src/vpn/.gitignore
@@ -0,0 +1,3 @@
+gnunet-vpn
+gnunet-helper-vpn
+gnunet-service-vpn