X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c2ef55c01fd1c22bed665f3a4938910ccfde7deb;hb=da639e3f13ee62627f4e7b29eccfcac70aad681d;hp=b612f6fcc8864b52e5dbb7fd51795ded979ac5d1;hpb=97baaecf7affaf561a0ee6329cc5dee30d52713c;p=tpg%2Fopendispense2.git diff --git a/src/server/main.c b/src/server/main.c index b612f6f..c2ef55c 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -16,20 +16,33 @@ #include #include #include +#include +#include +#include +#include "../cokebank.h" // === IMPORTS === -extern void Init_Cokebank(const char *Argument); // cokebank.c 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; + +// === PROTOTYPES === +void *Periodic_Thread(void *Unused); // === GLOBALS === int giDebugLevel = 0; -char *gsCokebankPath = "cokebank.db"; +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() @@ -37,10 +50,19 @@ void sigint_handler() exit(0); } +void PrintUsage(const char *progname) +{ + fprintf(stderr, "Usage: %s\n", progname); + 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++ ) { @@ -49,39 +71,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 + 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 + 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); signal(SIGINT, sigint_handler); + signal(SIGTERM, sigint_handler); + + openlog("odispense2", 0, LOG_LOCAL4); - Init_Cokebank(gsCokebankPath); + if( Bank_Initialise(gsCokebankPath) ) + return -1; Init_Handlers(); @@ -89,15 +136,55 @@ 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; 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]; @@ -117,7 +204,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); } } @@ -134,12 +221,15 @@ int InitSerial(const char *File, int BaudRate) switch(BaudRate) { + case 1200: baud = B1200; break; case 9600: baud = B9600; break; default: close(fd); return -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 @@ -151,3 +241,26 @@ int InitSerial(const char *File, int BaudRate) } +/** + * \brief Create a formatted heap string + */ +char *mkstr(const char *Format, ...) +{ + va_list args; + int len; + char *ret; + + va_start(args, Format); + len = vsnprintf(NULL, 0, Format, args); + va_end(args); + + ret = malloc( len + 1 ); + if(!ret) return NULL; + + va_start(args, Format); + vsprintf(ret, Format, args); + va_end(args); + + return ret; +} +