gnunet

commit fbe2292e299f7ba228ca71e70b0a33d80e0599c0
parent d51ba6435b62772ccf2a20d13e99c164898bdc9d
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Thu, 23 Nov 2023 19:18:32 +0100

Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

Diffstat:
D
ci/jobs/3-deploy-package/config.ini
 | 
5
-----
R
ci/Containerfile -> contrib/ci/Containerfile
 | 
0

R
ci/ci.sh -> contrib/ci/ci.sh
 | 
0

R
ci/jobs/0-build/build.sh -> contrib/ci/jobs/0-build/build.sh
 | 
0

R
ci/jobs/0-build/job.sh -> contrib/ci/jobs/0-build/job.sh
 | 
0

R
ci/jobs/2-deb-package/job.sh -> contrib/ci/jobs/2-deb-package/job.sh
 | 
0

R
ci/jobs/2-deb-package/version.sh -> contrib/ci/jobs/2-deb-package/version.sh
 | 
0

A
contrib/ci/jobs/3-deploy-package/config.ini
 | 
6
++++++
R
ci/jobs/3-deploy-package/job.sh -> contrib/ci/jobs/3-deploy-package/job.sh
 | 
0

M
src/service/transport/gnunet-service-transport.c
 | 
7
++-----

10 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ci/jobs/3-deploy-package/config.ini b/ci/jobs/3-deploy-package/config.ini
@@ -1,5 +0,0 @@
-[build]
-HALT_ON_FAILURE = True
-WARN_ON_FAILURE = True
-CONTAINER_BUILD = False
-CONTAINER_NAME = nixery.dev/shell/rsync
diff --git a/ci/Containerfile b/contrib/ci/Containerfile
diff --git a/ci/ci.sh b/contrib/ci/ci.sh
diff --git a/ci/jobs/0-build/build.sh b/contrib/ci/jobs/0-build/build.sh
diff --git a/ci/jobs/0-build/job.sh b/contrib/ci/jobs/0-build/job.sh
diff --git a/ci/jobs/2-deb-package/job.sh b/contrib/ci/jobs/2-deb-package/job.sh
diff --git a/ci/jobs/2-deb-package/version.sh b/contrib/ci/jobs/2-deb-package/version.sh
diff --git a/contrib/ci/jobs/3-deploy-package/config.ini b/contrib/ci/jobs/3-deploy-package/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = False
+CONTAINER_NAME = nixery.dev/shell/rsync
+CONTAINER_ARCH = amd64
diff --git a/ci/jobs/3-deploy-package/job.sh b/contrib/ci/jobs/3-deploy-package/job.sh
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
@@ -10277,10 +10277,7 @@ transmit_on_queue (void *cls)
     struct GNUNET_TIME_Relative plus = GNUNET_TIME_relative_multiply (
       wait_duration, wait_multiplier);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Waiting %s (%s) for ACK until %s\n",
-                GNUNET_STRINGS_relative_time_to_string (
-                  GNUNET_TIME_relative_multiply (
-                    queue->pd.aged_rtt, wait_multiplier), GNUNET_NO),
+                "Waiting %s for ACK until %s\n",
                 GNUNET_STRINGS_relative_time_to_string (plus, GNUNET_YES),
                 GNUNET_STRINGS_absolute_time_to_string (next));
     update_pm_next_attempt (pm,
@@ -10994,7 +10991,7 @@ neighbour_dv_monotime_cb (void *cls,
     n->dv_monotime_available = GNUNET_YES;
     return;
   }
-  if (sizeof(*mtbe) != record->value_size)
+  if (0 == record->value_size)
   {
     GNUNET_break (0);
     return;