X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_door.c;h=5ec25c2543ed34bfc0cbdcba669c8b84f18c5f74;hb=478107d848605d5dfd2c4e1a90d7265263eed04c;hp=e92463b921f46caf2472aa21512f6fa51dbb9c5b;hpb=e70e8b768f29316ba82257eac9c2bfbfe4580396;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_door.c b/src/server/handler_door.c index e92463b..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 @@ -17,19 +16,22 @@ #include #include #include -#if !USE_POPEN -# include -#endif +#include +#include +#include +#include +#include +#include -#define DOOR_UNLOCKED_DELAY 10 // 10 seconds before it 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); -void Door_int_SIGCHLDHandler(int signum); // === GLOBALS === tHandler gDoor_Handler = { @@ -38,13 +40,53 @@ tHandler gDoor_Handler = { Door_CanDispense, Door_DoDispense }; -char *gsDoor_Password = ""; -volatile int giDoor_ChildTerminated; +char *gsDoor_SerialPort; // Set from config in main.c +sem_t gDoor_UnlockSemaphore; +pthread_t gDoor_LockThread; +bool gbDoor_LockThreadStarted; + +// === CODE === +void* Door_Lock(void* Unused __attribute__((unused))) +{ + 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); + } +} -// == CODE === int Door_InitHandler(void) -{ - signal(SIGCHLD, Door_int_SIGCHLDHandler); +{ + // Thread started later + return 0; } @@ -77,20 +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; - char buf[512]; - #if !USE_POPEN - int stdin_pair[2]; - int stdout_pair[2]; - pid_t childPid; - pid_t parent_pid; - #endif - +{ #if DEBUG printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item); #endif - + // Sanity please if( Item != 0 ) return -1; @@ -103,95 +136,24 @@ int Door_DoDispense(int User, int Item) return 1; } - #if !USE_POPEN - // Create stdin/stdout - if( pipe(stdin_pair) || pipe(stdout_pair) ) + // Door thread spun up here because program is forked after thread created + if( !gbDoor_LockThreadStarted ) { - perror("pipe"); - return -1; - } - - parent_pid = getpid(); - childPid = fork(); - - if( childPid < 0 ) - { - perror("fork"); - return -1; + // Initialize semaphore, triggers door lock release if semaphore is greater than 0 + sem_init(&gDoor_UnlockSemaphore, 0, 0); + + pthread_create(&gDoor_LockThread, NULL, &Door_Lock, NULL); } - - // Child process - if( childPid == 0 ) + + if(sem_post(&gDoor_UnlockSemaphore)) { - // 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); - kill(parent_pid, SIGCHLD); - 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 - - #else - // llogin or other - child_stdin = popen("llogin door -w -", "w"); - if( !child_stdin || child_stdin == (void*)-1 ) { - #if DEBUG - printf("Door_DoDispense: llogin failure\n"); - #endif + perror("Failed to post \"Unlock Door\" semaphore, sem_post returned"); return -1; } - #endif - - if(fread(buf, 1, 512, child_stdin) == 0) return -1; - - // Send password - if( fputs(gsDoor_Password, child_stdin) <= 0 ) return -1; - fputs("\n", child_stdin); - - - #if DEBUG - printf("Door_DoDispense: Door unlock\n"); - #endif - - // ATH1 - Unlock door - if( fputs("ATH1\n", child_stdin) <= 0) 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( fputs("ATH0\n", child_stdin) <= 0 ) return -1; - - #if !USE_POPEN - fclose(child_stdin); - close(stdin_pair[1]); // child stdin write - close(stdout_pair[0]); // child stdout read - #else - pclose(child_stdin); - #endif - #if DEBUG printf("Door_DoDispense: User %i opened door\n", User); #endif return 0; } - -void Door_int_SIGCHLDHandler(int signum) -{ - signum = 0; // Snut up - giDoor_ChildTerminated = 1; -} -