From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 15 Jan 2013 07:25:09 +0000 (+0100)
Subject: userplex: Use nonblocking forwarding behavior as in {dir,user}plex.
X-Git-Tag: 0.12~6^2
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=92db680bd8875d87b47a8cafd53bb96ca8d2d71f

userplex: Use nonblocking forwarding behavior as in {dir,user}plex.
---

diff --git a/src/userplex.c b/src/userplex.c
index c50a15c..48a8ed3 100644
--- a/src/userplex.c
+++ b/src/userplex.c
@@ -158,19 +158,24 @@ static int forkchild(char *usrnm, struct hthead *forreq, int reqfd)
 
 static void serve2(struct user *usr, struct hthead *req, int fd)
 {
+    int serr;
+    
     if(usr->fd < 0)
 	usr->fd = forkchild(usr->name, req, fd);
-    if(sendreq(usr->fd, req, fd)) {
-	if((errno == EPIPE) || (errno == ECONNRESET)) {
+    if(sendreq2(usr->fd, req, fd, MSG_NOSIGNAL | MSG_DONTWAIT)) {
+	serr = errno;
+	if((serr == EPIPE) || (serr == ECONNRESET)) {
 	    /* Assume that the child has crashed and restart it. */
 	    close(usr->fd);
 	    usr->fd = forkchild(usr->name, req, fd);
-	    if(!sendreq(usr->fd, req, fd))
+	    if(!sendreq2(usr->fd, req, fd, MSG_NOSIGNAL | MSG_DONTWAIT))
 		return;
 	}
-	flog(LOG_ERR, "could not pass on request to user `%s': %s", usr->name, strerror(errno));
-	close(usr->fd);
-	usr->fd = -1;
+	flog(LOG_ERR, "could not pass on request to user `%s': %s", usr->name, strerror(serr));
+	if(serr != EAGAIN) {
+	    close(usr->fd);
+	    usr->fd = -1;
+	}
     }
 }