X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=0692d6a62eecc2cbbcf24d9e962da5eb7aa17849;hb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;hp=76e720b09ecfe224a75ec6b1870375185317cf39;hpb=05918a67e8509a2b2df6509039a801affd3444eb;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 76e720b..0692d6a 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -12,14 +12,22 @@
 #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 "../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	*gsItemListFile;
+extern char	*gsCoke_SerialPort;
+extern char	*gsSnack_SerialPort;
 
 // === GLOBALS ===
  int	giDebugLevel = 0;
@@ -58,9 +66,12 @@ int main(int argc, char *argv[])
 			if( strcmp(arg, "--itemsfile") == 0 ) {
 				gsItemListFile = argv[++i];
 			}
-			if( strcmp(arg, "--cokeport") == 0 ) {
+			else if( strcmp(arg, "--cokeport") == 0 ) {
 				gsCoke_SerialPort = argv[++i];
 			}
+			else if( strcmp(arg, "--snackport") == 0 ) {
+				gsSnack_SerialPort = argv[++i];
+			}
 			else {
 				// Usage error?
 			}
@@ -70,14 +81,104 @@ int main(int argc, char *argv[])
 		}
 	}
 	
-	Init_Cokebank(gsCokebankPath);
+	signal(SIGINT, sigint_handler);
+	
+	openlog("odispense2", 0, LOG_LOCAL4);
 	
+	if( Bank_Initialise(gsCokebankPath) )
+		return -1;
+
+	Init_Handlers();
+
 	Load_Itemlist();
 	
 	Server_Start();
 	
-	signal(SIGINT, sigint_handler);
 
 	return 0;
 }
 
+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];
+		regerror(ret, regex, errorStr, len);
+		printf("string = '%s'\n", string);
+		fprintf(stderr, "%s\n%s", errorMessage, errorStr);
+		exit(-1);
+	}
+	
+	return ret;
+}
+
+void CompileRegex(regex_t *regex, const char *pattern, int flags)
+{
+	 int	ret = regcomp(regex, pattern, flags);
+	if( ret ) {
+		size_t	len = regerror(ret, regex, NULL, 0);
+		char    errorStr[len];
+		regerror(ret, regex, errorStr, len);
+		fprintf(stderr, "Regex compilation failed - %s\n", errorStr);
+		exit(-1);
+	}
+}
+
+// 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;
+}
+