Made llogin use a pty instead of a pipe pair

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

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 1f959fd..d8c0a1f 100644 (file)
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -17,9 +17,9 @@
 #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
 
@@ -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,10 +85,14 @@ int Door_CanDispense(int User, int Item)
 int Door_DoDispense(int User, int Item)
 {
        FILE    *child_stdin;
-       char    buf[512];
+       #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);
@@ -97,6 +110,9 @@ int Door_DoDispense(int User, int Item)
                return 1;
        }
        
+       giDoor_ChildStatus = 0; // Set child status to zero
+       parentPid = getpid();
+       #if 0
        // Create stdin/stdout
        if( pipe(stdin_pair) || pipe(stdout_pair) )
        {
@@ -105,6 +121,9 @@ int Door_DoDispense(int User, int Item)
        }
        
        childPid = fork();
+       #else
+       childPid = forkpty(&child_stdin_fd, NULL, NULL, NULL);
+       #endif
        
        if( childPid < 0 )
        {
@@ -115,31 +134,56 @@ int Door_DoDispense(int User, int Item)
        // Child process
        if( childPid == 0 )
        {
+               #if 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);
+               #endif
                
-               execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+               //execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+               execl("/usr/bin/llogin", "llogin", "door", "-w-", NULL);
                perror("execl");
                exit(-1);
        }
        
+       #if 0
        child_stdin = fdopen(stdin_pair[1], "w");
        close(stdin_pair[0]);   // child stdin read
        close(stdout_pair[1]);  // child stdout write
+       #else
+       child_stdin = fdopen(child_stdin_fd, "w");
+       #endif
        
-       if(read(stdout_pair[1], buf, 512) < 0) {
+       {
+               char    buf[1024];
+                int    len;
+               #if 0
+               if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, sizeof buf)) < 0)
+               #else
+               if( giDoor_ChildStatus || (len = read(child_stdin_fd, buf, sizeof buf)) < 0)
+               #endif
+               {
+                       #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: fread fail\n");
+               printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
                #endif
-               return -1;
        }
        
        // Send password
-       if( fputs(gsDoor_Password, child_stdin) <= 0 ) {
+       if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
                #if DEBUG
-               printf("Door_DoDispense: fputs password\n");
+               int child_exit;
+               waitpid(childPid, &child_exit, 0);
+               printf("Door_DoDispense: fputs password fail (child status %i)\n", child_exit);
                #endif
                return -1;
        }
@@ -151,7 +195,7 @@ int Door_DoDispense(int User, int Item)
        #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");
                #endif
@@ -166,8 +210,8 @@ int Door_DoDispense(int User, int Item)
        printf("Door_DoDispense: Door re-lock\n");
        #endif
 
-       // Re-lock the door
-       if( fputs("ATH0\n", child_stdin) <= 0 ) {
+       // 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
@@ -175,13 +219,19 @@ int Door_DoDispense(int User, int Item)
        }
        
        fclose(child_stdin);
+       #if 0
        close(stdin_pair[1]);   // child stdin write
        close(stdout_pair[0]);  // child stdout read
+       #else
+       close(child_stdin_fd);
+       #endif
        
        #if DEBUG
        printf("Door_DoDispense: User %i opened door\n", User);
        #endif
 
+       kill(childPid, SIGKILL);
+
        return 0;
 }