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

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index d9af77a..cf12668 100644
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -66,7 +66,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 +83,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;
@@ -148,7 +180,7 @@ int process_cmd(int fd, cmd_t **cmd_q)
 {
   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)
@@ -167,35 +199,51 @@ int process_cmd(int fd, cmd_t **cmd_q)
   return 0;
 }
 
-int process_ttyusb(int ttyusb_fd, cmd_t **cmd_q)
+int process_door(int door_fd, cmd_t **cmd_q)
 {
   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;
+    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;
+
+      cmd_pop(cmd_q);
+    } while(tok = strtok_r(NULL, "\n\r", &saveptr));
   } while (ret == -1 && errno == EINTR);
 
-  log_printf(INFO, "processing data from ttyusb (fd=%d)", ttyusb_fd);
+  log_printf(DEBUG, "processing data from door (fd=%d)", door_fd);
 
   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");
 
   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;
 
-  signal_init();
+  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;
+
   int return_value = 0;
   while(!return_value) {
     memcpy(&tmpfds, &readfds, sizeof(tmpfds));
@@ -206,20 +254,21 @@ 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;
     }
+    FD_CLR(sig_fd, &tmpfds);
 
-    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);
       if(return_value)
         break;
 
-      FD_CLR(ttyusb_fd, &tmpfds);
+      FD_CLR(door_fd, &tmpfds);
     }
 
     if(FD_ISSET(cmd_listen_fd, &tmpfds)) {
@@ -247,14 +296,15 @@ int main_loop(int ttyusb_fd, int cmd_listen_fd)
         }
         if(return_value)
           break;
-
-        if(cmd_q && !cmd_q->sent)
-          send_command(ttyusb_fd, cmd_q);
       }
     }
+
+    if(cmd_q && !cmd_q->sent)
+      send_command(door_fd, cmd_q);
   }
 
   cmd_clear(&cmd_q);
+  signal_stop();
   return return_value;
 }
 
@@ -345,9 +395,9 @@ 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));
+  int door_fd = open(opt.door_dev_, O_RDWR);
+  if(door_fd < 0) {
+    log_printf(ERROR, "unable to open %s: %s", opt.door_dev_, strerror(errno));
     options_clear(&opt);
     log_close();
     exit(-1);
@@ -355,23 +405,23 @@ int main(int argc, char* argv[])
 
   int cmd_listen_fd = init_command_socket(opt.command_sock_);
   if(cmd_listen_fd < 0) {
-    close(ttyusb_fd);
+    close(door_fd);
     options_clear(&opt);
     log_close();
     exit(-1);
   }
 
-  ret = main_loop(ttyusb_fd, cmd_listen_fd);
+  ret = main_loop(door_fd, cmd_listen_fd);
 
   close(cmd_listen_fd);
-  close(ttyusb_fd);
+  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_);
+    log_printf(ERROR, "shutdown after %s read error", opt.door_dev_);
   else
     log_printf(NOTICE, "shutdown after signal");