gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-taler-mdb] 01/02: fix style issues


From: gnunet
Subject: [taler-taler-mdb] 01/02: fix style issues
Date: Fri, 24 Jan 2020 12:36:39 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-mdb.

commit 09cf0428c632ad6698315b78b2f6a4db69c1d4a8
Merge: 237dbf9 1e464cb
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 24 12:27:54 2020 +0100

    fix style issues

 src/main.c | 486 ++++++++++++++++++++++++++++++++++++++++++++++---------------
 taler.conf |  82 +++++------
 2 files changed, 408 insertions(+), 160 deletions(-)

diff --cc src/main.c
index 3110a13,96c26df..a1cdcfc
--- a/src/main.c
+++ b/src/main.c
@@@ -433,6 -489,16 +496,18 @@@ struct Displa
    struct fb_fix_screeninfo fix_info;
  };
  
+ /**
+  * Handle for the Cancel Button
+  */
+ struct CancelButton
+ {
+   /**
+    * File descriptor to read the state of the cancel button gpio pin
+    */
+   int cancelbuttonfd;
+ };
++
++
  /**
   * DLL of pending refund operations.
   */
@@@ -515,17 -575,17 +590,17 @@@ static char *currency
  /**
   * Taler Backend url read from configuration file
   */
--static char *backendBaseUrl;
++static char *backend_base_url;
  
  /**
   * Taler fulfillment url read from configuration file
   */
--static char *fulfillmentUrl;
++static char *fulfillment_url;
  
  /**
   * Fulfillment message to display after successfull payment, read from 
configuration file
   */
--static char *fulfillmentMsg;
++static char *fulfillment_msg;
  
  /**
   * Authorization for the taler backend
@@@ -555,37 -615,57 +630,57 @@@ static struct MdbHandle mdb
  /**
   * MDB response to the request for configuration.
   */
--static struct MdbCommand readerConfigData;
++static struct MdbCommand cmd_reader_config_data;
  
  /**
   * Ask MDB to begin session (with "infinite" money)
   */
--static struct MdbCommand beginSession;
++static struct MdbCommand cmd_begin_session;
  
  /**
   * Refuse vending request (payment failed)
   */
--static struct MdbCommand denyVend;
++static struct MdbCommand cmd_deny_vend;
  
  /**
   * Approve vending request (payment succeeded)
   */
--static struct MdbCommand approveVend;
++static struct MdbCommand cmd_approve_vend;
  
  /**
   * Confirm cancellation by machine.
   */
--static struct MdbCommand readerCancelled;
++static struct MdbCommand cmd_reader_cancelled;
  
  /**
   * Approve Revalue
   */
--static struct MdbCommand revalueApproved;
++static struct MdbCommand cmd_revalue_approved;
  
  /**
   * Send Revalue Limit Amount
   */
--static struct MdbCommand revalueAmount;
++static struct MdbCommand cmd_revalue_amount;
+ 
+ /**
+  * Send NACK
+  */
 -static struct MdbCommand readerNACK;
++static struct MdbCommand cmd_reader_NACK;
+ 
+ /**
+  * Display Request for Sold Out
+  */
 -static struct MdbCommand readerDisplaySoldOut;
++static struct MdbCommand cmd_reader_display_sold_out;
+ 
+ /**
+  * Display Request for Error Message
+  */
 -static struct MdbCommand readerDisplayInternalError;
++static struct MdbCommand cmd_reader_display_internal_error;
+ 
+ /**
+  * Display Request for Error Message
+  */
 -static struct MdbCommand readerDisplayBackendNotReachable;
++static struct MdbCommand cmd_reader_display_backend_not_reachable;
  
  /**
   * Terminate session.
@@@ -617,16 -697,8 +712,11 @@@ static char backlight_on = '1'
   */
  static char backlight_off = '0';
  
 +/**
 + * State for the implementation of the 'cancel' button.
 + */
- struct CancelButton
- {
-   int cancelbuttonfd;
- };
- 
- static struct CancelButton cancelButton;
++static struct CancelButton cancel_button;
  
 -static struct CancelButton cancelButton;
  /**
   * Name of the UART device with the MDB (i.e. /dev/ttyAMA0).
   */
