merchant

commit 9d913c147b7a74fd24cac9d21e0064f0039aa919
parent 905012551c8c17613753051a2b206f749e60e95d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 17 May 2021 21:36:24 +0200

fix crash on exit: resuming would skip list entries

Diffstat:
M
src/backend/taler-merchant-httpd_private-post-reserves.c
 | 
5
++++-
M
src/backend/taler-merchant-httpd_private-post-transfers.c
 | 
2
+-

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-reserves.c b/src/backend/taler-merchant-httpd_private-post-reserves.c
@@ -120,10 +120,13 @@ static struct PostReserveContext *rc_tail;
 void
 TMH_force_rc_resume ()
 {
+  struct PostReserveContext *rcn;
+
   for (struct PostReserveContext *rc = rc_head;
        NULL != rc;
-       rc = rc->next)
+       rc = rcn)
   {
+    rcn = rc->next;
     if (rc->suspended)
     {
       rc->suspended = false;
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -33,7 +33,7 @@
  */
 #define TRANSFER_GENERIC_TIMEOUT (GNUNET_TIME_relative_multiply ( \
                                     GNUNET_TIME_UNIT_SECONDS, \
-                                    30))
+                                    1))
 
 /**
  * How often do we retry the simple INSERT database transaction?