Client - Documentation for `enumitems` (commented out)

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

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 968c3b8..cc66945 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 ===
 
@@ -38,10 +38,19 @@ tHandler    gDoor_Handler = {
        Door_DoDispense
 };
 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)
-{      
+{
+       signal(SIGCHLD, Door_SIGCHLDHandler);
        return 0;
 }
 
@@ -76,12 +85,14 @@ int Door_CanDispense(int User, int Item)
 int Door_DoDispense(int User, int Item)
 {
        FILE    *child_stdin;
-       char    buf[512];
-       #if !USE_POPEN
+       #if 0
         int    stdin_pair[2];
         int    stdout_pair[2];
-       pid_t   childPid;
+       #else
+        int    child_stdin_fd;
        #endif
+       pid_t   childPid;
+       pid_t   parentPid;
        
        #if DEBUG
        printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -99,15 +110,9 @@ 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;
-       }
-       
-       childPid = fork();
+       giDoor_ChildStatus = 0; // Set child status to zero
+       parentPid = getpid();
+       childPid = forkpty(&child_stdin_fd, NULL, NULL, NULL);
        
        if( childPid < 0 )
        {
@@ -118,88 +123,82 @@ int Door_DoDispense(int User, int Item)
        // 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
-       
-       #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) {
-               #if DEBUG
-               printf("Door_DoDispense: fread fail\n");
+       child_stdin = fdopen(child_stdin_fd, "w");
+
+       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 -1;
+               return 0;
        }
+
+       if( read_child_output() )       return -1;
        
        // Send password
-       if( fputs(gsDoor_Password, child_stdin) <= 0 ) {
-               #if DEBUG
-               printf("Door_DoDispense: fputs password\n");
-               #endif
+       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( fputs("ATH1\n", child_stdin) <= 0) {
+       if( giDoor_ChildStatus || fputs("ATH1\n", child_stdin) == 0) {
                #if DEBUG
-               printf("Door_DoDispense: fputs unlock\n");
+               printf("Door_DoDispense: fputs unlock failed (or child terminated)\n");
                #endif
                return -1;
        }
+       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
-       if( fputs("ATH0\n", child_stdin) <= 0 ) {
-               #if DEBUG
-               printf("Door_DoDispense: fputs 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");
                return -1;
        }
+       fflush(child_stdin);
+       fputs("\x1D", child_stdin);
+
+       // Wait a little so llogin can send the lock message
+       sleep(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(child_stdin_fd);
        
        #if DEBUG
        printf("Door_DoDispense: User %i opened door\n", User);
        #endif
 
+       kill(childPid, SIGKILL);
+
        return 0;
 }