@@@ -850,7 -927,7 +945,7 @@@ cleanup_payment (struct PaymentActivit
   * @brief Shutdown the mdb communication tasks
   */
  static void
--mdb_shutdown ()
++mdb_shutdown (void)
  {
    if (NULL != mdb.rtask)
    {
@@@ -959,18 -1040,18 +1059,18 @@@ shutdown_task (void *cls
        close (qrDisplay.backlightfd);
      qrDisplay.backlightfd = -1;
    }
--  if (0 < cancelButton.cancelbuttonfd)
++  if (0 < cancel_button.cancelbuttonfd)
    {
--    close (cancelButton.cancelbuttonfd);
--    cancelButton.cancelbuttonfd = open ("/sys/class/gpio/unexport",
--                                        O_WRONLY);
--    if (0 > cancelButton.cancelbuttonfd)
++    close (cancel_button.cancelbuttonfd);
++    cancel_button.cancelbuttonfd = open ("/sys/class/gpio/unexport",
++                                         O_WRONLY);
++    if (0 > cancel_button.cancelbuttonfd)
      {
        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                    "Unable to open /gpio/unexport for cancel button\n");
      }
-     (void) write (cancelButton.cancelbuttonfd, "17", 2);
 -    (void) write (cancelButton.cancelbuttonfd, "23", 2);
--    close (cancelButton.cancelbuttonfd);
++    (void) write (cancel_button.cancelbuttonfd, "23", 2);
++    close (cancel_button.cancelbuttonfd);
    }
    /* free the allocated productes read from config file */
    if (NULL != products)
@@@ -1271,7 -1352,7 +1371,7 @@@ check_payment_cb (void *cls
      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "Backend request to /check-payment failed: %u\n",
                  http_status);
-     mdb.cmd = &denyVend;
 -    mdb.cmd = &readerDisplayBackendNotReachable;
++    mdb.cmd = &cmd_reader_display_backend_not_reachable;
      run_mdb_event_loop ();
      cleanup_payment (pa);
      GNUNET_assert (payment_activity == pa);
@@@ -1281,7 -1362,7 +1381,7 @@@
  
    if (paid)
    {
--    mdb.cmd = &approveVend;
++    mdb.cmd = &cmd_approve_vend;
      payment_activity->paid = GNUNET_YES;
      run_mdb_event_loop ();
      if ((disable_mdb) && (! disable_tty))
@@@ -1335,7 -1416,7 +1435,7 @@@ check_payment_again (void *cls
    pa->delay_pay_task = NULL;
    GNUNET_assert (NULL == pa->cpo);
    pa->cpo = TALER_MERCHANT_check_payment (ctx,
--                                          backendBaseUrl,
++                                          backend_base_url,
                                            pa->order_id,
                                            NULL /* snack machine, no Web crap 
*/,
                                            BACKEND_POLL_TIMEOUT,
@@@ -1370,7 -1451,7 +1470,7 @@@ proposal_cb (void *cls
                  "Failed to setup order with backend: %u/%d\n",
                  http_status,
                  (int) ec);
-     mdb.cmd = &denyVend;
 -    mdb.cmd = &readerDisplayBackendNotReachable;
++    mdb.cmd = &cmd_reader_display_backend_not_reachable;
      run_mdb_event_loop ();
      cleanup_payment (pa);
      GNUNET_assert (payment_activity == pa);
@@@ -1382,7 -1463,7 +1482,7 @@@
                order_id);
    pa->order_id = GNUNET_strdup (order_id);
    pa->cpo = TALER_MERCHANT_check_payment (ctx,
--                                          backendBaseUrl,
++                                          backend_base_url,
                                            pa->order_id,
                                            NULL /* snack machine, no Web crap 
*/,
                                            GNUNET_TIME_UNIT_ZERO,
@@@ -1419,8 -1500,8 +1519,8 @@@ launch_payment (struct Product *product
    /* create the fulfillment url, e.g. 
"taler://fulfillment-success/Enjoy+your+ice+cream!"; */
    GNUNET_asprintf (&fulflmntUrl,
                     "%s%s%s#%s",
--                   fulfillmentUrl,
--                   fulfillmentMsg,
++                   fulfillment_url,
++                   fulfillment_msg,
                     product->description,
                     uuid_s);
    GNUNET_free (uuid_s);
@@@ -1444,7 -1525,7 +1544,7 @@@
    pa->amount = product->price;
    /* put the order on the merchant's backend */
    pa->po = TALER_MERCHANT_order_put (ctx,
--                                     backendBaseUrl,
++                                     backend_base_url,
                                       orderReq,
                                       &proposal_cb,
                                       pa);
@@@ -1456,7 -1537,8 +1556,8 @@@
      GNUNET_free (pa);
      return NULL;
    }
-   if (0 < cancelButton.cancelbuttonfd)
+   /* Start to read the button on the VM to cancel this payment */
 -  if (0 < cancelButton.cancelbuttonfd)
++  if (0 < cancel_button.cancelbuttonfd)
      start_read_cancel_button ();
    return pa;
  }
@@@ -1534,7 -1616,7 +1635,7 @@@ vend_failure (
    mdb.session_running = GNUNET_NO;
    r = GNUNET_new (struct Refund);
    r->rio = TALER_MERCHANT_refund_increase (ctx,
--                                           backendBaseUrl,
++                                           backend_base_url,
                                             payment_activity->order_id,
                                             &payment_activity->amount,
                                             "failed to dispense product",
@@@ -1586,7 -1668,7 +1687,7 @@@ read_keyboard_command (void *cls
      case 'c':
        if (GNUNET_NO == payment_activity->paid)
        {
--        mdb.cmd = &denyVend;
++        mdb.cmd = &cmd_deny_vend;
        }
        else
        {
@@@ -1599,7 -1681,7 +1700,7 @@@
        break;
      case 'a':
        payment_activity->paid = GNUNET_YES;
--      mdb.cmd = &approveVend;
++      mdb.cmd = &cmd_approve_vend;
        run_mdb_event_loop ();
        break;
      case 'n':
@@@ -1649,7 -1731,7 +1750,7 @@@
          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                      "Product %s sold out, denying vend\n",
                      products[i].description);
-         mdb.cmd = &denyVend;
 -        mdb.cmd = &readerDisplaySoldOut;
++        mdb.cmd = &cmd_reader_display_sold_out;
          run_mdb_event_loop ();
          start_read_keyboard ();
          return;
@@@ -1671,15 -1758,32 +1777,32 @@@ cancel_button_pressed (void *cls
    char value;
    cancelbutton_task = NULL;
  
--  read (cancelButton.cancelbuttonfd, &value, 1);
--  lseek (cancelButton.cancelbuttonfd, 0, SEEK_SET);
-   if ( '1' == value )
++  read (cancel_button.cancelbuttonfd, &value, 1);
++  lseek (cancel_button.cancelbuttonfd, 0, SEEK_SET);
+   /* This point should only be reached  when a order is pending, because
+    * the scheduler read file gets added in the function "launch_payment".
+    * But anyway safe check, else do nothing */
+   if (NULL != payment_activity)
    {
-     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 "Cancel button pressed, canceling current order\n");
-     if (GNUNET_NO == payment_activity->paid)
+     if ('1' == value)
      {
-       mdb.cmd = &denyVend;
+       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                   "Cancel button pressed, canceling current order\n");
+       if (GNUNET_NO == payment_activity->paid)
+       {
+         /* The current payment was not paid already, deny it */
 -        mdb.cmd = &denyVend;
++        mdb.cmd = &cmd_deny_vend;
+       }
+       else
+       {
+         /* The order was paid and if we know this, then it is also yielded,
+          * just end the current session */
+         mdb.cmd = &endSession;
+         mdb.session_running = GNUNET_NO;
+       }
+       run_mdb_event_loop ();
+       cleanup_payment (payment_activity);
+       payment_activity = NULL;
      }
      else
      {
@@@ -1738,7 -1837,7 +1856,7 @@@ start_read_keyboard (
  static void
  start_read_cancel_button ()
  {
--  struct GNUNET_DISK_FileHandle fh = { cancelButton.cancelbuttonfd };
++  struct GNUNET_DISK_FileHandle fh = { cancel_button.cancelbuttonfd };
  
    GNUNET_assert (NULL == cancelbutton_task);
    cancelbutton_task = GNUNET_SCHEDULER_add_read_file (
@@@ -1863,13 -1960,19 +1981,19 @@@ write_mdb_command (void *cls
  static void
  handle_ack ()
  {
--  if (&beginSession == mdb.last_cmd)
++  if (&cmd_begin_session == mdb.last_cmd)
      mdb.session_running = GNUNET_YES;
--  if (&denyVend == mdb.last_cmd)
++  if (&cmd_deny_vend == mdb.last_cmd)
    {
      mdb.session_running = GNUNET_NO;
      mdb.cmd = &endSession;
    }
 -  if (&readerDisplaySoldOut == mdb.last_cmd)
 -    mdb.cmd = &denyVend;
 -  if (&readerDisplayInternalError == mdb.last_cmd)
 -    mdb.cmd = &denyVend;
 -  if (&readerDisplayBackendNotReachable == mdb.last_cmd)
 -    mdb.cmd = &denyVend;
++  if (&cmd_reader_display_sold_out == mdb.last_cmd)
++    mdb.cmd = &cmd_deny_vend;
++  if (&cmd_reader_display_internal_error == mdb.last_cmd)
++    mdb.cmd = &cmd_deny_vend;
++  if (&cmd_reader_display_backend_not_reachable == mdb.last_cmd)
++    mdb.cmd = &cmd_deny_vend;
    mdb.last_cmd = NULL;
    /* Cause the write-task to be re-scheduled now */
    if (NULL != mdb.wtask)
@@@ -1944,6 -2050,34 +2071,34 @@@ handle_command (const char *hex
        {
        case VMC_VEND_REQUEST:
          {
+ 
+           /* Calculate the checksum and check it */
+           chkSum = cmd;
+ 
+           for ( size_t offset = 1; offset < ((hex_len / 2)); offset++ ) {
+             chkSum += tmp;
+             if (1 != sscanf (hex + (2 * offset),
+                              "%2X",
+                              &tmp))
+             {
+               GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                           "Received non-HEX input `%.*s'\n",
+                           (int) hex_len,
+                           hex);
+               GNUNET_break_op (0);
+               return;
+             }
+           }
+           if ( ((uint8_t) (chkSum & 0xFF)) != tmp )
+           {
 -            mdb.cmd = &readerDisplayInternalError;
++            mdb.cmd = &cmd_reader_display_internal_error;
+             GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                         "Received command with wrong checksum `%.*s'\n",
+                         (int) hex_len,
+                         hex);
+             break;
+ 
+           }
            unsigned int product;
  
            GNUNET_break (GNUNET_YES == mdb.session_running);
@@@ -1977,7 -2111,7 +2132,7 @@@
                  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                              "Product %s sold out, denying vend\n",
                              products[i].description);
-                 mdb.cmd = &denyVend;
 -                mdb.cmd = &readerDisplaySoldOut;
++                mdb.cmd = &cmd_reader_display_sold_out;
                  return;
                }
                payment_activity = launch_payment (&products[i]);
@@@ -1986,7 -2120,7 +2141,7 @@@
            GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                        "Unknown product %u selected on MDB, denying vend\n",
                        product);
--          mdb.cmd = &denyVend;
++          mdb.cmd = &cmd_deny_vend;
            break;
          }
        case VMC_VEND_SUCCESS:
@@@ -2047,14 -2181,14 +2202,14 @@@
          {
            GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                        "Received request for revalue via MDB\n");
--          mdb.cmd = &revalueApproved;
++          mdb.cmd = &cmd_revalue_approved;
            break;
          }
        case VMC_REVALUE_LIMIT_REQUEST:
          {
            GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                        "Received request for revalue limit amount via MDB\n");
--          mdb.cmd = &revalueAmount;
++          mdb.cmd = &cmd_revalue_amount;
            break;
          }
        default:
@@@ -2067,10 -2201,50 +2222,50 @@@
        break;
      }
    case VMC_CONF:
-     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                 "Received request for configuration via MDB\n");
-     mdb.cmd = &readerConfigData;
-     break;
+     {
+       unsigned int subcmd;
+ 
+       if (4 > hex_len)
+       {
+         GNUNET_break_op (0);
+         return;
+       }
+       if (1 != sscanf (&hex[2],
+                        "%2X",
+                        &subcmd))
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                     "Received non-HEX input `%.*s'\n",
+                     (int) hex_len - 2,
+                     &hex[2]);
+         GNUNET_break_op (0);
+         return;
+       }
+       switch (subcmd)
+       {
+       case VMC_READER_CONF:
+         {
+           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                       "Received request for configuration via MDB\n");
 -          mdb.cmd = &readerConfigData;
++          mdb.cmd = &cmd_reader_config_data;
+           break;
+ 
+         }
+       case VMC_SETUP_MAX_MIN_PRICES:
+         {
+           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                       "Received max and min prices via MDB\n");
+           break;
+         }
+       default:
+         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                     "Unknown MDB sub-command %X of command %X\n",
+                     subcmd,
+                     cmd);
+         break;
+       }
+       break;
+     }
    case VMC_POLL:
      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Received POLL from MDB (ignored)\n");
@@@ -2110,7 -2303,7 +2324,7 @@@
          mdb.session_running = GNUNET_NO;
          break;
        case VMC_READER_CANCEL:
--        mdb.cmd = &readerCancelled;
++        mdb.cmd = &cmd_reader_cancelled;
          mdb.session_running = GNUNET_NO;
          break;
        default:
@@@ -2256,7 -2448,7 +2470,7 @@@ run_mdb_event_loop (
    {
      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                  "Begining MDB session\n");
--    mdb.cmd = &beginSession;
++    mdb.cmd = &cmd_begin_session;
    }
    /* start write task if he doesn't exist and if there is a cmd waiting to 
get sent */
    if ( (NULL == mdb.wtask) &&
@@@ -2520,7 -2721,7 +2746,7 @@@ run (void *cls
        GNUNET_CONFIGURATION_get_value_string (cfg,
                                               "taler-mdb",
                                               "backend-base-url",
--                                             &backendBaseUrl))
++                                             &backend_base_url))
    {
      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                 "taler-mdb",
@@@ -2553,7 -2754,7 +2779,7 @@@
        GNUNET_CONFIGURATION_get_value_string (cfg,
                                               "taler-mdb",
                                               "fulfillment-url",
--                                             &fulfillmentUrl))
++                                             &fulfillment_url))
    {
      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                 "taler-mdb",
@@@ -2565,7 -2766,7 +2791,7 @@@
        GNUNET_CONFIGURATION_get_value_string (cfg,
                                               "taler-mdb",
                                               "fulfillment-msg",
--                                             &fulfillmentMsg))
++                                             &fulfillment_msg))
    {
      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                 "taler-mdb",
@@@ -2613,32 -2814,32 +2839,32 @@@
                                              authorization));
  
    /* open gpio pin for cance button */
