X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=e9c02a18e1eb530693c309d1e14297c81d3d9563;hb=607de0502e7028837b76b85e127d83bcb52d6b4e;hp=22068a0cdbd26a19511ad7eb364e64a74dc41f18;hpb=c0f02109c659f75d7fd326983fa7eaa03b74de5c;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index 22068a0..e9c02a1 100644
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -95,7 +95,7 @@ int send_command(int door_fd, cmd_t* cmd)
   } while(!ret || (ret == -1 && errno == EINTR));
 
   if(ret > 0) {
-    cmd->sent = 1;
+    cmd_sent(cmd);
     return 0;
   }
 
@@ -166,7 +166,7 @@ int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
   }
   else {
     log_printf(WARNING, "unknown command '%s'", cmd);
-    return 1;
+    return 0;
   }
   char* param = strchr(cmd, ' ');
   if(param) 
@@ -197,50 +197,88 @@ int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
   return 0;
 }
 
-int process_door(const char* str, int door_fd, cmd_t **cmd_q, client_t* client_lst)
+int nonblock_recvline(read_buffer_t* buffer, int fd, cmd_t** cmd_q, client_t* client_lst)
 {
-  log_printf(NOTICE, "door-firmware: %s", str);
+  int ret = 0;
+  for(;;) {
+    ret = recv(fd, &buffer->buf[buffer->offset], 1, 0);
+    if(!ret)
+      return 2;
+    if(ret == -1 && errno == EAGAIN)
+      return 0;
+    else if(ret < 0)
+      break;
 
-  int cmd_fd = -1;
-  if(cmd_q && (*cmd_q)) {
-    cmd_fd = (*cmd_q)->fd;
-    send_response(cmd_fd, str);
-  }
-  
-  if(!strncmp(str, "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, str);
+    if(buffer->buf[buffer->offset] == '\n') {
+      buffer->buf[buffer->offset] = 0;
+      ret = process_cmd(buffer->buf, fd, cmd_q, client_lst);
+      buffer->offset = 0;
+      break;
+    }
+
+    buffer->offset++;
+    if(buffer->offset >= sizeof(buffer->buf)) {
+      log_printf(DEBUG, "string too long (fd=%d)", fd);
+      buffer->offset = 0;
+      return 0;
+    }
   }
-  
-  cmd_pop(cmd_q);
 
-  return 0;
+  return ret;
 }
 
-int nonblock_readline(read_buffer_t buffer, int fd, cmd_t** cmd_q, client_t* client_lst, int (*cb)(const char*, int, cmd_t**, client_t*))
+int process_door(read_buffer_t* buffer, int door_fd, cmd_t **cmd_q, client_t* client_lst)
 {
   int ret = 0;
-  u_int32_t offset = 0;
+  struct timeval tv;
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(door_fd, &fds);
+
   for(;;) {
-    ret = read(fd, &buffer[offset], 1);
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;
+    ret = select(door_fd+1, &fds, NULL, NULL, &tv);
+    if(!ret)
+      return 0;
+    else if(ret < 0)
+      return ret;
+
+    ret = read(door_fd, &buffer->buf[buffer->offset], 1);
     if(!ret)
       return 2;
-    else if(ret == -1 && errno == EAGAIN)
+    if(ret == -1 && errno == EAGAIN)
       return 0;
-    else
+    else if(ret < 0)
       break;
 
-    if(buffer[offset] == '\n') {
-      buffer[offset] = 0;
-      ret = (cb)(buffer, fd, cmd_q, client_lst);
-      break;
+    if(buffer->buf[buffer->offset] == '\n') {
+      buffer->buf[buffer->offset] = 0;
+
+      log_printf(NOTICE, "door-firmware: %s", buffer->buf);      
+
+      int cmd_fd = -1;
+      if(cmd_q && (*cmd_q)) {
+        cmd_fd = (*cmd_q)->fd;
+        send_response(cmd_fd, buffer->buf);
+      }
+      
+      if(!strncmp(buffer->buf, "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, buffer->buf);
+      }
+      
+      cmd_pop(cmd_q);
+      buffer->offset = 0;
+      return 0;
     }
 
-    offset++;
-    if(offset >= sizeof(buffer)) {
-      log_printf(DEBUG, "string too long (fd=%d)", fd);      
+    buffer->offset++;
+    if(buffer->offset >= sizeof(buffer->buf)) {
+      log_printf(DEBUG, "string too long (fd=%d)", door_fd);
+      buffer->offset = 0;
       return 0;
     }
   }
@@ -261,6 +299,7 @@ int main_loop(int door_fd, int cmd_listen_fd)
   client_t* client_lst = NULL;
 
   read_buffer_t door_buffer;
+  door_buffer.offset = 0;
 
   int sig_fd = signal_init();
   if(sig_fd < 0)
@@ -268,26 +307,39 @@ int main_loop(int door_fd, int cmd_listen_fd)
   FD_SET(sig_fd, &readfds);
   max_fd = (max_fd < sig_fd) ? sig_fd : max_fd;
 
+  struct timeval timeout;
   int return_value = 0;
   while(!return_value) {
     memcpy(&tmpfds, &readfds, sizeof(tmpfds));
 
-    int ret = select(max_fd+1, &tmpfds, NULL, NULL, NULL);
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 200000;
+    int ret = select(max_fd+1, &tmpfds, NULL, NULL, &timeout);
     if(ret == -1 && errno != EINTR) {
       log_printf(ERROR, "select returned with error: %s", strerror(errno));
       return_value = -1;
       break;
     }
-    if(!ret || ret == -1)
+    if(ret == -1)
       continue;
-
-    if(signal_handle()) {
-      return_value = 1;
-      break;
+    if(!ret) {
+      if(cmd_q && cmd_has_expired(*cmd_q)) {
+        log_printf(ERROR, "last command expired");
+        cmd_pop(&cmd_q);
+      }
+      else
+        continue;
     }
 
+    if(FD_ISSET(sig_fd, &tmpfds)) {
+      if(signal_handle()) {
+        return_value = 1;
+        break;
+      }
+    }
+   
     if(FD_ISSET(door_fd, &tmpfds)) {
-      return_value = nonblock_readline(door_buffer, door_fd, &cmd_q, client_lst, process_door);
+      return_value = process_door(&door_buffer, door_fd, &cmd_q, client_lst);
       if(return_value)
         break;
     }
@@ -309,7 +361,7 @@ int main_loop(int door_fd, int cmd_listen_fd)
     client_t* lst = client_lst;
     while(lst) {
       if(FD_ISSET(lst->fd, &tmpfds)) {
-        return_value = nonblock_readline(lst->buffer, lst->fd, &cmd_q, client_lst, process_cmd);
+        return_value = nonblock_recvline(&(lst->buffer), lst->fd, &cmd_q, client_lst);
         if(return_value == 2) {
           log_printf(DEBUG, "removing closed command connection (fd=%d)", lst->fd);
           client_t* deletee = lst;
@@ -487,7 +539,7 @@ int main(int argc, char* argv[])
   
   int door_fd = 0;
   for(;;) {
-    door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY | O_NONBLOCK);
+    door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY);
     if(door_fd < 0)
       ret = 2;
     else {