X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=20520fcbdc5fcb12be8ce4fa2363769e0ac4f42d;hb=adaae4129acdd981ea7c2ae386d0ac41a93a4b7a;hp=61059364aad03e0bc0757e8fa92cc4e1b0e3fa60;hpb=f2baa7bf5fb9877235369e7bf1abb7cff507dff6;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 6105936..20520fc 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -18,21 +18,32 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <syslog.h>
+#include <pthread.h>
 #include "../cokebank.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 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";
+ 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()
@@ -40,10 +51,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++ )
 	{
@@ -52,46 +72,61 @@ 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;
 			default:
-				// Usage Error?
-				break;
+				// 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 ) {
+		else if( arg[0] == '-' && arg[1] == '-' )
+		{
+			if( strcmp(arg, "--configfile") == 0 ) {
 				if( i + 1 >= argc )	return -1;
-				gsCoke_SerialPort = argv[++i];
+				config_file = argv[++i];
 			}
-			else if( strcmp(arg, "--snackport") == 0 ) {
-				if( i + 1 >= argc )	return -1;
-				gsSnack_SerialPort = argv[++i];
+			else if( strcmp(arg, "--daemonise") == 0 ) {
+				Config_AddValue("daemonise", "true");
 			}
-			else if( strcmp(arg, "--doorpass") == 0 ) {
-				if( i + 1 >= argc )	return -1;
-				gsDoor_Password = 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);
+
+	gbNoCostMode         = (Config_GetValue_Bool("test_mode", 0) == 1);
+
 	signal(SIGINT, sigint_handler);
+	signal(SIGTERM, sigint_handler);
 	
 	openlog("odispense2", 0, LOG_LOCAL4);
 	
@@ -104,10 +139,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;
@@ -135,7 +207,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);
 	}
 }
@@ -152,12 +224,16 @@ int InitSerial(const char *File, int BaudRate)
 	
 	switch(BaudRate)
 	{
+	case 1200:	baud = B1200;	break;
 	case 9600:	baud = B9600;	break;
+	case 115200:	baud = B115200;	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