X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_door.c;h=3359ed16fa11952151269a5bcaa39f3b990d8a09;hb=aab09714f5780d2d7eeb7f1f94a624e0535bdb22;hp=a15a433d2ed4b9aabea9d52108657113a589f0ad;hpb=72bf1b1bf64523fa64c2ee9c8617a4b47776d4db;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index a15a433..3359ed1 100644
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -17,11 +17,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#if !USE_POPEN
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <sys/wait.h>
+#include <pty.h>
 
-#define DOOR_UNLOCKED_DELAY	10	// 10 seconds before it re-locks
+#define DOOR_UNLOCKED_DELAY	5	// Time in seconds before the door re-locks
 
 // === IMPORTS ===
 
@@ -37,20 +37,11 @@ tHandler	gDoor_Handler = {
 	Door_CanDispense,
 	Door_DoDispense
 };
-char	*gsDoor_Password = "";
-volatile int	giDoor_ChildStatus;
+char	*gsDoor_SerialPort = "/dev/ttyS3";
 
 // == CODE ===
-void Door_SIGCHLDHandler(int signum)
-{
-	signum = 0;
-	printf("SIGCHLD\n");
-	giDoor_ChildStatus ++;
-}
-
 int Door_InitHandler(void)
 {
-	signal(SIGCHLD, Door_SIGCHLDHandler);
 	return 0;
 }
 
@@ -84,12 +75,7 @@ int Door_CanDispense(int User, int Item)
  */
 int Door_DoDispense(int User, int Item)
 {
-	FILE	*child_stdin;
-	char	buf[512];
-	 int	stdin_pair[2];
-	 int	stdout_pair[2];
-	pid_t	childPid;
-	pid_t	parentPid;
+	 int	door_serial_handle;
 	
 	#if DEBUG
 	printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -107,89 +93,24 @@ int Door_DoDispense(int User, int Item)
 		return 1;
 	}
 	
-	// Create stdin/stdout
-	if( pipe(stdin_pair) || pipe(stdout_pair) )
-	{
-		perror("pipe");
-		return -1;
-	}
-	
-	giDoor_ChildStatus = 0;	// Set child status to zero
-	parentPid = getpid();
-	childPid = fork();
-	
-	if( childPid < 0 )
-	{
-		perror("fork");
-		return -1;
-	}
-	
-	// Child process
-	if( childPid == 0 )
-	{
-		
-		// Close write end of stdin, and set it to #0
-		close(stdin_pair[1]);	dup2(stdin_pair[0], 0);
-		// Close read end of stdout, and set it to #1
-		close(stdout_pair[0]);	dup2(stdout_pair[1], 1);
-		
-		execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
-		perror("execl");
-		exit(-1);
-	}
-	
-	child_stdin = fdopen(stdin_pair[1], "w");
-	close(stdin_pair[0]);	// child stdin read
-	close(stdout_pair[1]);	// child stdout write
-	
-	if( giDoor_ChildStatus || read(stdout_pair[0], buf, 512) < 0) {
-		#if DEBUG
-		printf("Door_DoDispense: fread fail\n");
-		#endif
-		return -1;
-	}
-	
-	// Send password
-	if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
-		#if DEBUG
-		printf("Door_DoDispense: fputs password\n");
-		#endif
-		return -1;
-	}
-	fputs("\n", child_stdin);
-	
-	
-	#if DEBUG
-	printf("Door_DoDispense: Door unlock\n");
-	#endif
-	
-	// ATH1 - Unlock door
-	if( giDoor_ChildStatus || fputs("ATH1\n", child_stdin) <= 0) {
-		#if DEBUG
-		printf("Door_DoDispense: fputs unlock\n");
-		#endif
+	door_serial_handle = InitSerial(gsDoor_SerialPort, 1200);
+
+	if( write(door_serial_handle, "ATH1\n", 5) != 5 ) {
+		fprintf(stderr, "Unable to open door (sending ATH1)\n");
+		perror("Sending ATH1");
 		return -1;
 	}
 	
 	// Wait before re-locking
 	sleep(DOOR_UNLOCKED_DELAY);
 
-
-	#if DEBUG
-	printf("Door_DoDispense: Door re-lock\n");
-	#endif
-
-	// Re-lock the door
-	if( giDoor_ChildStatus || fputs("ATH0\n", child_stdin) == 0 ) {
-		#if DEBUG
-		printf("Door_DoDispense: fputs lock\n");
-		#endif
+	if( write(door_serial_handle, "ATH0\n", 5) != 5 ) {
+		fprintf(stderr, "Oh, hell! Door not re-locking, big error (sending ATH0 failed)\n");
+		perror("Sending ATH0");
 		return -1;
 	}
-	
-	fclose(child_stdin);
-	close(stdin_pair[1]);	// child stdin write
-	close(stdout_pair[0]);	// child stdout read
+
+	close(door_serial_handle);
 	
 	#if DEBUG
 	printf("Door_DoDispense: User %i opened door\n", User);