X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c2ef55c01fd1c22bed665f3a4938910ccfde7deb;hb=da639e3f13ee62627f4e7b29eccfcac70aad681d;hp=d6fefbc61438f1f0a98f09517d162e3c5c9d9ccc;hpb=1b1b4f396d34f08e2e2932e7a69229dcc51a1da2;p=tpg%2Fopendispense2.git diff --git a/src/server/main.c b/src/server/main.c index d6fefbc..c2ef55c 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -27,22 +27,22 @@ 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 char *gsDoor_Password; +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() @@ -53,23 +53,16 @@ void sigint_handler() void PrintUsage(const char *progname) { fprintf(stderr, "Usage: %s\n", progname); - fprintf(stderr, " -p Set server port (default 11020)\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, " --doorpass\n"); - fprintf(stderr, " Door LAT password file (Default empty password)\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 run) the server disconnected from the terminal\n"); } int main(int argc, char *argv[]) { int i; - pthread_t timer_thread; - + const char *config_file = "dispsrv.conf"; + // Parse Arguments for( i = 1; i < argc; i++ ) { @@ -78,72 +71,56 @@ int main(int argc, char *argv[]) { 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 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, "--doorpass") == 0 ) { - FILE *fp; - char buf[30]; - if( i + 1 >= argc ) return -1; - fp = fopen(argv[++i], "r"); - if( !fp ) { - fprintf(stderr, "ERROR: Unable to read password file\n"); - perror("reading LAT password"); - return -1; - } - fgets(buf, sizeof buf, fp); - fclose(fp); - gsDoor_Password = strdup(buf); - } - else if( strcmp(arg, "--cokebank") == 0 ) { + else if( arg[0] == '-' && arg[1] == '-' ) + { + 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 = 1; + 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); @@ -157,19 +134,17 @@ int main(int argc, char *argv[]) Load_Itemlist(); - pthread_create( &timer_thread, NULL, Periodic_Thread, NULL ); - Server_Start(); - pthread_kill(timer_thread, 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( ;; ) { @@ -184,6 +159,11 @@ void *Periodic_Thread(void *Unused) return NULL; } +void StartPeriodicThread(void) +{ + pthread_create( &gTimerThread, NULL, Periodic_Thread, NULL ); +} + void AddPeriodicFunction(void (*Fcn)(void)) { int i; @@ -224,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); } } @@ -241,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