X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon%2Fdoor_daemon.c;h=f7bb2f834e4f7d8eb44952c71393a689e7fe3e36;hb=273898a7a155895de69cde048b96f6ffb5f1fc47;hp=01bd6f3c15137e5818b9e1dcb3881c93f256fc1b;hpb=9903e31e3908087384637a11d3a297b878b4ba65;p=svn42.git

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index 01bd6f3..f7bb2f8 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;
   }
 
@@ -154,15 +154,7 @@ int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
   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;
+    cmd_id = LISTEN;
   }
   else {
     log_printf(WARNING, "unknown command '%s'", cmd);
@@ -172,6 +164,21 @@ int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
   if(param) 
     param++;
 
+  if(cmd_id == OPEN || cmd_id == CLOSE || cmd_id == TOGGLE) {
+    char* resp;
+    asprintf(&resp, "Request: %s", cmd);
+    if(resp) {
+      char* linefeed = strchr(resp, '\n');
+      if(linefeed) linefeed[0] = 0;
+      client_t* client;
+      for(client = client_lst; client; client = client->next)
+        if(client->request_listener && client->fd != fd)
+          send_response(client->fd, resp);
+      free(resp);
+    }
+// else silently ignore memory alloc error
+  }
+
   switch(cmd_id) {
   case OPEN:
   case CLOSE:
@@ -192,6 +199,33 @@ int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
       log_printf(DEBUG, "ignoring empty ext log message");
     break;
   }
+  case LISTEN: {
+    client_t* listener = client_find(client_lst, fd);
+    if(listener) {
+      if(!param) {
+        listener->status_listener = 1;
+        listener->error_listener = 1;      
+        listener->request_listener = 1;
+      }
+      else {
+        if(!strncmp(param, "status", 6))
+          listener->status_listener = 1;
+        else if(!strncmp(param, "error", 5))
+          listener->error_listener = 1;      
+        else if(!strncmp(param, "request", 7))
+          listener->request_listener = 1;
+        else {
+          log_printf(DEBUG, "unkown listener type '%s'", param);
+          break;
+        }
+      }
+      log_printf(DEBUG, "listener %d requests %s messages", fd, param ? param:"all");
+    }
+    else {
+      log_printf(ERROR, "unable to add listener %d", fd);
+    }
+    break;
+  }
   }
   
   return 0;
@@ -241,6 +275,8 @@ int process_door(read_buffer_t* buffer, int door_fd, cmd_t **cmd_q, client_t* cl
     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)
@@ -267,6 +303,13 @@ int process_door(read_buffer_t* buffer, int door_fd, cmd_t **cmd_q, client_t* cl
           if(client->status_listener && client->fd != cmd_fd)
             send_response(client->fd, buffer->buf);
       }
+
+      if(!strncmp(buffer->buf, "Error:", 6)) {
+        client_t* client;
+        for(client = client_lst; client; client = client->next)
+          if(client->error_listener && client->fd != cmd_fd)
+            send_response(client->fd, buffer->buf);
+      }
       
       cmd_pop(cmd_q);
       buffer->offset = 0;
@@ -305,18 +348,29 @@ 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(!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()) {