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

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index d8c0a1f..3359ed1 100644
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -21,7 +21,7 @@
 #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;
-	giDoor_ChildStatus ++;
-	printf("SIGCHLD: giDoor_ChildStatus = %i \n", giDoor_ChildStatus);
-}
-
 int Door_InitHandler(void)
 {
-	signal(SIGCHLD, Door_SIGCHLDHandler);
 	return 0;
 }
 
@@ -84,15 +75,7 @@ int Door_CanDispense(int User, int Item)
  */
 int Door_DoDispense(int User, int Item)
 {
-	FILE	*child_stdin;
-	#if 0
-	 int	stdin_pair[2];
-	 int	stdout_pair[2];
-	#else
-	 int	child_stdin_fd;
-	#endif
-	pid_t	childPid;
-	pid_t	parentPid;
+	 int	door_serial_handle;
 	
 	#if DEBUG
 	printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -110,128 +93,29 @@ int Door_DoDispense(int User, int Item)
 		return 1;
 	}
 	
-	giDoor_ChildStatus = 0;	// Set child status to zero
-	parentPid = getpid();
-	#if 0
-	// Create stdin/stdout
-	if( pipe(stdin_pair) || pipe(stdout_pair) )
-	{
-		perror("pipe");
-		return -1;
-	}
-	
-	childPid = fork();
-	#else
-	childPid = forkpty(&child_stdin_fd, NULL, NULL, NULL);
-	#endif
-	
-	if( childPid < 0 )
-	{
-		perror("fork");
-		return -1;
-	}
-	
-	// Child process
-	if( childPid == 0 )
-	{
-		#if 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);
-		#endif
-		
-		//execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
-		execl("/usr/bin/llogin", "llogin", "door", "-w-", NULL);
-		perror("execl");
-		exit(-1);
-	}
-	
-	#if 0
-	child_stdin = fdopen(stdin_pair[1], "w");
-	close(stdin_pair[0]);	// child stdin read
-	close(stdout_pair[1]);	// child stdout write
-	#else
-	child_stdin = fdopen(child_stdin_fd, "w");
-	#endif
-	
-	{
-		char	buf[1024];
-		 int	len;
-		#if 0
-		if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, sizeof buf)) < 0)
-		#else
-		if( giDoor_ChildStatus || (len = read(child_stdin_fd, buf, sizeof buf)) < 0)
-		#endif
-		{
-			#if DEBUG
-			int child_exit;
-			waitpid(childPid, &child_exit, 0);
-			printf("Door_DoDispense: fread fail (child status %i)\n", child_exit);
-			#endif
-			return -1;
-		}
-		buf[len] = '\0';
-		
-		#if DEBUG
-		printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
-		#endif
-	}
-	
-	// Send password
-	if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
-		#if DEBUG
-		int child_exit;
-		waitpid(childPid, &child_exit, 0);
-		printf("Door_DoDispense: fputs password fail (child status %i)\n", child_exit);
-		#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 (and quit llogin)
-	if( giDoor_ChildStatus || fputs("ATH0\n\x1D", 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);
-	#if 0
-	close(stdin_pair[1]);	// child stdin write
-	close(stdout_pair[0]);	// child stdout read
-	#else
-	close(child_stdin_fd);
-	#endif
+
+	close(door_serial_handle);
 	
 	#if DEBUG
 	printf("Door_DoDispense: User %i opened door\n", User);
 	#endif
 
-	kill(childPid, SIGKILL);
-
 	return 0;
 }