*/
#include <stdlib.h>
#include <stdio.h>
+#include <stdbool.h>
#include <string.h>
#include <signal.h>
#include "common.h"
#include <syslog.h>
#include <pthread.h>
#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 bool gbServer_RunInBackground;
extern int giServer_Port;
-extern char *gsItemListFile;
-extern char *gsCoke_SerialPort;
-extern char *gsSnack_SerialPort;
-extern char *gsDoor_SerialPort;
+extern const char *gsItemListFile;
+extern const char *gsCoke_ModbusAddress;
+extern int giCoke_ModbusPort;
+extern const char *gsDoor_SerialPort;
// === PROTOTYPES ===
void *Periodic_Thread(void *Unused);
// === GLOBALS ===
int giDebugLevel = 0;
-char *gsCokebankPath = "cokebank.db";
+bool gbNoCostMode = 0;
+const char *gsCokebankPath = "cokebank.db";
// - Functions called every 20s (or so)
#define ciMaxPeriodics 10
struct sPeriodicCall {
void PrintUsage(const char *progname)
{
fprintf(stderr, "Usage: %s\n", progname);
- fprintf(stderr, " -p Set server port (default 11020)\n");
+ 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, " --itemsfile\n");
- fprintf(stderr, " Set debug level (0 - 2, default 0)\n");
- fprintf(stderr, " --cokeport\n");
- fprintf(stderr, " Coke machine serial port (Default \"/dev/ttyS0\")\n");
- fprintf(stderr, " --doorport\n");
- fprintf(stderr, " Door modem/relay serial port (Default \"/dev/ttyS3\")\n");
- fprintf(stderr, " --cokebank\n");
- fprintf(stderr, " Coke bank database file (Default \"cokebank.db\")\n");
fprintf(stderr, " --[dont-]daemonise\n");
- fprintf(stderr, " Run (or explicitly don't) the server disconnected from the terminal\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++ )
{
char *arg = argv[i];
- if( arg[0] == '-' && arg[1] != '-')
+ if( arg[0] != '-' )
+ {
+ // No free arguments please
+ PrintUsage(argv[0]);
+ return -1;
+ }
+ else if( arg[1] != '-' )
{
+ // Single character arguments
+ // - TODO: Process in a loop
switch(arg[1])
{
- case 'p':
+ case 'f':
if( i + 1 >= argc ) return -1;
- giServer_Port = atoi(argv[++i]);
+ config_file = argv[++i];
break;
case 'd':
if( i + 1 >= argc ) return -1;
- giDebugLevel = atoi(argv[++i]);
+ Config_AddValue("debug_level", argv[++i]);
+ giDebugLevel = atoi(argv[i]);
break;
- case 'D':
- gbServer_RunInBackground = 1;
- return -1;
default:
- // Usage Error?
+ // 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 ) {
- if( i + 1 >= argc ) return -1;
- gsItemListFile = argv[++i];
- }
- else if( strcmp(arg, "--cokeport") == 0 ) {
- if( i + 1 >= argc ) return -1;
- gsCoke_SerialPort = argv[++i];
- }
- else if( strcmp(arg, "--snackport") == 0 ) {
- if( i + 1 >= argc ) return -1;
- gsSnack_SerialPort = argv[++i];
- }
- else if( strcmp(arg, "--doorport") == 0 ) {
- if( i + 1 >= argc ) return -1;
- gsDoor_SerialPort = argv[++i];
- }
- else if( strcmp(arg, "--cokebank") == 0 ) {
+ else
+ {
+ // Long arguments
+ if( strcmp(arg, "--configfile") == 0 ) {
if( i + 1 >= argc ) return -1;
- gsCokebankPath = argv[++i];
+ config_file = argv[++i];
}
else if( strcmp(arg, "--daemonise") == 0 ) {
- gbServer_RunInBackground = 1;
+ Config_AddValue("daemonise", "true");
}
else if( strcmp(arg, "--dont-daemonise") == 0 ) {
- gbServer_RunInBackground = 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?
- PrintUsage(argv[0]);
+ }
+
+ if( Config_ParseFile( config_file ) ) {
+ fprintf(stderr, "NOTICE: Loading of config file '%s' failed, using defaults\n", config_file);
+ }
+
+ // Parse config values
+ {
+ bool rv = true;
+ #define REQ_CFG(variable, type, name) rv = Config_GetValue_##type(name, &variable) && rv
+ #define OPT_CFG(variable, type, name) Config_GetValue_##type(name, &variable)
+ OPT_CFG(gbServer_RunInBackground, Bool, "daemonise");
+ OPT_CFG(giServer_Port, Int, "server_port");
+
+ REQ_CFG(gsCokebankPath, Str, "cokebank_database");
+ REQ_CFG(gsItemListFile, Str, "items_file");
+
+ OPT_CFG(gsDoor_SerialPort, Str, "door_serial_port");
+ REQ_CFG(gsCoke_ModbusAddress, Str, "coke_modbus_address");
+ OPT_CFG(giCoke_ModbusPort, Int, "coke_modbus_port");
+
+ OPT_CFG(gbNoCostMode, Bool, "test_mode");
+ OPT_CFG(gbSyslogDisabled, Bool, "disable_syslog");
+
+ if( !rv ) {
+ fprintf(stderr, "ERROR: Some required configuration items were missing\n");
return -1;
}
}
-
+
+ // - 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);
Server_Start();
- pthread_kill(gTimerThread, SIGKILL);
+ if(gTimerThread)
+ pthread_kill(gTimerThread, SIGKILL);
return 0;
}
-void *Periodic_Thread(void *Unused)
+void *Periodic_Thread(void *Unused __attribute__((unused)))
{
int i;
- Unused = NULL; // quiet, gcc
for( ;; )
{
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", errorStr);
- exit(-1);
- }
-}
-
// Serial helper
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
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au