--  cancelButton.cancelbuttonfd = open ("/sys/class/gpio/export",
--                                      O_WRONLY);
--  if (0 > cancelButton.cancelbuttonfd)
++  cancel_button.cancelbuttonfd = open ("/sys/class/gpio/export",
++                                       O_WRONLY);
++  if (0 > cancel_button.cancelbuttonfd)
    {
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  "Unable to open /gpio/export for cancel button\n");
    }
-   (void) write (cancelButton.cancelbuttonfd, "17", 2);
 -  (void) write (cancelButton.cancelbuttonfd, "23", 2);
--  close (cancelButton.cancelbuttonfd);
++  (void) write (cancel_button.cancelbuttonfd, "23", 2);
++  close (cancel_button.cancelbuttonfd);
  
-   cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio17/direction",
 -  cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio23/direction",
--                                      O_WRONLY);
--  if (0 > cancelButton.cancelbuttonfd)
++  cancel_button.cancelbuttonfd = open ("/sys/class/gpio/gpio23/direction",
++                                       O_WRONLY);
++  if (0 > cancel_button.cancelbuttonfd)
    {
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 "Unable to open /gpio/gpio17/direction for cancel button\n");
+                 "Unable to open /gpio/gpio23/direction for cancel button\n");
    }
--  (void) write (cancelButton.cancelbuttonfd, "in", 2);
--  close (cancelButton.cancelbuttonfd);
++  (void) write (cancel_button.cancelbuttonfd, "in", 2);
++  close (cancel_button.cancelbuttonfd);
  
