X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=c917f3b93713491f16c48fb06e96fd69ec13c491;hb=45239ca054a5e5a18c159f5cd19806061104dc5b;hp=0f64580a8afaca56bff44b8b695719a61a88510e;hpb=1cc0638df41d04b4128f9dd24fdcb81ac537365c;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index 0f64580..c917f3b 100644
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -32,6 +32,7 @@
 #include "options.h"
 
 #include "command_queue.h"
+#include "client_list.h"
 
 #include "daemon.h"
 #include "sysexec.h"
@@ -84,8 +85,7 @@ int send_command(int door_fd, cmd_t* cmd)
   int ret;
   do {
     ret = write(door_fd, &c, 1);
-  }
-  while(!ret);
+  } while(!ret || (ret == -1 && errno == EINTR));
 
   if(ret > 0) {
     cmd->sent = 1;
@@ -95,7 +95,38 @@ int send_command(int door_fd, cmd_t* cmd)
   return ret;
 }
 
-int handle_command(const char* cmd, int fd, cmd_t** cmd_q)
+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;
+  }
+  do {
+    ret = write(fd, "\n", 1);
+  } while(!ret || (ret == -1 && errno == EINTR));
+
+  if(ret > 0)
+    return 0;
+
+  return ret;
+}
+
+int handle_command(const char* cmd, int fd, cmd_t** cmd_q, client_t* client_lst)
 {
   if(!cmd_q || !cmd)
     return -1;
@@ -113,6 +144,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;
@@ -146,11 +188,13 @@ 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)
@@ -158,29 +202,38 @@ int process_cmd(int fd, cmd_t **cmd_q)
     char* saveptr;
     char* tok = strtok_r(buffer, "\n\r", &saveptr);
     do {
-      ret = handle_command(tok, fd, cmd_q);
+      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 {
+  do { // TODO: replace this whith a actually working readline
     memset(buffer, 0, 100);
     ret = read(door_fd, buffer, sizeof(buffer));
     if(!ret) 
       return 2;
-  } while (ret == -1 && errno == EINTR);
+    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;
 
-  log_printf(INFO, "processing data from door (fd=%d)", door_fd);
+      cmd_pop(cmd_q);
+    } while(tok = strtok_r(NULL, "\n\r", &saveptr));
+  } while (ret == -1 && errno == EINTR);
 
   return 0;
 }
@@ -196,8 +249,14 @@ 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)
+    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));
@@ -208,20 +267,18 @@ int main_loop(int door_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(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)) {
@@ -234,29 +291,36 @@ 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;
 
-        if(cmd_q && !cmd_q->sent)
-          send_command(door_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;
 }