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

diff --git a/src/server/main.c b/src/server/main.c
index ac6dd27..6105936 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -12,16 +12,23 @@
 #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*	gsSnack_SerialPort;
+extern char	*gsItemListFile;
+extern char	*gsCoke_SerialPort;
+extern char	*gsSnack_SerialPort;
+extern char	*gsDoor_Password;
 
 // === GLOBALS ===
  int	giDebugLevel = 0;
@@ -46,9 +53,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 +67,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,7 +93,10 @@ 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();
 
@@ -94,6 +113,9 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match
 	 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 +140,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;
+}