X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c8be473bace3a469b9c03c5c953362281c021124;hb=6d657891a5410b7d93cc90f376a3ef27b72b20f6;hp=0692d6a62eecc2cbbcf24d9e962da5eb7aa17849;hpb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;p=tpg%2Fopendispense2.git diff --git a/src/server/main.c b/src/server/main.c index 0692d6a..c8be473 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -9,6 +9,7 @@ */ #include #include +#include #include #include #include "common.h" @@ -18,20 +19,34 @@ #include #include #include +#include #include "../cokebank.h" +#include "../common/config.h" // === IMPORTS === extern void Init_Handlers(void); extern void Load_Itemlist(void); extern void Server_Start(void); +extern int gbServer_RunInBackground; extern int giServer_Port; -extern char *gsItemListFile; -extern char *gsCoke_SerialPort; -extern char *gsSnack_SerialPort; +extern const char *gsItemListFile; +extern const char *gsCoke_ModbusAddress; +extern const char *gsDoor_SerialPort; +extern bool gbSyslogEnabled; + +// === PROTOTYPES === +void *Periodic_Thread(void *Unused); // === GLOBALS === int giDebugLevel = 0; -char *gsCokebankPath = "cokebank.db"; + int gbNoCostMode = 0; +const char *gsCokebankPath = "cokebank.db"; +// - Functions called every 20s (or so) +#define ciMaxPeriodics 10 +struct sPeriodicCall { + void (*Function)(void); +} gaPeriodicCalls[ciMaxPeriodics]; +pthread_t gTimerThread; // === CODE === void sigint_handler() @@ -39,10 +54,21 @@ void sigint_handler() exit(0); } +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"); +} + int main(int argc, char *argv[]) { int i; - + const char *config_file = "dispsrv.conf"; + // Parse Arguments for( i = 1; i < argc; i++ ) { @@ -51,37 +77,64 @@ int main(int argc, char *argv[]) { switch(arg[1]) { - case 'p': - giServer_Port = atoi(argv[++i]); + case 'f': + if( i + 1 >= argc ) return -1; + config_file = argv[++i]; break; case 'd': - giDebugLevel = atoi(argv[++i]); + if( i + 1 >= argc ) return -1; + Config_AddValue("debug_level", argv[++i]); + giDebugLevel = atoi(argv[i]); break; default: - // Usage Error? - break; + // Usage Error + fprintf(stderr, "Unknown option '-%c'\n", arg[1]); + PrintUsage(argv[0]); + return -1; } } - else if( arg[0] == '-' && arg[1] == '-' ) { - if( strcmp(arg, "--itemsfile") == 0 ) { - gsItemListFile = argv[++i]; + else if( arg[0] == '-' && arg[1] == '-' ) + { + if( strcmp(arg, "--configfile") == 0 ) { + if( i + 1 >= argc ) return -1; + config_file = argv[++i]; } - else if( strcmp(arg, "--cokeport") == 0 ) { - gsCoke_SerialPort = argv[++i]; + else if( strcmp(arg, "--daemonise") == 0 ) { + Config_AddValue("daemonise", "true"); } - else if( strcmp(arg, "--snackport") == 0 ) { - gsSnack_SerialPort = argv[++i]; + else if( strcmp(arg, "--dont-daemonise") == 0 ) { + Config_AddValue("daemonise", "false"); } else { - // Usage error? + // Usage error + fprintf(stderr, "Unknown option '%s'\n", arg); + PrintUsage(argv[0]); + return -1; } } - else { - // Usage Error? + else + { + // Usage Error + PrintUsage(argv[0]); + return -1; } } - + + Config_ParseFile( config_file ); + + // Parse config values + 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) == 1); + gbSyslogEnabled = (Config_GetValue_Bool("disable_syslog", 0) == 0); + signal(SIGINT, sigint_handler); + signal(SIGTERM, sigint_handler); openlog("odispense2", 0, LOG_LOCAL4); @@ -94,10 +147,47 @@ int main(int argc, char *argv[]) Server_Start(); + if(gTimerThread) + pthread_kill(gTimerThread, SIGKILL); return 0; } +void *Periodic_Thread(void *Unused __attribute__((unused))) +{ + int i; + + for( ;; ) + { + sleep(10); // Sleep for a while +// printf("Periodic firing\n"); + for( i = 0; i < ciMaxPeriodics; i ++ ) + { + if( gaPeriodicCalls[i].Function ) + gaPeriodicCalls[i].Function(); + } + } + return NULL; +} + +void StartPeriodicThread(void) +{ + pthread_create( &gTimerThread, NULL, Periodic_Thread, NULL ); +} + +void AddPeriodicFunction(void (*Fcn)(void)) +{ + int i; + for( i = 0; i < ciMaxPeriodics; i ++ ) + { + if( gaPeriodicCalls[i].Function ) continue; + gaPeriodicCalls[i].Function = Fcn; + return ; + } + + 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; @@ -125,7 +215,7 @@ void CompileRegex(regex_t *regex, const char *pattern, int flags) size_t len = regerror(ret, regex, NULL, 0); char errorStr[len]; regerror(ret, regex, errorStr, len); - fprintf(stderr, "Regex compilation failed - %s\n", errorStr); + fprintf(stderr, "Regex compilation failed - %s\n%s\n", errorStr, pattern); exit(-1); } } @@ -142,12 +232,18 @@ int InitSerial(const char *File, int BaudRate) switch(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 info.c_cflag = baud | CS8 | CLOCAL | CREAD; // baud, 8N1 + info.c_iflag = IGNCR; // Ignore \r + info.c_oflag = 0; // ??? cfsetspeed(&info, baud); info.c_cc[VTIME] = 0; // No time limit info.c_cc[VMIN] = 1; // Block until 1 char