X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_door.c;h=5ec25c2543ed34bfc0cbdcba669c8b84f18c5f74;hb=478107d848605d5dfd2c4e1a90d7265263eed04c;hp=cc66945d810f237a60fd7f051814ea14b71a824b;hpb=21ed7a19f1f3e046c2985043e7fbe054b65cb4e4;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index cc66945..5ec25c2 100644
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -2,13 +2,12 @@
  * OpenDispense 2 
  * UCC (University [of WA] Computer Club) Electronic Accounting System
  *
- * handler_doror.c - Door Relay code
+ * handler_door.c - Door Relay code
  *
  * 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>
@@ -18,14 +17,18 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <pty.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <errno.h>
+#include <stdbool.h>
 
-#define DOOR_UNLOCKED_DELAY	5	// Time in seconds before the door re-locks
+#define DOOR_UNLOCKED_DELAY	10	// Time in seconds before the door re-locks
 
 // === IMPORTS ===
 
 // === PROTOTYPES ===
+void*	Door_Lock(void* Unused);
  int	Door_InitHandler();
  int	Door_CanDispense(int User, int Item);
  int	Door_DoDispense(int User, int Item);
@@ -37,20 +40,53 @@ tHandler	gDoor_Handler = {
 	Door_CanDispense,
 	Door_DoDispense
 };
-char	*gsDoor_Password = "";
-volatile int	giDoor_ChildStatus;
+char	*gsDoor_SerialPort;	// Set from config in main.c
+sem_t	gDoor_UnlockSemaphore;
+pthread_t	gDoor_LockThread;
+bool	gbDoor_LockThreadStarted;
 
-// == CODE ===
-void Door_SIGCHLDHandler(int signum)
+// === CODE ===
+void* Door_Lock(void* Unused __attribute__((unused)))
 {
-	signum = 0;
-	giDoor_ChildStatus ++;
-	printf("SIGCHLD: giDoor_ChildStatus = %i \n", giDoor_ChildStatus);
+	while(1)
+	{
+		sem_wait(&gDoor_UnlockSemaphore);
+
+		int door_serial_handle = InitSerial(gsDoor_SerialPort, 9600);
+		if(door_serial_handle < 0)
+		{
+			fprintf(stderr, "Unable to open door serial '%s'\n", gsDoor_SerialPort);
+			perror("Opening door port");
+		}
+
+		// Disable local echo
+		{
+			struct termios	info;
+			tcgetattr(door_serial_handle, &info);
+			info.c_cflag &= ~CLOCAL;
+			tcsetattr(door_serial_handle, TCSANOW, &info);
+		}
+
+		if(write(door_serial_handle, "\xff\x01\x01", 3) != 3)	// Relay ON
+		{
+			fprintf(stderr, "Failed to write Relay ON (unlock) command, errstr: %s", strerror(errno));
+		}
+
+		sleep(DOOR_UNLOCKED_DELAY);
+
+		if(write(door_serial_handle, "\xff\x01\x00", 3) != 3)	// Relay OFF
+		{
+			fprintf(stderr, "Failed to write Relay OFF (lock) command, errstr: %s", strerror(errno));
+		}
+
+		close(door_serial_handle);
+	}
 }
 
 int Door_InitHandler(void)
 {
-	signal(SIGCHLD, Door_SIGCHLDHandler);
+	// Thread started later
+
 	return 0;
 }
 
@@ -83,21 +119,11 @@ int Door_CanDispense(int User, int Item)
  * \brief Actually do a dispense from the coke machine
  */
 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;
-	
+{	
 	#if DEBUG
 	printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
 	#endif
-	
+
 	// Sanity please
 	if( Item != 0 )	return -1;
 	
@@ -110,95 +136,24 @@ int Door_DoDispense(int User, int Item)
 		return 1;
 	}
 	
-	giDoor_ChildStatus = 0;	// Set child status to zero
-	parentPid = getpid();
-	childPid = forkpty(&child_stdin_fd, NULL, NULL, NULL);
-	
-	if( childPid < 0 )
-	{
-		perror("fork");
-		return -1;
-	}
-	
-	// Child process
-	if( childPid == 0 )
+	// Door thread spun up here because program is forked after thread created
+	if( !gbDoor_LockThreadStarted )
 	{
-		execl("/usr/bin/llogin", "llogin", "door", "-w-", NULL);
-		perror("execl");
-		exit(-1);
-	}
-	
-	child_stdin = fdopen(child_stdin_fd, "w");
+		// Initialize semaphore, triggers door lock release if semaphore is greater than 0
+		sem_init(&gDoor_UnlockSemaphore, 0, 0);	
 
-	int read_child_output()	
-	{
-		char	buf[1024];
-		 int	len;
-		if( giDoor_ChildStatus || (len = read(child_stdin_fd, buf, sizeof buf)) < 0)
-		{
-			#if DEBUG
-			printf("Door_DoDispense: fread fail\n");
-			#endif
-			return -1;
-		}
-		buf[len] = '\0';
-		
-		#if DEBUG > 1
-		printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
-		#endif
-		return 0;
-	}
-
-	if( read_child_output() )	return -1;
-	
-	// Send password
-	if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
-		printf("Door_DoDispense: fputs password fail\n");
-		return -1;
-	}
-	fputs("\n", child_stdin);
-	fflush(child_stdin);
-	
-	if( read_child_output() )	return -1;
-	
-	#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 failed (or child terminated)\n");
-		#endif
-		return -1;
+		pthread_create(&gDoor_LockThread, NULL, &Door_Lock, NULL);
 	}
-	fflush(child_stdin);
-	
-	// 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", child_stdin) == 0 ) {
-		fprintf(stderr, "Oh F**k, the door may be stuck unlocked, someone use llogin!\n");
+	if(sem_post(&gDoor_UnlockSemaphore))
+	{
+		perror("Failed to post \"Unlock Door\" semaphore, sem_post returned");
 		return -1;
 	}
-	fflush(child_stdin);
-	fputs("\x1D", child_stdin);
 
-	// Wait a little so llogin can send the lock message
-	sleep(1);
-	
-	fclose(child_stdin);
-	close(child_stdin_fd);
-	
 	#if DEBUG
 	printf("Door_DoDispense: User %i opened door\n", User);
 	#endif
 
-	kill(childPid, SIGKILL);
-
 	return 0;
 }
-