X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=blobdiff_plain;f=daemon%2Fnet.c;h=6561ae975549f503aa5079c97c2e2c97e4b72caa;hp=594379117d39c2e2f0596753971ca9d611e3b30a;hb=fc8e5171b7fff757b68793bb280bb9b9728af85f;hpb=f96d0914e73385d5938650636b584c9be9d35ab4

diff --git a/daemon/net.c b/daemon/net.c
index 5943791..6561ae9 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -120,6 +120,8 @@ struct ufd {
     } d;
 };
 
+static int getlocalname(int fd, struct sockaddr **namebuf, socklen_t *lenbuf);
+
 static struct ufd *ufds = NULL;
 static struct scons *rbatch, *wbatch, *cbatch;
 int numsocks = 0;
@@ -209,6 +211,7 @@ static struct socket *newsock1(int dgram)
     new->refcount = 1;
     new->state = -1;
     new->dgram = dgram;
+    new->maxbuf = 65536;
     numsocks++;
     return(new);
 }
@@ -231,6 +234,15 @@ static void sksetstate(struct socket *sk, int state)
     sk->back->state = state;
 }
 
+struct socket *netsockpipe(void)
+{
+    struct socket *sk;
+    
+    sk = sockpair(0);
+    sksetstate(sk, SOCK_EST);
+    return(sk);
+}
+
 static void closeufd(struct ufd *ufd)
 {
     if(ufd->fd != -1)
@@ -247,7 +259,8 @@ static void freeufd(struct ufd *ufd)
     if(ufd == ufds)
 	ufds = ufd->next;
     closeufd(ufd);
-    putsock(ufd->sk);
+    if(ufd->sk != NULL)
+	putsock(ufd->sk);
     if(ufd->type == UFD_SOCK) {
 	if(ufd->d.s.remote != NULL)
 	    free(ufd->d.s.remote);
@@ -261,6 +274,7 @@ static struct ufd *mkufd(int fd, int type, struct socket *sk)
     
     ufd = memset(smalloc(sizeof(*ufd)), 0, sizeof(*ufd));
     ufd->fd = fd;
+    ufd->type = type;
     if(sk != NULL) {
 	getsock(ufd->sk = sk);
 	sk->ufd = ufd;
@@ -294,6 +308,7 @@ static struct ufd *dupufd(struct ufd *ufd)
 	freeufd(nufd);
 	return(NULL);
     }
+    sksetstate(nsk, SOCK_EST);
     if(ufd->type == UFD_SOCK) {
 	nufd->d.s.family = ufd->d.s.family;
 	nufd->d.s.type = ufd->d.s.type;
@@ -343,10 +358,41 @@ void getsock(struct socket *sk)
     sk->refcount++;
 }
 
+static void sockdebug(int level, struct socket *sk, char *format, ...)
+{
+    va_list args;
+    char *tb;
+    
+    if((sk->dbgnm == NULL) || (level > sk->dbglvl))
+	return;
+    va_start(args, format);
+    tb = vsprintf2(format, args);
+    va_end(args);
+    fprintf(stderr, "%s: %s\n", sk->dbgnm, tb);
+    free(tb);
+}
+
+void socksetdebug(struct socket *sk, int level, char *nm, ...)
+{
+    va_list args;
+    char *tb;
+    
+    va_start(args, nm);
+    tb = vsprintf2(nm, args);
+    va_end(args);
+    sk->dbgnm = sprintf2("%s (f)", tb);
+    sk->back->dbgnm = sprintf2("%s (b)", tb);
+    free(tb);
+    sk->dbglvl = level;
+    sk->back->dbglvl = level;
+    sockdebug(1, sk, "enabled debugging");
+}
+
 static void freesock(struct socket *sk)
 {
     struct dgrambuf *buf;
     
+    sockdebug(1, sk, "freeing socket");
     if(sk->dgram) {
 	while((buf = sk->buf.d.f) != NULL) {
 	    sk->buf.d.f = buf->next;
@@ -356,22 +402,35 @@ static void freesock(struct socket *sk)
 	if(sk->buf.s.buf != NULL)
 	    free(sk->buf.s.buf);
     }
+    if(sk->dbgnm != NULL)
+	free(sk->dbgnm);
     free(sk);
     numsocks--;
 }
 
 void putsock(struct socket *sk)
 {
+    struct socket *back;
+    
     if(--(sk->refcount) < 0) {
 	flog(LOG_CRIT, "BUG: socket refcount < 0");
 	abort();
     }
     if((sk->refcount == 0) && (sk->back->refcount == 0)) {
+	back = sk->back;
 	freesock(sk);
-	freesock(sk->back);
+	freesock(back);
     }
 }
 
+void quitsock(struct socket *sk)
+{
+    sk->readcb = NULL;
+    sk->writecb = NULL;
+    sk->errcb = NULL;
+    putsock(sk);
+}
+
 static void linksock(struct scons **list, struct socket *sk)
 {
     struct scons *sc;
@@ -407,6 +466,8 @@ void sockpushdata(struct socket *sk, void *buf, size_t size)
 /* Read as the preterite of `read' */
 void sockread(struct socket *sk)
 {
+    if((sockgetdatalen(sk) == 0) && (sk->eos == 1))
+	linksock(&rbatch, sk);
     linksock(&wbatch, sk->back);
 }
 
@@ -448,6 +509,7 @@ void *sockgetinbuf(struct socket *sk, size_t *size)
 	if((sk->buf.s.buf == NULL) || (sk->buf.s.datasize == 0))
 	{
 	    *size = 0;
+	    sockdebug(2, sk, "read 0 bytes", *size);
 	    return(NULL);
 	}
 	buf = sk->buf.s.buf;
@@ -456,6 +518,7 @@ void *sockgetinbuf(struct socket *sk, size_t *size)
 	sk->buf.s.bufsize = sk->buf.s.datasize = 0;
 	sockread(sk);
     }
+    sockdebug(2, sk, "read %zi bytes", *size);
     return(buf);
 }
 
@@ -465,6 +528,7 @@ void sockqueue(struct socket *sk, void *data, size_t size)
     struct sockaddr *remote;
     socklen_t remotelen;
     
+    sockdebug(2, sk, "queued %zi bytes", size);
     if(size == 0)
 	return;
     if(sk->state == SOCK_STL)
@@ -514,15 +578,7 @@ void sockqueuedg(struct socket *sk, struct dgrambuf *dg)
     linksock(&rbatch, sk->back);
 }
 
-void sockeos(struct socket *sk)
-{
-    sksetstate(sk, SOCK_STL);
-    if(sk->back->eos == 0)
-	sk->back->eos = 1;
-    linksock(&rbatch, sk->back);
-}
-
-static void sockerror(struct socket *sk, int en)
+void sockerror(struct socket *sk, int en)
 {
     sksetstate(sk, SOCK_STL);
     if(sk->back->errcb != NULL)
@@ -633,7 +689,7 @@ static void sockrecv(struct ufd *ufd)
 	    freedgbuf(dbuf);
 	    if((ufd->type != UFD_SOCK) || !((ufd->d.s.family == AF_INET) || (ufd->d.s.family == AF_INET6)))
 	    {
-		sockeos(ufd->sk);
+		closesock(ufd->sk);
 		closeufd(ufd);
 	    }
 	    return;
@@ -694,7 +750,7 @@ static void sockrecv(struct ufd *ufd)
 	{
 	    free(buf);
 	    closeufd(ufd);
-	    sockeos(ufd->sk);
+	    closesock(ufd->sk);
 	    return;
 	}
 	sockqueue(ufd->sk, buf, ret);
@@ -702,14 +758,16 @@ static void sockrecv(struct ufd *ufd)
     }
 }
 
