X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=779d0852cf4b47c1f9ec8b2c246aabae07670375;hb=612479558c6a9be836c331c46e04b8f0b28fbabc;hp=cf126688d12a2aa858afc785367ec7f48270de27;hpb=bd2c78928d653160ef85e25e03e8b4e721635ac6;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index cf12668..779d085 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"
@@ -125,7 +129,7 @@ int send_response(int fd, const char* response)
   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;
@@ -143,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;
@@ -176,8 +191,10 @@ 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 { // TODO: replace this whith a actually working readline
@@ -185,22 +202,28 @@ int process_cmd(int fd, cmd_t **cmd_q)
     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_door(int door_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 { // TODO: replace this whith a actually working readline
@@ -208,21 +231,34 @@ int process_door(int door_fd, cmd_t **cmd_q)
     ret = read(door_fd, buffer, sizeof(buffer));
     if(!ret) 
       return 2;
+    if(ret < 0)
+      return ret;
+
     char* saveptr;
     char* tok = strtok_r(buffer, "\n\r", &saveptr);
     do {
-      if(!cmd_q || !(*cmd_q))
-        break;
-      ret = send_response((*cmd_q)->fd, tok);
-      if(ret < 0)
-        return ret;
+      if(!tok)
+        continue;
+
+      log_printf(NOTICE, "door-firmware: %s", tok);
+
+      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);
 
-  log_printf(DEBUG, "processing data from door (fd=%d)", door_fd);
-
   return 0;
 }
 
@@ -237,6 +273,7 @@ int main_loop(int door_fd, int cmd_listen_fd)
   FD_SET(cmd_listen_fd, &readfds);
   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)
@@ -261,14 +298,11 @@ int main_loop(int door_fd, int cmd_listen_fd)
       return_value = 1;
       break;
     }
-    FD_CLR(sig_fd, &tmpfds);
 
     if(FD_ISSET(door_fd, &tmpfds)) {
-      return_value = process_door(door_fd, &cmd_q);
+      return_value = process_door(door_fd, &cmd_q, client_lst);
       if(return_value)
         break;
-
-      FD_CLR(door_fd, &tmpfds);
     }
 
     if(FD_ISSET(cmd_listen_fd, &tmpfds)) {
@@ -281,22 +315,27 @@ int main_loop(int door_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;
+
       }
+      lst = lst->next;
     }
 
     if(cmd_q && !cmd_q->sent)
@@ -304,10 +343,66 @@ int main_loop(int door_fd, int cmd_listen_fd)
   }
 
   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();
@@ -395,13 +490,21 @@ int main(int argc, char* argv[])
     fclose(pid_file);
   }
 
-  int door_fd = open(opt.door_dev_, O_RDWR);
+  int door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY);
   if(door_fd < 0) {
     log_printf(ERROR, "unable to open %s: %s", opt.door_dev_, strerror(errno));
     options_clear(&opt);
     log_close();
     exit(-1);
   }
+  ret = setup_tty(door_fd);
+  if(ret) {
+    close(door_fd);
+    options_clear(&opt);
+    log_close();
+    exit(-1);
+  }
+  
 
   int cmd_listen_fd = init_command_socket(opt.command_sock_);
   if(cmd_listen_fd < 0) {