-   cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio17/value",
 -  cancelButton.cancelbuttonfd = open ("/sys/class/gpio/gpio23/value",
--                                      O_RDONLY);
--  if (0 > cancelButton.cancelbuttonfd)
++  cancel_button.cancelbuttonfd = open ("/sys/class/gpio/gpio23/value",
++                                       O_RDONLY);
++  if (0 > cancel_button.cancelbuttonfd)
    {
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 "Unable to open /gpio/gpio17/value for cancel button\n");
+                 "Unable to open /gpio/gpio23/value for cancel button\n");
    }
  
  
@@@ -2832,35 -3033,54 +3058,57 @@@ main (int argc
      }
    }
    /* make the needed commands for the communication with the vending machine 
controller */
--  readerConfigData = setup_mdb_cmd ("Reader Config",
--                                    READER_CONFIG,
--                                    READER_FEATURE_LEVEL READER_COUNTRYCODE
--                                    READER_SCALE_FACTOR READER_DECIMAL_PLACES
--                                    READER_MAX_RESPONSE_TIME
--                                    READER_MISC_OPTIONS);
--  beginSession = setup_mdb_cmd ("Begin Session",
--                                READER_BEGIN_SESSION,
--                                READER_FUNDS_AVAILABLE);
--  approveVend = setup_mdb_cmd ("Approve Vend",
--                               READER_VEND_APPROVE,
--                               READER_VEND_AMOUNT);
--  readerCancelled = setup_mdb_cmd ("Confirm cancellation",
--                                   READER_CANCELLED,
--                                   NULL);
--  denyVend = setup_mdb_cmd ("Deny Vend",
--                            READER_VEND_DENIED,
--                            NULL);
++  cmd_reader_config_data = setup_mdb_cmd ("Reader Config",
++                                          READER_CONFIG,
++                                          READER_FEATURE_LEVEL
++                                          READER_COUNTRYCODE
++                                          READER_SCALE_FACTOR
++                                          READER_DECIMAL_PLACES
++                                          READER_MAX_RESPONSE_TIME
++                                          READER_MISC_OPTIONS);
++  cmd_begin_session = setup_mdb_cmd ("Begin Session",
++                                     READER_BEGIN_SESSION,
++                                     READER_FUNDS_AVAILABLE);
++  cmd_approve_vend = setup_mdb_cmd ("Approve Vend",
++                                    READER_VEND_APPROVE,
++                                    READER_VEND_AMOUNT);
++  cmd_reader_cancelled = setup_mdb_cmd ("Confirm cancellation",
++                                        READER_CANCELLED,
++                                        NULL);
++  cmd_deny_vend = setup_mdb_cmd ("Deny Vend",
++                                 READER_VEND_DENIED,
++                                 NULL);
    endSession = setup_mdb_cmd ("End Session",
                                READER_END_SESSION,
                                NULL);