-static void sockflush(struct ufd *ufd)
+static int sockflush(struct ufd *ufd)
 {
     int ret;
     struct dgrambuf *dbuf;
     int dgram;
     
-    if((dgram = ufddgram(ufd)) < 0)
-	return;
+    if((dgram = ufddgram(ufd)) < 0) {
+	errno = EBADFD;
+	return(-1);
+    }
     if(dgram) {
 	dbuf = sockgetdgbuf(ufd->sk);
 	sendto(ufd->fd, dbuf->data, dbuf->size, MSG_DONTWAIT | MSG_NOSIGNAL, dbuf->addr, dbuf->addrlen);
@@ -719,34 +777,23 @@ static void sockflush(struct ufd *ufd)
 	    ret = send(ufd->fd, ufd->sk->buf.s.buf, ufd->sk->buf.s.datasize, MSG_DONTWAIT | MSG_NOSIGNAL);
 	else
 	    ret = write(ufd->fd, ufd->sk->buf.s.buf, ufd->sk->buf.s.datasize);
-	if(ret < 0) {
-	    /* For now, assume transient error, since
-	     * the socket is polled for errors */
-	    return;
-	}
+	if(ret < 0)
+	    return(-1);
 	if(ret > 0) {
 	    memmove(ufd->sk->buf.s.buf, ((char *)ufd->sk->buf.s.buf) + ret, ufd->sk->buf.s.datasize -= ret);
 	    sockread(ufd->sk);
 	}
     }
+    return(0);
 }
 
 void closesock(struct socket *sk)
 {
-/*
-    struct sockaddr_un *un;
-    
-    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)(void *)&un, NULL) && (un->sun_family == PF_UNIX))
-    {
-	if((sk->state == SOCK_LST) && strchr(un->sun_path, '/'))
-	{
-	    if(unlink(un->sun_path))
-		flog(LOG_WARNING, "could not unlink Unix socket %s: %s", un->sun_path, strerror(errno));
-	}
-    }
-*/
+    sockdebug(1, sk, "closed");
     sksetstate(sk, SOCK_STL);
-    sockeos(sk);
+    if(sk->back->eos == 0)
+	sk->back->eos = 1;
+    linksock(&rbatch, sk->back);
 }
 
 size_t sockgetdatalen(struct socket *sk)
