X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=blobdiff_plain;f=daemon%2Fnet.c;h=751c4930e0774177f44a5caa9bdc8cc837f5f07a;hp=3265417da1bdd470d5283b8dd9e8f0fb1b2f186b;hb=d334fbb51d75e00d16d8aa19693022ff96d1231c;hpb=02a705adbd87e20f15a1a2e43cf9f9ed53a19f72

diff --git a/daemon/net.c b/daemon/net.c
index 3265417..751c493 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;
@@ -247,7 +249,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 +264,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 +298,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;
@@ -362,13 +367,16 @@ static void freesock(struct socket *sk)
 
 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);
     }
 }
 
@@ -407,6 +415,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);
 }
 
@@ -514,15 +524,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 +635,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 +696,7 @@ static void sockrecv(struct ufd *ufd)
 	{
 	    free(buf);
 	    closeufd(ufd);
-	    sockeos(ufd->sk);
+	    closesock(ufd->sk);
 	    return;
 	}
 	sockqueue(ufd->sk, buf, ret);
@@ -733,20 +735,10 @@ static void sockflush(struct ufd *ufd)
 
 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));
-	}
-    }
-*/
     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)
@@ -792,6 +784,19 @@ static int rebindunix(struct ufd *ufd, struct sockaddr *name, socklen_t namelen)
     return(0);
 }
 
+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);
+}
+
 /*
  * The difference between netcslisten() and netcslistenlocal() is that
  * netcslistenlocal() always listens on the local host, instead of
@@ -820,8 +825,10 @@ struct lport *netcslistenlocal(int type, struct sockaddr *name, socklen_t namele
 	setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &intbuf, sizeof(intbuf));
     }
     ufd = mkufd(fd, UFD_LISTEN, NULL);
-    ufd->d.l.lp = lp;
     ufd->d.l.family = name->sa_family;
+    lp = memset(smalloc(sizeof(*lp)), 0, sizeof(*lp));
+    lp->ufd = ufd;
+    ufd->d.l.lp = lp;
     if((bind(fd, name, namelen) < 0) && ((errno != EADDRINUSE) || (rebindunix(ufd, name, namelen) < 0))) {
 	freeufd(ufd);
 	return(NULL);
@@ -905,7 +912,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);
@@ -960,19 +967,68 @@ static void acceptunix(struct ufd *ufd)
 #endif
 }
 
+static void runbatches(void)
+{
+    struct scons *sc, *nsc;
+
+    for(sc = cbatch, cbatch = NULL; sc; sc = nsc) {
+	nsc = sc->n;
+	if(sc->s->conncb != NULL)
+	    sc->s->conncb(sc->s, 0, sc->s->data);
+	free(sc);
+    }
+    for(sc = rbatch, rbatch = NULL; sc; sc = nsc) {
+	nsc = sc->n;
+	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;
+	}
+	free(sc);
+    }
+    for(sc = wbatch, wbatch = NULL; sc; sc = nsc) {
+	nsc = sc->n;
+	if(sc->s->writecb != NULL)
+	    sc->s->writecb(sc->s, sc->s->data);
+	free(sc);
+    }
+}
+
+static void cleansocks(void)
+{
+    struct ufd *ufd, *next;
+    
+    for(ufd = ufds; ufd != NULL; ufd = next) {
+	next = ufd->next;
+	if(ufd->sk && (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;
-    struct scons *sc, *nsc;
     
+    cleansocks();
     FD_ZERO(&rfds);
     FD_ZERO(&wfds);
     FD_ZERO(&efds);
@@ -991,6 +1047,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);
@@ -1003,8 +1061,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) {
@@ -1023,7 +1080,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)) {
@@ -1057,35 +1114,42 @@ int pollsocks(int timeout)
 		}
 		if(FD_ISSET(ufd->fd, &rfds))
 		    sockrecv(ufd);
+		if(ufd->fd == -1)
+		    continue;
 		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;
-	    }
-	}
-    }
+    runbatches();
+    cleansocks();
     return(1);
 }
 
+static struct ufd *getskufd(struct socket *sk)
+{
+    while(1) {
+	if(sk->back->ufd != NULL)
+	    return(sk->back->ufd);
+	if((sk = sk->back->pnext) == NULL)
+	    break;
+    }
+    return(NULL);
+}
+
 int socksettos(struct socket *sk, int tos)
 {
     int buf;
+    struct ufd *ufd;
     
-    if(sk->family == AF_UNIX)
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd->d.s.family == AF_UNIX)
 	return(0); /* Unix sockets are always perfect. :) */
