Server - Moved to new door control (via 115200 USB serial)

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

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 1f959fd..190769a 100644 (file)
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -2,7 +2,7 @@
  * 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.
@@ -17,11 +17,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#if !USE_POPEN
-# include <unistd.h>
-#endif
+#include <unistd.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,6 +28,8 @@
  int   Door_InitHandler();
  int   Door_CanDispense(int User, int Item);
  int   Door_DoDispense(int User, int Item);
+ int   writes(int fd, const char *str);
+char   *ReadStatus(int FD);
 
 // === GLOBALS ===
 tHandler       gDoor_Handler = {
@@ -37,11 +38,11 @@ tHandler    gDoor_Handler = {
        Door_CanDispense,
        Door_DoDispense
 };
-char   *gsDoor_Password = "";
+char   *gsDoor_SerialPort;     // Set from config in main.c
 
 // == CODE ===
 int Door_InitHandler(void)
-{      
+{
        return 0;
 }
 
@@ -75,11 +76,7 @@ int Door_CanDispense(int User, int Item)
  */
 int Door_DoDispense(int User, int Item)
 {
-       FILE    *child_stdin;
-       char    buf[512];
-        int    stdin_pair[2];
-        int    stdout_pair[2];
-       pid_t   childPid;
+        int    door_serial_handle;
        
        #if DEBUG
        printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
@@ -97,86 +94,35 @@ int Door_DoDispense(int User, int Item)
                return 1;
        }
        
-       // Create stdin/stdout
-       if( pipe(stdin_pair) || pipe(stdout_pair) )
-       {
-               perror("pipe");
+       door_serial_handle = InitSerial(gsDoor_SerialPort, 115200);
+       if(door_serial_handle < 0) {
+               fprintf(stderr, "Unable to open door serial '%s'\n", gsDoor_SerialPort);
+               perror("Opening door port");
                return -1;
        }
-       
-       childPid = fork();
-       
-       if( childPid < 0 )
-       {
-               perror("fork");
-               return -1;
-       }
-       
-       // Child process
-       if( childPid == 0 )
+
+       // Disable local echo
        {
-               // 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);
-               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
-       
-       if(read(stdout_pair[1], buf, 512) < 0) {
-               #if DEBUG
-               printf("Door_DoDispense: fread fail\n");
-               #endif
-               return -1;
-       }
-       
-       // Send password
-       if( fputs(gsDoor_Password, child_stdin) <= 0 ) {
-               #if DEBUG
-               printf("Door_DoDispense: fputs password\n");
-               #endif
-               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) {
-               #if DEBUG
-               printf("Door_DoDispense: fputs unlock\n");
-               #endif
-               return -1;
+               struct termios  info;
+               tcgetattr(door_serial_handle, &info);
+               info.c_cflag &= ~CLOCAL;
+               tcsetattr(door_serial_handle, TCSANOW, &info);
        }
-       
-       // Wait before re-locking
-       sleep(DOOR_UNLOCKED_DELAY);
 
+//     flush(door_serial_handle);
 
-       #if DEBUG
-       printf("Door_DoDispense: Door re-lock\n");
-       #endif
+       writes(door_serial_handle, "4;");
 
-       // Re-lock the door
-       if( fputs("ATH0\n", child_stdin) <= 0 ) {
-               #if DEBUG
-               printf("Door_DoDispense: fputs lock\n");
-               #endif
+#if 0
+       char *status = ReadStatus(door_serial_handle);
+       if( !status )   return -1;
+       if( strcmp(status, "Opening door") != 0 ) {
+               fprintf(stderr, "Unknown/unexpected door status '%s'\n", status);
                return -1;
        }
-       
-       fclose(child_stdin);
-       close(stdin_pair[1]);   // child stdin write
-       close(stdout_pair[0]);  // child stdout read
+#endif
+
+       close(door_serial_handle);
        
        #if DEBUG
        printf("Door_DoDispense: User %i opened door\n", User);
@@ -185,3 +131,35 @@ int Door_DoDispense(int User, int Item)
        return 0;
 }
 
+int writes(int fd, const char *str)
+{
+        int    len = strlen(str);
+       
+       if( len != write(fd, str, len) )
+       {
+               return 1;
+       }
+       return 0;
+}
+
+char *ReadStatus(int FD)
+{
+       char    tmpbuf[32];
+        int    len;
+       len = read(FD, tmpbuf, sizeof(tmpbuf)-1);
+       tmpbuf[len] = 0;
+       char *msg = strchr(tmpbuf, ',');
+       if( !msg ) {
+               fprintf(stderr, "Door returned malformed data (no ',')\n");
+               return NULL;
+       }
+       msg ++;
+       char *end = strchr(tmpbuf, ';');
+       if( !end ) {
+               fprintf(stderr, "Door returned malformed data (no ';')\n");
+               return NULL;
+       }
+       *end = '\0';
+
+       return strdup(msg);
+}