X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=c8be473bace3a469b9c03c5c953362281c021124;hb=6d657891a5410b7d93cc90f376a3ef27b72b20f6;hp=c2ef55c01fd1c22bed665f3a4938910ccfde7deb;hpb=da639e3f13ee62627f4e7b29eccfcac70aad681d;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index c2ef55c..c8be473 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -9,6 +9,7 @@
  */
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <signal.h>
 #include "common.h"
@@ -20,6 +21,7 @@
 #include <syslog.h>
 #include <pthread.h>
 #include "../cokebank.h"
+#include "../common/config.h"
 
 // === IMPORTS ===
 extern void	Init_Handlers(void);
@@ -30,12 +32,14 @@ extern int	giServer_Port;
 extern const char	*gsItemListFile;
 extern const char	*gsCoke_ModbusAddress;
 extern const char	*gsDoor_SerialPort;
+extern bool	gbSyslogEnabled;
 
 // === PROTOTYPES ===
 void	*Periodic_Thread(void *Unused);
 
 // === GLOBALS ===
  int	giDebugLevel = 0;
+ int	gbNoCostMode = 0;
 const char	*gsCokebankPath = "cokebank.db";
 // - Functions called every 20s (or so)
 #define ciMaxPeriodics	10
@@ -53,6 +57,8 @@ void sigint_handler()
 void PrintUsage(const char *progname)
 {
 	fprintf(stderr, "Usage: %s\n", progname);
+	fprintf(stderr, "  -f,--configfile\n");
+	fprintf(stderr, "        Set the config file path (default `dispsrv.conf')\n");
 	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");
@@ -82,6 +88,7 @@ int main(int argc, char *argv[])
 				break;
 			default:
 				// Usage Error
+				fprintf(stderr, "Unknown option '-%c'\n", arg[1]);
 				PrintUsage(argv[0]);
 				return -1;
 			}
@@ -100,6 +107,7 @@ int main(int argc, char *argv[])
 			}
 			else {
 				// Usage error
+				fprintf(stderr, "Unknown option '%s'\n", arg);
 				PrintUsage(argv[0]);
 				return -1;
 			}
@@ -121,7 +129,10 @@ int main(int argc, char *argv[])
 	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);
+	gbSyslogEnabled      = (Config_GetValue_Bool("disable_syslog", 0) == 0);
+
 	signal(SIGINT, sigint_handler);
 	signal(SIGTERM, sigint_handler);
 	
@@ -223,7 +234,10 @@ int InitSerial(const char *File, int BaudRate)
 	{
 	case 1200:	baud = B1200;	break;
 	case 9600:	baud = B9600;	break;
-	default:	close(fd);	return -1;
+	case 115200:	baud = B115200;	break;
+	default:
+		fprintf(stderr, "ERROR: Invalid baud rate to InitSerial (%i)\n", BaudRate);
+		exit(1);
 	}
 	
 	info.c_lflag = 0;	// Non-Canoical, No Echo