Server - Ignore SIGPIPE (just let it return a read error)

[tpg/opendispense2.git] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index f2f66c3..9359c4e 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -9,6 +9,7 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <signal.h>
 #include "common.h"
@@ -20,6 +21,7 @@
 #include <syslog.h>
 #include <pthread.h>
 #include "../cokebank.h"
+#include "../common/config.h"
 
 // === IMPORTS ===
 extern void    Init_Handlers(void);
@@ -29,7 +31,9 @@ extern int    gbServer_RunInBackground;
 extern int     giServer_Port;
 extern const char      *gsItemListFile;
 extern const char      *gsCoke_ModbusAddress;
+extern int     giCoke_ModbusPort;
 extern const char      *gsDoor_SerialPort;
+extern bool    gbSyslogEnabled;
 
 // === PROTOTYPES ===
 void   *Periodic_Thread(void *Unused);
@@ -54,6 +58,8 @@ void sigint_handler()
 void PrintUsage(const char *progname)
 {
        fprintf(stderr, "Usage: %s\n", progname);
+       fprintf(stderr, "  -f,--configfile\n");
+       fprintf(stderr, "        Set the config file path (default `dispsrv.conf')\n");
        fprintf(stderr, "  -d    Set debug level (0 - 2, default 0)\n");
        fprintf(stderr, "  --[dont-]daemonise\n");
        fprintf(stderr, "        Run (or explicitly don't run) the server disconnected from the terminal\n");
@@ -83,6 +89,7 @@ int main(int argc, char *argv[])
                                break;
                        default:
                                // Usage Error
+                               fprintf(stderr, "Unknown option '-%c'\n", arg[1]);
                                PrintUsage(argv[0]);
                                return -1;
                        }
@@ -101,6 +108,7 @@ int main(int argc, char *argv[])
                        }
                        else {
                                // Usage error
+                               fprintf(stderr, "Unknown option '%s'\n", arg);
                                PrintUsage(argv[0]);
                                return -1;
                        }
@@ -119,14 +127,20 @@ int main(int argc, char *argv[])
        gbServer_RunInBackground = Config_GetValue_Bool("daemonise", 0);
        gsCokebankPath       = Config_GetValue("cokebank_database", 0);
        gsDoor_SerialPort    = Config_GetValue("door_serial_port", 0);
-       gsCoke_ModbusAddress = Config_GetValue("coke_modbus_address", 0);
        giServer_Port        = Config_GetValue_Int("server_port", 0);
        gsItemListFile       = Config_GetValue("items_file", 0);
 
-       gbNoCostMode         = Config_GetValue_Bool("test_mode", 0);
+       gbNoCostMode         = (Config_GetValue_Bool("test_mode", 0) == 1);
+       gbSyslogEnabled      = (Config_GetValue_Bool("disable_syslog", 0) == 0);
+
+       gsCoke_ModbusAddress = Config_GetValue("coke_modbus_address", 0);
+       giCoke_ModbusPort    = Config_GetValue_Int("coke_modbus_port", 0);
 
+       // - Cleanly tear down the server on SIGINT/SIGTERM
        signal(SIGINT, sigint_handler);
        signal(SIGTERM, sigint_handler);
+       // - ignore SIGPIPE to prevent a crashing client from bringing the server down too
+       signal(SIGPIPE, SIG_IGN);
        
        openlog("odispense2", 0, LOG_LOCAL4);
        
@@ -180,38 +194,6 @@ void AddPeriodicFunction(void (*Fcn)(void))
        fprintf(stderr, "Error: No space for %p in periodic list\n", Fcn);
 }
 
-int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage)
-{
-        int    ret;
-       
-       ret = regexec(regex, string, nMatches, matches, 0);
-       if( ret == REG_NOMATCH ) {
-               return -1;
-       }
-       if( ret ) {
-               size_t  len = regerror(ret, regex, NULL, 0);
-               char    errorStr[len];
-               regerror(ret, regex, errorStr, len);
-               printf("string = '%s'\n", string);
-               fprintf(stderr, "%s\n%s", errorMessage, errorStr);
-               exit(-1);
-       }
-       
-       return ret;
-}
-
-void CompileRegex(regex_t *regex, const char *pattern, int flags)
-{
-        int    ret = regcomp(regex, pattern, flags);
-       if( ret ) {
-               size_t  len = regerror(ret, regex, NULL, 0);
-               char    errorStr[len];
-               regerror(ret, regex, errorStr, len);
-               fprintf(stderr, "Regex compilation failed - %s\n%s\n", errorStr, pattern);
-               exit(-1);
-       }
-}
-
 // Serial helper
 int InitSerial(const char *File, int BaudRate)
 {
@@ -226,7 +208,10 @@ int InitSerial(const char *File, int BaudRate)
        {
        case 1200:      baud = B1200;   break;
        case 9600:      baud = B9600;   break;
-       default:        close(fd);      return -1;
+       case 115200:    baud = B115200; break;
+       default:
+               fprintf(stderr, "ERROR: Invalid baud rate to InitSerial (%i)\n", BaudRate);
+               exit(1);
        }
        
        info.c_lflag = 0;       // Non-Canoical, No Echo