X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c1b883eeca69798387b6cc16bbbfed68e008d93d;hb=4479b79dd78867af8d7cd236df73ded9bf5cc07a;hp=ac6dd27f61bc754945cfe66c4239a169d7e738fe;hpb=d40b4a892a6b06e2ef0cb72e90ebf7b023577d03;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index ac6dd27..c1b883e 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -12,20 +12,36 @@
 #include <string.h>
 #include <signal.h>
 #include "common.h"
+#include <termios.h>
+#include <unistd.h>
+#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	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()
@@ -36,6 +52,7 @@ void sigint_handler()
 int main(int argc, char *argv[])
 {
 	 int	i;
+	pthread_t	timer_thread;
 	
 	// Parse Arguments
 	for( i = 1; i < argc; i++ )
@@ -46,9 +63,11 @@ 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;
 			default:
@@ -58,14 +77,21 @@ int main(int argc, char *argv[])
 		}
 		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 ) {
+				if( i + 1 >= argc )	return -1;
+				gsDoor_Password = argv[++i];
+			}
 			else {
 				// Usage error?
 			}
@@ -77,23 +103,63 @@ int main(int argc, char *argv[])
 	
 	signal(SIGINT, 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];
@@ -118,4 +184,55 @@ void CompileRegex(regex_t *regex, const char *pattern, int flags)
 	}
 }
 
+// Serial helper
+int InitSerial(const char *File, int BaudRate)
+{
+	struct termios	info;
+	 int	baud;
+	 int	fd;
+	
+	fd = open(File, O_RDWR | O_NOCTTY | O_NONBLOCK);
+	if( fd == -1 )	return -1;
+	
+	switch(BaudRate)
+	{
+	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
+	cfsetspeed(&info, baud);
+	info.c_cc[VTIME] = 0;	// No time limit
+	info.c_cc[VMIN] = 1;	// Block until 1 char
+	
+	tcflush(fd, TCIFLUSH);
+	tcsetattr(fd, TCSANOW, &info);
+	
+	return fd;
+}
+
+
+/**
+ * \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;
+}