X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_door.c;h=b2c6c2bb0d2960c475183ef9cc75c526605245d5;hb=27821403db9a9488cc508899af92f90c9bbade34;hp=978c1848739d33b3003115aa1fa95cbb3e74e6b6;hpb=45a676d692c76885c7b0bfaf6bde158429a96a4e;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 978c184..b2c6c2b 100644
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -7,12 +7,18 @@
  * This file is licenced under the 3-clause BSD Licence. See the file
  * COPYING for full details.
  */
+#define	DEBUG	1
+#define	USE_POPEN	0
+
 #include "common.h"
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/wait.h>
 
 #define DOOR_UNLOCKED_DELAY	10	// 10 seconds before it re-locks
 
@@ -30,16 +36,20 @@ tHandler	gDoor_Handler = {
 	Door_CanDispense,
 	Door_DoDispense
 };
-char	*gsDoor_Password;
-char	*gsDoor_Command;
-// int	giDoor_SerialFD;
+char	*gsDoor_Password = "";
+volatile int	giDoor_ChildStatus;
 
 // == CODE ===
+void Door_SIGCHLDHandler(int signum)
+{
+	signum = 0;
+	giDoor_ChildStatus ++;
+	printf("SIGCHLD: giDoor_ChildStatus = %i \n", giDoor_ChildStatus);
+}
+
 int Door_InitHandler(void)
-{		
-	gsDoor_Command = malloc(sizeof("llogin door -w ")+strlen(gsDoor_Password));
-	sprintf(gsDoor_Command, "llogin door -w %s", gsDoor_Password);
-	
+{
+	signal(SIGCHLD, Door_SIGCHLDHandler);
 	return 0;
 }
 
@@ -47,11 +57,23 @@ int Door_InitHandler(void)
  */
 int Door_CanDispense(int User, int Item)
 {
+	#if DEBUG
+	printf("Door_CanDispense: (User=%i,Item=%i)\n", User, Item);
+	#endif
 	// Sanity please
-	if( Item == 0 )	return -1;
+	if( Item != 0 )	return -1;
 	
 	if( !(Bank_GetFlags(User) & USER_FLAG_DOORGROUP) )
+	{
+		#if DEBUG
+		printf("Door_CanDispense: User %i not in door\n", User);
+		#endif
 		return 1;
+	}
+	
+	#if DEBUG
+	printf("Door_CanDispense: User %i can open the door\n", User);
+	#endif
 	
 	return 0;
 }
@@ -61,28 +83,132 @@ int Door_CanDispense(int User, int Item)
  */
 int Door_DoDispense(int User, int Item)
 {
-	FILE	*pipe;
+	FILE	*child_stdin;
+	char	buf[512];
+	 int	stdin_pair[2];
+	 int	stdout_pair[2];
+	pid_t	childPid;
+	pid_t	parentPid;
+	
+	#if DEBUG
+	printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
+	#endif
+	
 	// Sanity please
 	if( Item != 0 )	return -1;
 	
 	// Check if user is in door
 	if( !(Bank_GetFlags(User) & USER_FLAG_DOORGROUP) )
+	{
+		#if DEBUG
+		printf("Door_CanDispense: User %i not in door\n", User);
+		#endif
 		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);
+		execl("/usr/bin/llogin", "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
+	
+	{
+		 int	len;
+		if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, 512)) < 0)
+		{
+			#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
 	
-	// llogin or other
-	//pipe = popen(gsDoor_Command, "w");
-	pipe = popen("llogin door -w -", "w");
-	if( !pipe || pipe == (void*)-1 )
+	// ATH1 - Unlock door
+	if( giDoor_ChildStatus || fputs("ATH1\n", child_stdin) <= 0) {
+		#if DEBUG
+		printf("Door_DoDispense: fputs unlock\n");
+		#endif
 		return -1;
+	}
 	
-	fputs(gsDoor_Password, pipe);	fputs("\n", pipe);
-	fputs("ATH1\n", pipe);
+	// Wait before re-locking
 	sleep(DOOR_UNLOCKED_DELAY);
-	fputs("ATH0\n", pipe);
+
+
+	#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
+		return -1;
+	}
 	
-	pclose(pipe);
+	fclose(child_stdin);
+	close(stdin_pair[1]);	// child stdin write
+	close(stdout_pair[0]);	// child stdout read
+	
+	#if DEBUG
+	printf("Door_DoDispense: User %i opened door\n", User);
+	#endif
+
+	kill(childPid, SIGKILL);
 
 	return 0;
 }
 
-