--  revalueApproved = setup_mdb_cmd ("Reader Approve Revalue",
--                                   READER_REVALUE_APPROVED,
--                                   NULL);
++  cmd_revalue_approved = setup_mdb_cmd ("Reader Approve Revalue",
++                                        READER_REVALUE_APPROVED,
++                                        NULL);
  
--  revalueAmount = setup_mdb_cmd ("Send Revalue Limit Amount",
--                                 READER_REVALUE_LIMIT,
--                                 READER_REVALUE_LIMIT_AMOUNT);
++  cmd_revalue_amount = setup_mdb_cmd ("Send Revalue Limit Amount",
++                                      READER_REVALUE_LIMIT,
++                                      READER_REVALUE_LIMIT_AMOUNT);
+ 
 -  readerNACK = setup_mdb_cmd ("Reader NACK",
 -                              READER_NACK,
 -                              NULL);
++  cmd_reader_NACK = setup_mdb_cmd ("Reader NACK",
++                                   READER_NACK,
++                                   NULL);
  
 -  readerDisplaySoldOut = setup_mdb_cmd ("Display Sold Out",
 -                                        READER_DISPLAY_REQUEST,
 -                                        READER_DISPLAY_REQUEST_TIME
 -                                        READER_DISPLAY_SOLD_OUT);
