Don't reset My_Connections[Idx].lastping when reading data

[ngircd-alex.git] / src / ngircd / proc.c

diff --git a/src/ngircd/proc.c b/src/ngircd/proc.c
index 75c1aaf1a0ba6dbfbb2f7abdfd8c91e01c76c8cf..dbcff6f1aa5cfe0edf16ac4b90aace58a681698f 100644 (file)
--- a/src/ngircd/proc.c
+++ b/src/ngircd/proc.c
@@ -23,6 +23,7 @@
 
 #include "log.h"
 #include "io.h"
+#include "conn.h"
 
 #include "exp.h"
 #include "proc.h"
@@ -42,7 +43,7 @@ Proc_InitStruct (PROC_STAT *proc)
  * Fork a child process.
  */
 GLOBAL pid_t
-Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short))
+Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short), int timeout)
 {
        pid_t pid;
 
@@ -66,7 +67,11 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short))
                return -1;
        case 0:
                /* New child process: */
+               signal(SIGTERM, Proc_GenericSignalHandler);
+               signal(SIGALRM, Proc_GenericSignalHandler);
                close(pipefds[0]);
+               alarm(timeout);
+               Conn_CloseAllSockets();
                return 0;
        }
 
@@ -86,20 +91,6 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc)(int, short))
        return pid;
 }
 
-/**
- * Kill forked child process.
- */
-GLOBAL void
-Proc_Kill(PROC_STAT *proc)
-{
-       assert(proc != NULL);
-       assert(proc->pipe_fd >= 0);
-
-       io_close(proc->pipe_fd);
-       kill(proc->pid, SIGTERM);
-       Proc_InitStruct(proc);
-}
-
 /**
  * Generic signal handler for forked child processes.
  */
@@ -112,7 +103,41 @@ Proc_GenericSignalHandler(int Signal)
                Log_Subprocess(LOG_DEBUG, "Child got TERM signal, exiting.");
 #endif
                exit(1);
+       case SIGALRM:
+#ifdef DEBUG
+               Log_Subprocess(LOG_DEBUG, "Child got ALARM signal, exiting.");
+#endif
+               exit(1);
+       }
+}
+
+/**
+ * Read bytes from a pipe of a forked child process.
+ * In addition, this function makes sure that the child process is ignored
+ * after all data has been read or a fatal error occurred.
+ */
+GLOBAL size_t
+Proc_Read(PROC_STAT *proc, void *buffer, size_t buflen)
+{
+       ssize_t bytes_read = 0;
+
+       assert(buffer != NULL);
+       assert(buflen > 0);
+
+       bytes_read = read(proc->pipe_fd, buffer, buflen);
+       if (bytes_read < 0) {
+               if (errno == EAGAIN)
+                       return 0;
+               Log(LOG_CRIT, "Can't read from child process %ld: %s",
+                   proc->pid, strerror(errno));
+               bytes_read = 0;
        }
+#if DEBUG
+       else if (bytes_read == 0)
+               LogDebug("Can't read from child process %ld: EOF", proc->pid);
+#endif
+       Proc_InitStruct(proc);
+       return (size_t)bytes_read;
 }
 
 /* -eof- */