X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=d6fefbc61438f1f0a98f09517d162e3c5c9d9ccc;hb=399c1a3a2a1eb9c81ec0f7bdfb1512bdd2e41c6a;hp=8abb9847cc1c89a3863afab9ab11e6df6f4821e2;hpb=41582cb84bded83614e11b1c115deea13e1914cc;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 8abb984..d6fefbc 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -17,20 +17,32 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <syslog.h>
+#include <pthread.h>
+#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 char	*gsItemListFile;
+extern char	*gsCoke_SerialPort;
+extern char	*gsSnack_SerialPort;
+extern char	*gsDoor_Password;
+
+// === PROTOTYPES ===
+void	*Periodic_Thread(void *Unused);
 
 // === GLOBALS ===
  int	giDebugLevel = 0;
 char	*gsCokebankPath = "cokebank.db";
+// - Functions called every 20s (or so)
+#define ciMaxPeriodics	10
+struct sPeriodicCall {
+	void	(*Function)(void);
+}	gaPeriodicCalls[ciMaxPeriodics];
 
 // === CODE ===
 void sigint_handler()
@@ -38,9 +50,25 @@ void sigint_handler()
 	exit(0);
 }
 
+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");
+}
+
 int main(int argc, char *argv[])
 {
 	 int	i;
+	pthread_t	timer_thread;
 	
 	// Parse Arguments
 	for( i = 1; i < argc; i++ )
@@ -51,54 +79,132 @@ int main(int argc, char *argv[])
 			switch(arg[1])
 			{
 			case 'p':
+				if( i + 1 >= argc )	return -1;
 				giServer_Port = atoi(argv[++i]);
 				break;
 			case 'd':
+				if( i + 1 >= argc )	return -1;
 				giDebugLevel = atoi(argv[++i]);
 				break;
+			case 'D':
+				gbServer_RunInBackground = 1;
+				return -1;
 			default:
 				// Usage Error?
-				break;
+				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 ) {
+				if( i + 1 >= argc )	return -1;
+				gsCokebankPath = argv[++i];
+			}
+			else if( strcmp(arg, "--daemonise") == 0 ) {
+				gbServer_RunInBackground = 1;
+			}
+			else if( strcmp(arg, "--dont-daemonise") == 0 ) {
+				gbServer_RunInBackground = 1;
+			}
 			else {
 				// Usage error?
+				PrintUsage(argv[0]);
+				return -1;
 			}
 		}
 		else {
 			// Usage Error?
+			PrintUsage(argv[0]);
+			return -1;
 		}
 	}
 	
 	signal(SIGINT, sigint_handler);
+	signal(SIGTERM, sigint_handler);
 	
-	Init_Cokebank(gsCokebankPath);
+	openlog("odispense2", 0, LOG_LOCAL4);
+	
+	if( Bank_Initialise(gsCokebankPath) )
+		return -1;
 
 	Init_Handlers();
 
 	Load_Itemlist();
 	
+	pthread_create( &timer_thread, NULL, Periodic_Thread, NULL );
+	
 	Server_Start();
 	
+	pthread_kill(timer_thread, SIGKILL);
 
 	return 0;
 }
 
+void *Periodic_Thread(void *Unused)
+{
+	 int	i;
+	Unused = NULL;	// quiet, gcc
+	
+	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 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];