X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=a35afe262cb1f349714e0ce6072aeceec9e5c31e;hb=360e762fabe1a67e860eba99d359fbe00dba0759;hp=d9af77ae0990869ce140fde06f6cad8212f82214;hpb=8fe111b5262925abdaf1614627ecfd128e112b11;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index d9af77a..a35afe2 100644
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -20,6 +20,9 @@
 
 #include "datatypes.h"
 
+#include <termios.h>
+#include <unistd.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -32,6 +35,7 @@
 #include "options.h"
 
 #include "command_queue.h"
+#include "client_list.h"
 
 #include "daemon.h"
 #include "sysexec.h"
@@ -66,7 +70,7 @@ int init_command_socket(const char* path)
   return fd;
 }
 
-int send_command(int ttyusb_fd, cmd_t* cmd)
+int send_command(int door_fd, cmd_t* cmd)
 {
   if(!cmd)
     return -1;
@@ -83,9 +87,41 @@ int send_command(int ttyusb_fd, cmd_t* cmd)
   
   int ret;
   do {
-    ret = write(ttyusb_fd, &c, 1);
+    ret = write(door_fd, &c, 1);
+  } while(!ret || (ret == -1 && errno == EINTR));
+
+  if(ret > 0) {
+    cmd->sent = 1;
+    return 0;
+  }
+
+  return ret;
+}
+
+int send_response(int fd, const char* response)
+{
+  if(!response)
+    return -1;
+
+  int len = strlen(response);
+  int offset = 0;
+  int ret;
+  for(;;) {
+    ret = write(fd, &response[offset], strlen(response));
+    if(ret < 0) {
+      if(errno != EINTR)
+        return ret;
+
+      ret = 0;
+    }
+
+    offset += ret;
+    if(offset+1 >= len)
+      break;
   }
-  while(!ret);
+  do {
+    ret = write(fd, "\n", 1);
+  } while(!ret || (ret == -1 && errno == EINTR));
 
   if(ret > 0)
     return 0;
@@ -93,7 +129,7 @@ int send_command(int ttyusb_fd, cmd_t* cmd)
   return ret;
 }
 
