fixed read / recv different return codes

[svn42.git] / door_daemon / door_daemon.c

diff --git a/door_daemon/door_daemon.c b/door_daemon/door_daemon.c
index ba63ff8..8690d64 100644 (file)
--- a/door_daemon/door_daemon.c
+++ b/door_daemon/door_daemon.c
@@ -133,8 +133,10 @@ int send_response(int fd, const char* response)
   return ret;
 }
 
-int handle_command(const char* cmd, int fd, cmd_t** cmd_q, client_t* client_lst)
+int process_cmd(const char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst)
 {
+  log_printf(DEBUG, "processing command from %d", fd);
+
   if(!cmd_q || !cmd)
     return -1;
   
@@ -164,7 +166,7 @@ int handle_command(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) 
@@ -195,77 +197,79 @@ int handle_command(const char* cmd, int fd, cmd_t** cmd_q, client_t* client_lst)
   return 0;
 }
 
-int process_cmd(int 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(DEBUG, "processing command from %d", fd);
-
-  static char buffer[100];
   int ret = 0;
-  do { // TODO: replace this whith a actually working non-blocking-readline
-    memset(buffer, 0, 100);
-    ret = recv(fd, buffer, sizeof(buffer), 0);
+  for(;;) {
+    ret = recv(fd, &buffer->buf[buffer->offset], 1, 0);
     if(!ret)
-      return 1;
-    if(ret < 0)
-      return ret;
+      return 2;
+    if(ret == -1 && errno == EAGAIN)
+      return 0;
+    else if(ret < 0)
+      break;
 
-    char* saveptr;
-    char* tok = strtok_r(buffer, "\n\r", &saveptr);
-    do {
-      if(!tok)
-        continue;
+    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;
+    }
 
-      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);
-    
-  return 0;
+    buffer->offset++;
+    if(buffer->offset >= sizeof(buffer->buf)) {
+      log_printf(DEBUG, "string too long (fd=%d)", fd);
+      buffer->offset = 0;
+      return 0;
+    }
+  }
+
+  return ret;
 }
 
-int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
+int process_door(read_buffer_t* buffer, 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 { // 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;
+  for(;;) {
+    ret = read(door_fd, &buffer->buf[buffer->offset], 1);
+    if(ret == -1 && errno == EAGAIN)
+      return 0;
+    else if(ret <= 0)
+      break;
 
-    char* saveptr;
-    char* tok = strtok_r(buffer, "\n\r", &saveptr);
-    do {
-      if(!tok)
-        continue;
+    if(buffer->buf[buffer->offset] == '\n') {
+      buffer->buf[buffer->offset] = 0;
 
-      log_printf(NOTICE, "door-firmware: %s", tok);
+      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, tok);
+        send_response(cmd_fd, buffer->buf);
       }
-
-      if(!strncmp(tok, "Status:", 7)) {
+      
+      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, tok);
+            send_response(client->fd, buffer->buf);
       }
-
+      
       cmd_pop(cmd_q);
-    } while(tok = strtok_r(NULL, "\n\r", &saveptr));
-  } while (ret == -1 && errno == EINTR);
+      buffer->offset = 0;
+      return 0;
+    }
 
-  return 0;
-}
+    buffer->offset++;
+    if(buffer->offset >= sizeof(buffer->buf)) {
+      log_printf(DEBUG, "string too long (fd=%d)", door_fd);
+      buffer->offset = 0;
+      return 0;
+    }
+  }
 
+  return ret;
+}
 
 int main_loop(int door_fd, int cmd_listen_fd)
 {
@@ -279,6 +283,9 @@ int main_loop(int door_fd, int cmd_listen_fd)
   cmd_t* cmd_q = NULL;
   client_t* client_lst = NULL;
 
+  read_buffer_t door_buffer;
+  door_buffer.offset = 0;
+
   int sig_fd = signal_init();
   if(sig_fd < 0)
     return -1;
@@ -298,13 +305,15 @@ int main_loop(int door_fd, int cmd_listen_fd)
     if(!ret || ret == -1)
       continue;
 
-    if(signal_handle()) {
-      return_value = 1;
-      break;
+    if(FD_ISSET(sig_fd, &tmpfds)) {
+      if(signal_handle()) {
+        return_value = 1;
+        break;
+      }
     }
-
+   
     if(FD_ISSET(door_fd, &tmpfds)) {
-      return_value = process_door(door_fd, &cmd_q, client_lst);
+      return_value = process_door(&door_buffer, door_fd, &cmd_q, client_lst);
       if(return_value)
         break;
     }
@@ -319,14 +328,15 @@ 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;
+      fcntl(new_fd, F_SETFL, O_NONBLOCK);
       client_add(&client_lst, new_fd);
     }
 
     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) {
+        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;
           lst = lst->next;
@@ -503,7 +513,7 @@ int main(int argc, char* argv[])
   
   int door_fd = 0;
   for(;;) {
-    door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY);
+    door_fd = open(opt.door_dev_, O_RDWR | O_NOCTTY | O_NONBLOCK);
     if(door_fd < 0)
       ret = 2;
     else {