++  cmd_reader_display_sold_out = setup_mdb_cmd ("Display Sold Out",
++                                               READER_DISPLAY_REQUEST,
++                                               READER_DISPLAY_REQUEST_TIME
++                                               READER_DISPLAY_SOLD_OUT);
+ 
 -  readerDisplayInternalError = setup_mdb_cmd ("Display Communication Error",
 -                                              READER_DISPLAY_REQUEST,
 -                                              READER_DISPLAY_REQUEST_TIME
 -                                              READER_DISPLAY_INTERNAL_ERROR);
++  cmd_reader_display_internal_error = setup_mdb_cmd (
++    "Display Communication Error",
++    READER_DISPLAY_REQUEST,
++    READER_DISPLAY_REQUEST_TIME
++    READER_DISPLAY_INTERNAL_ERROR);
+ 
 -  readerDisplayBackendNotReachable = setup_mdb_cmd (
++  cmd_reader_display_backend_not_reachable = setup_mdb_cmd (
+     "Display Backend not reachable",
+     READER_DISPLAY_REQUEST,
+     READER_DISPLAY_REQUEST_TIME
+     READER_DISPLAY_BACKEND_NOT_REACHABLE);
    ret = GNUNET_PROGRAM_run (argc,
                              argv,
                              "taler-mdb",

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]