Merge branch 'master' of git://mutabah.net/opendispense2

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

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index d903bf9..fe8d1d9 100644 (file)
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -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 = {
@@ -39,12 +38,19 @@ tHandler    gDoor_Handler = {
        Door_DoDispense
 };
 char   *gsDoor_Password = "";
-volatile int   giDoor_ChildTerminated;
+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_int_SIGCHLDHandler);
+{
+       signal(SIGCHLD, Door_SIGCHLDHandler);
        return 0;
 }
 
@@ -80,12 +86,10 @@ 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
+       pid_t   parentPid;
        
        #if DEBUG
        printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -103,7 +107,6 @@ int Door_DoDispense(int User, int Item)
                return 1;
        }
        
-       #if !USE_POPEN
        // Create stdin/stdout
        if( pipe(stdin_pair) || pipe(stdout_pair) )
        {
@@ -111,7 +114,8 @@ int Door_DoDispense(int User, int Item)
                return -1;
        }
        
-       parent_pid = getpid();
+       giDoor_ChildStatus = 0; // Set child status to zero
+       parentPid = getpid();
        childPid = fork();
        
        if( childPid < 0 )
@@ -128,8 +132,7 @@ int Door_DoDispense(int User, int Item)
                // 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);
+               execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
                perror("execl");
                exit(-1);
        }
@@ -138,21 +141,29 @@ int Door_DoDispense(int User, int Item)
        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 ) {
+       {
+                int    len;
+               if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, 512)) < 0)
+               {
+                       #if DEBUG
+                       printf("Door_DoDispense: fread fail\n");
+                       #endif
+                       return -1;
+               }
+               buf[len] = '\0';
+               
                #if DEBUG
-               printf("Door_DoDispense: llogin failure\n");
+               printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
                #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;
+       if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs password\n");
+               #endif
+               return -1;
+       }
        fputs("\n", child_stdin);
        
        
@@ -161,7 +172,12 @@ int Door_DoDispense(int User, int Item)
        #endif
        
        // ATH1 - Unlock door
-       if( fputs("ATH1\n", child_stdin) <= 0)  return -1;
+       if( giDoor_ChildStatus || fputs("ATH1\n", child_stdin) <= 0) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs unlock\n");
+               #endif
+               return -1;
+       }
        
        // Wait before re-locking
        sleep(DOOR_UNLOCKED_DELAY);
@@ -172,26 +188,23 @@ int Door_DoDispense(int User, int Item)
        #endif
 
        // Re-lock the door
-       if( fputs("ATH0\n", child_stdin) <= 0 ) return -1;
+       if( giDoor_ChildStatus || fputs("ATH0\n", child_stdin) == 0 ) {
+               #if DEBUG
+               printf("Door_DoDispense: fputs lock\n");
+               #endif
+               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;
-}
+       kill(childPid, SIGKILL);
 
-void Door_int_SIGCHLDHandler(int signum)
-{
-       signum = 0;     // Snut up
-       giDoor_ChildTerminated = 1;
+       return 0;
 }