@@ -764,9 +811,26 @@ size_t sockgetdatalen(struct socket *sk)
     return(ret);
 }
 
-size_t sockqueuesize(struct socket *sk)
+/* size_t sockqueuesize(struct socket *sk) */
+/* { */
+/*     return(sockgetdatalen(sk->back)); */
+/* } */
+
+size_t socktqueuesize(struct socket *sk)
 {
-    return(sockgetdatalen(sk->back));
+    size_t ret;
+    
+    ret = 0;
+    while(1) {
+	ret += sockgetdatalen(sk->back);
+	if((sk = sk->back->pnext) == NULL)
+	    return(ret);
+    }
+}
+
+ssize_t sockqueueleft(struct socket *sk)
+{
+    return(sk->back->maxbuf - sockgetdatalen(sk->back));
 }
 
 /*
@@ -794,6 +858,14 @@ static int rebindunix(struct ufd *ufd, struct sockaddr *name, socklen_t namelen)
 
 void closelport(struct lport *lp)
 {
+    struct ufd *ufd;
+    struct sockaddr_un *un;
+    
+    ufd = lp->ufd;
+    if((ufd->d.l.family == AF_UNIX) && !getlocalname(ufd->fd, (struct sockaddr **)(void *)&un, NULL) && (un->sun_family == PF_UNIX) && strchr(un->sun_path, '/')) {
+	if(unlink(un->sun_path))
+	    flog(LOG_WARNING, "could not unlink Unix socket %s: %s", un->sun_path, strerror(errno));
+    }
     freeufd(lp->ufd);
 }
 
@@ -912,7 +984,7 @@ struct socket *netdgramconn(struct socket *sk, struct sockaddr *addr, socklen_t
     struct ufd *nufd;
     
     nufd = dupufd(sk->back->ufd);
-    sk = nufd->sk->back;
+    getsock(sk = nufd->sk->back);
     memcpy(nufd->d.s.remote = smalloc(addrlen), addr, nufd->d.s.remotelen = addrlen);
     nufd->ignread = 1;
     return(sk);
@@ -973,40 +1045,72 @@ static void runbatches(void)
 
     for(sc = cbatch, cbatch = NULL; sc; sc = nsc) {
 	nsc = sc->n;
-	sc->s->conncb(sc->s, 0, sc->s->data);
+	if(sc->s->conncb != NULL)
+	    sc->s->conncb(sc->s, 0, sc->s->data);
+	putsock(sc->s);
 	free(sc);
     }
     for(sc = rbatch, rbatch = NULL; sc; sc = nsc) {
 	nsc = sc->n;
-	sc->s->readcb(sc->s, sc->s->data);
+	if(sc->s->readcb != NULL)
+	    sc->s->readcb(sc->s, sc->s->data);
+	if((sockgetdatalen(sc->s) == 0) && (sc->s->eos == 1)) {
+	    if(sc->s->errcb != NULL)
+		sc->s->errcb(sc->s, 0, sc->s->data);
+	    sc->s->eos = 2;
+	}
+	putsock(sc->s);
 	free(sc);
     }
     for(sc = wbatch, wbatch = NULL; sc; sc = nsc) {
 	nsc = sc->n;
-	sc->s->writecb(sc->s, sc->s->data);
+	if(sc->s->writecb != NULL)
+	    sc->s->writecb(sc->s, sc->s->data);
+	putsock(sc->s);
 	free(sc);
     }
 }
 
+static void cleansocks(void)
+{
+    struct ufd *ufd, *next;
+    
+    for(ufd = ufds; ufd != NULL; ufd = next) {
+	next = ufd->next;
+	if(ufd->sk && ((ufd->fd < 0) || (sockgetdatalen(ufd->sk) == 0))) {
+	    if(ufd->sk->eos == 1) {
+		ufd->sk->eos = 2;
+		closeufd(ufd);
+		closesock(ufd->sk);
+	    }
+	    if((ufd->sk->refcount == 1) && (ufd->sk->back->refcount == 0)) {
+		freeufd(ufd);
+		continue;
+	    }
+	}
+    }
+}
+
 int pollsocks(int timeout)
 {
     int ret;
     socklen_t retlen;
     int newfd, maxfd;
     fd_set rfds, wfds, efds;
-    struct ufd *ufd, *nufd, *next;
+    struct ufd *ufd, *nufd;
     struct socket *nsk;
     struct sockaddr_storage ss;
     socklen_t sslen;
     struct timeval tv;
     
+    cleansocks();
     FD_ZERO(&rfds);
     FD_ZERO(&wfds);
     FD_ZERO(&efds);
     for(maxfd = 0, ufd = ufds; ufd != NULL; ufd = ufd->next) {
 	if(ufd->fd < 0)
 	    continue;
-	if(!ufd->ignread)
+	if(!ufd->ignread && ((ufd->sk == NULL) || (sockqueueleft(ufd->sk) > 0)))
 	    FD_SET(ufd->fd, &rfds);
 	if(ufd->sk != NULL) {
 	    if(sockgetdatalen(ufd->sk) > 0)
@@ -1018,6 +1122,8 @@ int pollsocks(int timeout)
 	if(ufd->fd > maxfd)
 	    maxfd = ufd->fd;
     }
+    if(rbatch || wbatch || cbatch)
+	timeout = 0;
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
     ret = select(maxfd + 1, &rfds, &wfds, &efds, (timeout < 0)?NULL:&tv);
@@ -1030,8 +1136,7 @@ int pollsocks(int timeout)
 	}
 	return(1);
     }
-    for(ufd = ufds; ufd != NULL; ufd = ufd->next)
-    {
+    for(ufd = ufds; ufd != NULL; ufd = ufd->next) {
 	if(ufd->sk < 0)
 	    continue;
 	if(ufd->type == UFD_LISTEN) {
@@ -1050,7 +1155,7 @@ int pollsocks(int timeout)
 		if(ss.ss_family == PF_UNIX)
 		    acceptunix(nufd);
 		if(ufd->d.l.lp->acceptcb != NULL)
-		    ufd->d.l.lp->acceptcb(ufd->d.l.lp, nsk, ufd->d.l.lp->data);
+		    ufd->d.l.lp->acceptcb(ufd->d.l.lp, nsk->back, ufd->d.l.lp->data);
 		putsock(nsk);
 	    }
 	    if(FD_ISSET(ufd->fd, &efds)) {
@@ -1084,25 +1189,20 @@ int pollsocks(int timeout)
 		}
 		if(FD_ISSET(ufd->fd, &rfds))
 		    sockrecv(ufd);
-		if(FD_ISSET(ufd->fd, &wfds))
-		    sockflush(ufd);
-	    }
-	}
-    }
-    for(ufd = ufds; ufd != NULL; ufd = next) {
-	next = ufd->next;
-	if(sockgetdatalen(ufd->sk) == 0) {
-	    if(ufd->sk->eos) {
-		closeufd(ufd);
-		closesock(ufd->sk);
-	    }
-	    if((ufd->sk->refcount == 1) && (ufd->sk->back->refcount == 0)) {
-		freeufd(ufd);
-		continue;
+		if(ufd->fd == -1)
+		    continue;
+		if(FD_ISSET(ufd->fd, &wfds)) {
+		    if(sockflush(ufd)) {
+			sockerror(ufd->sk, errno);
+			closeufd(ufd);
+			continue;
+		    }
+		}
 	    }
 	}
     }
     runbatches();
+    cleansocks();
     return(1);
 }
 
@@ -1465,9 +1565,9 @@ int lstgetremotename2(struct lport *lp, struct socket *sk2, struct sockaddr **na
 	errno = EOPNOTSUPP;
 	return(-1);
     }
-    if(ufd1->d.s.family != ufd2->d.s.family)
+    if(ufd1->d.l.family != ufd2->d.s.family)
     {
-	flog(LOG_ERR, "using lstgetremotename2 with sockets of differing family: %i %i", ufd1->d.s.family, ufd2->d.s.family);
+	flog(LOG_ERR, "using lstgetremotename2 with sockets of differing family: %i %i", ufd1->d.l.family, ufd2->d.s.family);
 	return(-1);
     }
     if(getremotename(ufd1->fd, &name1, &len1))
@@ -1501,13 +1601,13 @@ int getucred(struct socket *sk, uid_t *uid, gid_t *gid)
     return(0);
 }
 
-void sockblock(struct socket *sk, int block)
-{
-    struct ufd *ufd;
+/* void sockblock(struct socket *sk, int block) */
+/* { */
+/*     struct ufd *ufd; */
     
-    ufd = getskufd(sk);
-    ufd->ignread = block;
-}
+/*     ufd = getskufd(sk); */
+/*     ufd->ignread = block; */
+/* } */
 
 int sockfamily(struct socket *sk)
 {