-int handle_command(const char* cmd, int fd, cmd_t** cmd_q)
+int handle_command(const char* cmd, int fd, cmd_t** cmd_q, client_t* client_lst)
 {
   if(!cmd_q || !cmd)
     return -1;
@@ -111,6 +147,17 @@ int handle_command(const char* cmd, int fd, cmd_t** cmd_q)
     cmd_id = STATUS;
   else if(!strncmp(cmd, "log", 3))
     cmd_id = LOG;
+  else if(!strncmp(cmd, "listen", 6)) {
+    client_t* listener = client_find(client_lst, fd);
+    if(listener) {
+      log_printf(DEBUG, "adding status listener %d", fd);
+      listener->status_listener = 1;
+    }
+    else       
+      log_printf(ERROR, "unable to add status listener %d", fd);
+
+    return 0;
+  }
   else {
     log_printf(WARNING, "unknown command '%s'", cmd);
     return 1;
@@ -144,58 +191,96 @@ int handle_command(const char* cmd, int fd, cmd_t** cmd_q)
   return 0;
 }
 
-int process_cmd(int fd, cmd_t **cmd_q)
+int process_cmd(int fd, cmd_t **cmd_q, client_t* client_lst)
 {
+  log_printf(DEBUG, "processing command from %d", fd);
+
   static char buffer[100];
   int ret = 0;
-  do {
+  do { // TODO: replace this whith a actually working readline
     memset(buffer, 0, 100);
     ret = recv(fd, buffer, sizeof(buffer), 0);
     if(!ret)
       return 1;
+    if(ret < 0)
+      return ret;
+
     char* saveptr;
     char* tok = strtok_r(buffer, "\n\r", &saveptr);
     do {
-      ret = handle_command(tok, fd, cmd_q);
+      if(!tok)
+        continue;
+
+      ret = handle_command(tok, fd, cmd_q, client_lst);
       if(ret < 0)
         return ret;
     } while(tok = strtok_r(NULL, "\n\r", &saveptr));
   } while (ret == -1 && errno == EINTR);
     
-  log_printf(DEBUG, "processing command from %d", fd);
-
   return 0;
 }
 
-int process_ttyusb(int ttyusb_fd, cmd_t **cmd_q)
+int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
 {
+  log_printf(DEBUG, "processing data from door (fd=%d)", door_fd);
+
   static char buffer[100];
   int ret = 0;
-  do {
+  do { // TODO: replace this whith a actually working readline
     memset(buffer, 0, 100);
-    ret = read(ttyusb_fd, buffer, sizeof(buffer));
+    ret = read(door_fd, buffer, sizeof(buffer));
     if(!ret) 
       return 2;
-  } while (ret == -1 && errno == EINTR);
+    if(ret < 0)
+      return ret;
+
+    char* saveptr;
+    char* tok = strtok_r(buffer, "\n\r", &saveptr);
+    do {
+      if(!tok)
+        continue;
+
+      log_printf(NOTICE, "door-firmware: %s", tok);
 
-  log_printf(INFO, "processing data from ttyusb (fd=%d)", ttyusb_fd);
+      int cmd_fd = -1;
+      if(cmd_q && (*cmd_q)) {
+        cmd_fd = (*cmd_q)->fd;
+        send_response(cmd_fd, tok);
+      }
+
+      if(!strncmp(tok, "Status:", 7)) {
+        client_t* client;
+        for(client = client_lst; client; client = client->next)
+          if(client->status_listener && client->fd != cmd_fd)
+            send_response(client->fd, tok);
+      }
+
+      cmd_pop(cmd_q);
+    } while(tok = strtok_r(NULL, "\n\r", &saveptr));
+  } while (ret == -1 && errno == EINTR);
 
   return 0;
 }
 
 
-int main_loop(int ttyusb_fd, int cmd_listen_fd)
+int main_loop(int door_fd, int cmd_listen_fd)
 {
-  log_printf(INFO, "entering main loop");
+  log_printf(NOTICE, "entering main loop");
 
   fd_set readfds, tmpfds;
   FD_ZERO(&readfds);
-  FD_SET(ttyusb_fd, &readfds);
+  FD_SET(door_fd, &readfds);
   FD_SET(cmd_listen_fd, &readfds);
-  int max_fd = ttyusb_fd > cmd_listen_fd ? ttyusb_fd : cmd_listen_fd;
+  int max_fd = door_fd > cmd_listen_fd ? door_fd : cmd_listen_fd;
   cmd_t* cmd_q = NULL;
+  client_t* client_lst = NULL;
+
+  int sig_fd = signal_init();
+  if(sig_fd < 0)
+    return -1;
+  FD_SET(sig_fd, &readfds);
+  max_fd = (max_fd < sig_fd) ? sig_fd : max_fd;
 
-  signal_init();
   int return_value = 0;
   while(!return_value) {
     memcpy(&tmpfds, &readfds, sizeof(tmpfds));
@@ -206,20 +291,18 @@ int main_loop(int ttyusb_fd, int cmd_listen_fd)
       return_value = -1;
       break;
     }
-    if(!ret)
+    if(!ret || ret == -1)
       continue;
 
-    if(signal_exit) {
+    if(signal_handle()) {
       return_value = 1;
       break;
     }
 
-    if(FD_ISSET(ttyusb_fd, &tmpfds)) {
-      return_value = process_ttyusb(ttyusb_fd, &cmd_q);
+    if(FD_ISSET(door_fd, &tmpfds)) {
+      return_value = process_door(door_fd, &cmd_q, client_lst);
       if(return_value)
         break;
-
-      FD_CLR(ttyusb_fd, &tmpfds);
     }
 
     if(FD_ISSET(cmd_listen_fd, &tmpfds)) {
@@ -232,32 +315,94 @@ int main_loop(int ttyusb_fd, int cmd_listen_fd)
       log_printf(DEBUG, "new command connection (fd=%d)", new_fd);
       FD_SET(new_fd, &readfds);
       max_fd = (max_fd < new_fd) ? new_fd : max_fd;
-      FD_CLR(cmd_listen_fd, &tmpfds);
+      client_add(&client_lst, new_fd);
     }
 
-    int fd;
-    for(fd = 0; fd <= max_fd; fd++) {
-      if(FD_ISSET(fd, &tmpfds)) {
-        return_value = process_cmd(fd, &cmd_q); 
+    client_t* lst = client_lst;
+    while(lst) {
+      if(FD_ISSET(lst->fd, &tmpfds)) {
+        return_value = process_cmd(lst->fd, &cmd_q, client_lst); 
         if(return_value == 1) {
-          log_printf(DEBUG, "removing closed command connection (fd=%d)", fd);
-          close(fd);
-          FD_CLR(fd, &readfds);
+          log_printf(DEBUG, "removing closed command connection (fd=%d)", lst->fd);
+          client_t* deletee = lst;
+          lst = lst->next;
+          FD_CLR(deletee->fd, &readfds);
+          client_remove(&client_lst, deletee->fd);
           return_value = 0;
+          continue;
         }
         if(return_value)
           break;
 
-        if(cmd_q && !cmd_q->sent)
-          send_command(ttyusb_fd, cmd_q);
       }
+      lst = lst->next;
     }
+
+    if(cmd_q && !cmd_q->sent)
+      send_command(door_fd, cmd_q);
   }
 
   cmd_clear(&cmd_q);
+  client_clear(&client_lst);
+  signal_stop();
   return return_value;
 }
 
+int setup_tty(int fd)
+{
+  struct termios tmio;
+  
+  int ret = tcgetattr(fd, &tmio);
+  if(ret) {
+    log_printf(ERROR, "Error on tcgetattr(): %s", strerror(errno));
+    return ret;
+  }
+
+  ret = cfsetospeed(&tmio, B9600);
+  if(ret) {
+    log_printf(ERROR, "Error on cfsetospeed(): %s", strerror(errno));
+    return ret;
+  }
+
+  ret = cfsetispeed(&tmio, B9600);
+  if(ret) {
+    log_printf(ERROR, "Error on cfsetispeed(): %s", strerror(errno));
+    return ret;
+  }
+
+  tmio.c_lflag &= ~ECHO;
+
+  ret = tcsetattr(fd, TCSANOW, &tmio);
+  if(ret) {
+    log_printf(ERROR, "Error on tcsetattr(): %s", strerror(errno));
+    return ret;
+  }
+  
+  ret = tcflush(fd, TCIFLUSH);
+  if(ret) {
+    log_printf(ERROR, "Error on tcflush(): %s", strerror(errno));
+    return ret;
+  }
+
+  fd_set fds;
+  struct timeval tv;
+  FD_ZERO(&fds);
+  FD_SET(fd, &fds);
+  tv.tv_sec = 0;
+  tv.tv_usec = 50000;
+  for(;;) {
+    ret = select(fd+1, &fds, NULL, NULL, &tv);
+    if(ret > 0) {
+      char buffer[100];
+      ret = read(fd, buffer, sizeof(buffer));
+    }
+    else
+      break;
+  }
+
+  return 0;
+}
+
 int main(int argc, char* argv[])
 {
   log_init();
@@ -345,33 +490,44 @@ int main(int argc, char* argv[])
     fclose(pid_file);
   }
 
-  int ttyusb_fd = open(opt.ttyusb_dev_, O_RDWR);
-  if(ttyusb_fd < 0) {
-    log_printf(ERROR, "unable to open %s: %s", opt.ttyusb_dev_, strerror(errno));
-    options_clear(&opt);
-    log_close();
-    exit(-1);
-  }
-
   int cmd_listen_fd = init_command_socket(opt.command_sock_);
   if(cmd_listen_fd < 0) {
-    close(ttyusb_fd);
     options_clear(&opt);
     log_close();
     exit(-1);
   }
+  
+  int door_fd = 0;
+  for(;;) {
+    door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY);
+    if(door_fd < 0)
+      ret = 2;
+    else {
+      ret = setup_tty(door_fd);
+      if(ret)
+        ret = 2;
+      else
+        ret = main_loop(door_fd, cmd_listen_fd);
+    }
 
-  ret = main_loop(ttyusb_fd, cmd_listen_fd);
+    if(ret == 2) {
+      log_printf(ERROR, "%s error, trying to reopen in 5 seconds..", opt.door_dev_);
+      if(door_fd > 0)
+        close(door_fd);
+      sleep(5);
+    }
+    else
+      break;
+  }
 
   close(cmd_listen_fd);
-  close(ttyusb_fd);
+  if(door_fd > 0)
+    close(door_fd);
 
   if(!ret)
     log_printf(NOTICE, "normal shutdown");
   else if(ret < 0)
     log_printf(NOTICE, "shutdown after error");
-  else if(ret == 2)
-    log_printf(ERROR, "shutdown after %s read error", opt.ttyusb_dev_);
   else
     log_printf(NOTICE, "shutdown after signal");