X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Fmain.c;h=d336b77d42f5ec65e9d7fa2f03d8468e514b6a96;hb=74b6a69bdc5a9f96d5781939167ae5af0e038375;hp=a8d8d32dd57ef641c9fe7b0d85dc6b485cf4dbc9;hpb=32b161c885d90286f7d4a72b9d05e947c96069e5;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index a8d8d32..d336b77 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -30,7 +30,7 @@ extern int	giServer_Port;
 extern char	*gsItemListFile;
 extern char	*gsCoke_SerialPort;
 extern char	*gsSnack_SerialPort;
-extern char	*gsDoor_Password;
+extern char	*gsDoor_SerialPort;
 
 // === PROTOTYPES ===
 void	*Periodic_Thread(void *Unused);
@@ -60,10 +60,12 @@ void PrintUsage(const char *progname)
 	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, "  --doorport\n");
+	fprintf(stderr, "        Door modem/relay serial port (Default \"/dev/ttyS3\")\n");
 	fprintf(stderr, "  --cokebank\n");
 	fprintf(stderr, "        Coke bank database file (Default \"cokebank.db\")\n");
+	fprintf(stderr, "  --[dont-]daemonise\n");
+	fprintf(stderr, "        Run (or explicitly don't) the server disconnected from the terminal\n");
 }
 
 int main(int argc, char *argv[])
@@ -108,19 +110,9 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc )	return -1;
 				gsSnack_SerialPort = argv[++i];
 			}
-			else if( strcmp(arg, "--doorpass") == 0 ) {
-				FILE	*fp;
-				char	buf[30];
+			else if( strcmp(arg, "--doorport") == 0 ) {
 				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);
+				gsDoor_SerialPort = argv[++i];
 			}
 			else if( strcmp(arg, "--cokebank") == 0 ) {
 				if( i + 1 >= argc )	return -1;
@@ -250,6 +242,8 @@ int InitSerial(const char *File, int BaudRate)
 	
 	info.c_lflag = 0;	// Non-Canoical, No Echo
 	info.c_cflag = baud | CS8 | CLOCAL | CREAD;	// baud, 8N1
+	info.c_iflag = IGNCR;	// Ignore \r
+	info.c_oflag = 0;	// ???
 	cfsetspeed(&info, baud);
 	info.c_cc[VTIME] = 0;	// No time limit
 	info.c_cc[VMIN] = 1;	// Block until 1 char