-    if(sk->family == AF_INET)
+    if(ufd->d.s.family == AF_INET)
     {
 	switch(tos)
 	{
@@ -1108,14 +1172,14 @@ int socksettos(struct socket *sk, int tos)
 	    flog(LOG_WARNING, "attempted to set unknown TOS value %i to IPv4 sock", tos);
 	    return(-1);
 	}
-	if(setsockopt(sk->fd, IPPROTO_IP, IP_TOS, &buf, sizeof(buf)) < 0)
+	if(setsockopt(ufd->fd, IPPROTO_IP, IP_TOS, &buf, sizeof(buf)) < 0)
 	{
 	    flog(LOG_WARNING, "could not set sock TOS to %i: %s", tos, strerror(errno));
 	    return(-1);
 	}
 	return(0);
     }
-    if(sk->family == AF_INET6)
+    if(ufd->d.s.family == AF_INET6)
     {
 	switch(tos)
 	{
@@ -1149,7 +1213,7 @@ int socksettos(struct socket *sk, int tos)
 	*/
 	return(0);
     }
-    flog(LOG_WARNING, "could not set TOS on sock of family %i", sk->family);
+    flog(LOG_WARNING, "could not set TOS on sock of family %i", ufd->d.s.family);
     return(1);
 }
 
@@ -1250,16 +1314,16 @@ int netresolve(char *addr, void (*callback)(struct sockaddr *addr, int addrlen,
     return(0);
 }
 
-int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+static int getlocalname(int fd, struct sockaddr **namebuf, socklen_t *lenbuf)
 {
     socklen_t len;
     struct sockaddr_storage name;
     
     *namebuf = NULL;
-    if((sk->state == SOCK_STL) || (sk->fd < 0))
+    if(fd < 0)
 	return(-1);
     len = sizeof(name);
-    if(getsockname(sk->fd, (struct sockaddr *)&name, &len) < 0)
+    if(getsockname(fd, (struct sockaddr *)&name, &len) < 0)
     {
 	flog(LOG_ERR, "BUG: alive socket with dead fd in sockgetlocalname (%s)", strerror(errno));
 	return(-1);
@@ -1270,6 +1334,26 @@ int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *le
     return(0);
 }
 
+int lstgetlocalname(struct lport *lp, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct ufd *ufd;
+
+    ufd = lp->ufd;
+    return(getlocalname(ufd->fd, namebuf, lenbuf));
+}
+
+int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct ufd *ufd;
+
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    return(getlocalname(ufd->fd, namebuf, lenbuf));
+}
+
 static void sethostaddr(struct sockaddr *dst, struct sockaddr *src)
 {
     if(dst->sa_family != src->sa_family)
@@ -1309,22 +1393,15 @@ static int makepublic(struct sockaddr *addr)
     return(0);
 }
 
-int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+static int getremotename(int fd, struct sockaddr **namebuf, socklen_t *lenbuf)
 {
     socklen_t len;
     struct sockaddr *name;
-    
-    switch(confgetint("net", "mode"))
-    {
+
+    switch(confgetint("net", "mode")) {
     case 0:
 	*namebuf = NULL;
-	if((sk->state == SOCK_STL) || (sk->fd < 0))
-	{
-	    errno = EBADF;
-	    return(-1);
-	}
-	if(!sockgetlocalname(sk, &name, &len))
-	{
+	if(!getlocalname(fd, &name, &len)) {
 	    *namebuf = name;
 	    *lenbuf = len;
 	    makepublic(name);
@@ -1342,19 +1419,80 @@ int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *l
     }
 }
 
+int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct ufd *ufd;
+    
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd->fd < 0) {
+	errno = EBADF;
+	return(-1);
+    }
+    return(getremotename(ufd->fd, namebuf, lenbuf));
+}
+
+int lstgetremotename(struct lport *lp, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct ufd *ufd;
+    
+    ufd = lp->ufd;
+    return(getremotename(ufd->fd, namebuf, lenbuf));
+}
+
 int sockgetremotename2(struct socket *sk, struct socket *sk2, struct sockaddr **namebuf, socklen_t *lenbuf)
 {
     struct sockaddr *name1, *name2;
     socklen_t len1, len2;
+    struct ufd *ufd1, *ufd2;
+    
+    ufd1 = getskufd(sk);
+    ufd2 = getskufd(sk2);
+    if((ufd1->type != UFD_SOCK) || (ufd2->type != UFD_SOCK)) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd1->d.s.family != ufd2->d.s.family)
+    {
+	flog(LOG_ERR, "using sockgetremotename2 with sockets of differing family: %i %i", ufd1->d.s.family, ufd2->d.s.family);
+	return(-1);
+    }
+    if(getremotename(ufd1->fd, &name1, &len1))
+	return(-1);
+    if(getremotename(ufd2->fd, &name2, &len2)) {
+	free(name1);
+	return(-1);
+    }
+    sethostaddr(name1, name2);
+    free(name2);
+    *namebuf = name1;
+    *lenbuf = len1;
+    return(0);
+}
+
+int lstgetremotename2(struct lport *lp, struct socket *sk2, struct sockaddr **namebuf, socklen_t *lenbuf)
+{
+    struct sockaddr *name1, *name2;
+    socklen_t len1, len2;
+    struct ufd *ufd1, *ufd2;
     
-    if(sk->family != sk2->family)
+    ufd1 = lp->ufd;
+    ufd2 = getskufd(sk2);
+    if(ufd2->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd1->d.l.family != ufd2->d.s.family)
     {
-	flog(LOG_ERR, "using sockgetremotename2 with sockets of differing family: %i %i", sk->family, sk2->family);
+	flog(LOG_ERR, "using lstgetremotename2 with sockets of differing family: %i %i", ufd1->d.l.family, ufd2->d.s.family);
 	return(-1);
     }
-    if(sockgetremotename(sk, &name1, &len1))
+    if(getremotename(ufd1->fd, &name1, &len1))
 	return(-1);
-    if(sockgetremotename(sk2, &name2, &len2)) {
+    if(getremotename(ufd2->fd, &name2, &len2)) {
 	free(name1);
 	return(-1);
     }
@@ -1365,14 +1503,59 @@ int sockgetremotename2(struct socket *sk, struct socket *sk2, struct sockaddr **
     return(0);
 }
 
+int getucred(struct socket *sk, uid_t *uid, gid_t *gid)
+{
+    struct ufd *ufd;
+    
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd->d.s.family != AF_UNIX) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    *uid = ufd->d.s.ucred.uid;
+    *gid = ufd->d.s.ucred.gid;
+    return(0);
+}
+
 void sockblock(struct socket *sk, int block)
 {
-    sk->block = block;
+    struct ufd *ufd;
+    
+    ufd = getskufd(sk);
+    ufd->ignread = block;
+}
+
+int sockfamily(struct socket *sk)
+{
+    struct ufd *ufd;
+    
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    return(ufd->d.s.family);
 }
 
 int sockpeeraddr(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf)
 {
-    return(-1);
+    struct ufd *ufd;
+    
+    ufd = getskufd(sk);
+    if(ufd->type != UFD_SOCK) {
+	errno = EOPNOTSUPP;
+	return(-1);
+    }
+    if(ufd->d.s.remote == NULL)
+	return(-1);
+    *namebuf = memcpy(smalloc(ufd->d.s.remotelen), ufd->d.s.remote, ufd->d.s.remotelen);
+    if(lenbuf != NULL)
+	*lenbuf = ufd->d.s.remotelen;
+    return(0);
 }
 
 char *formatsockpeer(struct socket *sk)
@@ -1528,8 +1711,10 @@ static int init(int hup)
 
 static void terminate(void)
 {
-    while(sockets != NULL)
-	unlinksock(sockets);
+    /*
+    while(ufds != NULL)
+	freeufd(ufds);
+    */
 }
 
 static struct module me =