X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=ba63ff8dc4ac5bdd9b967e68012a8d3e3ef940eb;hb=790dd268950e4466e605788bcb7c632bcfac7a0b;hp=f8a3982fa4810d2418909152f2cf848d7e31b3ec;hpb=7612b7e04f96294ee6a91dd3c48cd2a9edcca87d;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index f8a3982..ba63ff8 100644
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -50,7 +50,11 @@ int init_command_socket(const char* path)
 
   struct sockaddr_un local;
   local.sun_family = AF_UNIX;
-  strcpy(local.sun_path, path); // TODO: strlen ???
+  if(sizeof(local.sun_path) <= strlen(path)) {
+    log_printf(ERROR, "socket path is to long (max %d)", sizeof(local.sun_path)-1);
+    return -1;
+  }
+  strcpy(local.sun_path, path);
   unlink(local.sun_path);
   int len = SUN_LEN(&local);
   int ret = bind(fd, (struct sockaddr*)&local, len);
@@ -197,14 +201,20 @@ int process_cmd(int fd, cmd_t **cmd_q, client_t* client_lst)
 
   static char buffer[100];
   int ret = 0;
-  do { // TODO: replace this whith a actually working readline
+  do { // TODO: replace this whith a actually working non-blocking-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 {
+      if(!tok)
+        continue;
+
       ret = handle_command(tok, fd, cmd_q, client_lst);
       if(ret < 0)
         return ret;
@@ -220,23 +230,32 @@ int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
 
   static char buffer[100];
   int ret = 0;
-  do { // TODO: replace this whith a actually working readline
+  do { // TODO: replace this whith a actually working non-blocking-readline
     memset(buffer, 0, 100);
     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;
+      if(!tok)
+        continue;
 
-      send_response((*cmd_q)->fd, tok);
+      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_q)->fd)
+          if(client->status_listener && client->fd != cmd_fd)
             send_response(client->fd, tok);
       }
 
@@ -250,7 +269,7 @@ int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
 
 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);
@@ -355,12 +374,36 @@ int setup_tty(int fd)
     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;
 }
 
@@ -451,41 +494,44 @@ int main(int argc, char* argv[])
     fclose(pid_file);
   }
 
-  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) {
-    close(door_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(door_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(door_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.door_dev_);
   else
     log_printf(NOTICE, "shutdown after signal");