exchange

commit 788f84f695589fad2afac9f3f600869d114fb79e
parent fa1914b26781a9409a35fd6f8bfb54aae09fdd79
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  9 Dec 2020 13:06:31 +0100

fix ftbfs issues in wire2

Diffstat:
M
src/exchange/taler-exchange-httpd_wire2.c
 | 
15
+++++++--------

1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_wire2.c b/src/exchange/taler-exchange-httpd_wire2.c
@@ -242,7 +242,7 @@ build_wire_state (void)
 void
 TEH_wire_update_state ()
 {
-  __sync_fetch_and_add (&key_generation,
+  __sync_fetch_and_add (&wire_generation,
                         1);
 }
 
@@ -262,7 +262,7 @@ get_wire_state (void)
 
   old_wsh = pthread_getspecific (wire_state);
   if ( (NULL == old_wsh) ||
-       (old_wsh->key_generation < key_generation) )
+       (old_wsh->wire_generation < wire_generation) )
   {
     wsh = build_wire_state ();
     if (NULL == wsh)
@@ -275,8 +275,7 @@ get_wire_state (void)
       return NULL;
     }
     if (NULL != old_wsh)
-      destroy_key_state (old_wsh,
-                         false);
+      destroy_wire_state (old_wsh);
     return wsh;
   }
   return old_wsh;
@@ -302,10 +301,10 @@ TEH_handler_wire (const struct TEH_RequestHandler *rh,
   (void) args;
   wsh = get_wire_state ();
   if (NULL == wsh)
-    TALER_MHD_reply_error (connection,
-                           MHD_HTTP_INTERNAL_SERVER_ERROR,
-                           TALER_EC_WTF,
-                           NULL);
+    TALER_MHD_reply_with_error (connection,
+                                MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+                                NULL);
   return TALER_MHD_reply_json (connection,
                                json_incref (wsh->wire_reply),
                                MHD_HTTP_OK);