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

diff --git a/src/server/main.c b/src/server/main.c
index c1b883e..d336b77 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -25,11 +25,12 @@
 extern void	Init_Handlers(void);
 extern void	Load_Itemlist(void);
 extern void	Server_Start(void);
+extern int	gbServer_RunInBackground;
 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);
@@ -42,6 +43,7 @@ char	*gsCokebankPath = "cokebank.db";
 struct sPeriodicCall {
 	void	(*Function)(void);
 }	gaPeriodicCalls[ciMaxPeriodics];
+pthread_t	gTimerThread;
 
 // === CODE ===
 void sigint_handler()
@@ -49,10 +51,26 @@ void sigint_handler()
 	exit(0);
 }
 
+void PrintUsage(const char *progname)
+{
+	fprintf(stderr, "Usage: %s\n", progname);
+	fprintf(stderr, "  -p    Set server port (default 11020)\n");
+	fprintf(stderr, "  -d    Set debug level (0 - 2, default 0)\n");
+	fprintf(stderr, "  --itemsfile\n");
+	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, "  --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[])
 {
 	 int	i;
-	pthread_t	timer_thread;
 	
 	// Parse Arguments
 	for( i = 1; i < argc; i++ )
@@ -70,9 +88,13 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc )	return -1;
 				giDebugLevel = atoi(argv[++i]);
 				break;
+			case 'D':
+				gbServer_RunInBackground = 1;
+				return -1;
 			default:
 				// Usage Error?
-				break;
+				PrintUsage(argv[0]);
+				return -1;
 			}
 		}
 		else if( arg[0] == '-' && arg[1] == '-' ) {
@@ -88,20 +110,35 @@ int main(int argc, char *argv[])
 				if( i + 1 >= argc )	return -1;
 				gsSnack_SerialPort = argv[++i];
 			}
-			else if( strcmp(arg, "--doorpass") == 0 ) {
+			else if( strcmp(arg, "--doorport") == 0 ) {
+				if( i + 1 >= argc )	return -1;
+				gsDoor_SerialPort = argv[++i];
+			}
+			else if( strcmp(arg, "--cokebank") == 0 ) {
 				if( i + 1 >= argc )	return -1;
-				gsDoor_Password = argv[++i];
+				gsCokebankPath = argv[++i];
+			}
+			else if( strcmp(arg, "--daemonise") == 0 ) {
+				gbServer_RunInBackground = 1;
+			}
+			else if( strcmp(arg, "--dont-daemonise") == 0 ) {
+				gbServer_RunInBackground = 0;
 			}
 			else {
 				// Usage error?
+				PrintUsage(argv[0]);
+				return -1;
 			}
 		}
 		else {
 			// Usage Error?
+			PrintUsage(argv[0]);
+			return -1;
 		}
 	}
 	
 	signal(SIGINT, sigint_handler);
+	signal(SIGTERM, sigint_handler);
 	
 	openlog("odispense2", 0, LOG_LOCAL4);
 	
@@ -112,11 +149,9 @@ int main(int argc, char *argv[])
 
 	Load_Itemlist();
 	
-	pthread_create( &timer_thread, NULL, Periodic_Thread, NULL );
-	
 	Server_Start();
 	
-	pthread_kill(timer_thread, SIGKILL);
+	pthread_kill(gTimerThread, SIGKILL);
 
 	return 0;
 }
@@ -139,6 +174,11 @@ void *Periodic_Thread(void *Unused)
 	return NULL;
 }
 
+void StartPeriodicThread(void)
+{
+	pthread_create( &gTimerThread, NULL, Periodic_Thread, NULL );
+}
+
 void AddPeriodicFunction(void (*Fcn)(void))
 {
 	int i;
@@ -202,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