Changed door code to use direct serial instead of llogin

[tpg/opendispense2.git] / src / server / handler_door.c

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index d903bf9..62fb8f9 100644 (file)
--- 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 ===
 
@@ -29,7 +29,6 @@
  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 +37,11 @@ tHandler    gDoor_Handler = {
        Door_CanDispense,
        Door_DoDispense
 };
-char   *gsDoor_Password = "";
-volatile int   giDoor_ChildTerminated;
+char   *gsDoor_SerialPort = "/dev/ttyS3";
 
 // == CODE ===
 int Door_InitHandler(void)
-{      
-       signal(SIGCHLD, Door_int_SIGCHLDHandler);
+{
        return 0;
 }
 
@@ -78,14 +75,7 @@ int Door_CanDispense(int User, int Item)
  */
 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
+        int    door_serial_handle;
        
        #if DEBUG
        printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -103,84 +93,24 @@ int Door_DoDispense(int User, int Item)
                return 1;
        }
        
-       #if !USE_POPEN
-       // Create stdin/stdout
-       if( pipe(stdin_pair) || pipe(stdout_pair) )
-       {
-               perror("pipe");
-               return -1;
-       }
-       
-       parent_pid = getpid();
-       childPid = fork();
-       
-       if( childPid < 0 )
-       {
-               perror("fork");
+       door_serial_handle = InitSerial(gsDoor_SerialPort, 9600);
+
+       if( write(door_serial_handle, "ATH1\n", 5) != 5 ) {
+               fprintf(stderr, "Unable to open door (sending ATH1)\n");
+               perror("Sending ATH1");
                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("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
-               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( 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;
+       }
 
-       #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
+       close(door_serial_handle);
        
        #if DEBUG
        printf("Door_DoDispense: User %i opened door\n", User);
@@ -189,9 +119,3 @@ int Door_DoDispense(int User, int Item)
        return 0;
 }
 
-void Door_int_SIGCHLDHandler(int signum)
-{
-       signum = 0;     // Snut up
-       giDoor_ChildTerminated = 1;
-}
-