X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=212310a3b3c4473e3e3fed50d4e874099dd37336;hb=c7ff7e937c3ccc7713013d423517484df5d259f2;hp=0fc9e45f02b53349ee6ccc43299f32999af92ebb;hpb=f2c559da411213b4366ee179ba6cd7e853982f9e;p=doldaconnect.git

diff --git a/daemon/net.c b/daemon/net.c
index 0fc9e45..212310a 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -1,6 +1,6 @@
 /*
  *  Dolda Connect - Modular multiuser Direct Connect-style client
- *  Copyright (C) 2004 Fredrik Tolf (fredrik@dolda2000.com)
+ *  Copyright (C) 2004 Fredrik Tolf <fredrik@dolda2000.com>
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/poll.h>
+#include <sys/select.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -172,6 +172,7 @@ static struct socket *newsock(int type)
     struct socket *new;
     
     new = smalloc(sizeof(*new));
+    memset(new, 0, sizeof(*new));
     new->refcount = 2;
     new->fd = -1;
     new->isrealsocket = 1;
@@ -183,7 +184,8 @@ static struct socket *newsock(int type)
     new->close = 0;
     new->remote = NULL;
     new->remotelen = 0;
-    memset(&new->ucred, 0, sizeof(new->ucred));
+    new->ucred.uid = -1;
+    new->ucred.gid = -1;
     switch(type)
     {
     case SOCK_STREAM:
@@ -350,18 +352,21 @@ void *sockgetinbuf(struct socket *sk, size_t *size)
 static void recvcmsg(struct socket *sk, struct msghdr *msg)
 {
     struct cmsghdr *cmsg;
-    struct ucred *cred;
     
     for(cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg))
     {
+#if UNIX_AUTH_STYLE == 1
 	if((cmsg->cmsg_level == SOL_SOCKET) && (cmsg->cmsg_type == SCM_CREDENTIALS))
 	{
-	    if(sk->ucred.pid == 0)
+	    struct ucred *cred;
+	    if(sk->ucred.uid == -1)
 	    {
 		cred = (struct ucred *)CMSG_DATA(cmsg);
-		memcpy(&sk->ucred, cred, sizeof(*cred));
+		sk->ucred.uid = cred->uid;
+		sk->ucred.gid = cred->gid;
 	    }
 	}
+#endif
     }
 }
 
@@ -384,12 +389,17 @@ static void sockrecv(struct socket *sk)
 #if defined(HAVE_LINUX_SOCKIOS_H) && defined(SIOCINQ)
 	/* SIOCINQ is Linux-specific AFAIK, but I really have no idea
 	 * how to read the inqueue size on other OSs */
-	if(ioctl(sk->fd, SIOCINQ, &inq))
-	{
-	    /* I don't really know what could go wrong here, so let's
-	     * assume it's transient. */
-	    flog(LOG_WARNING, "SIOCINQ return %s on socket %i, falling back to 2048 bytes", strerror(errno), sk->fd);
-	    inq = 2048;
+	if(sk->isrealsocket) {
+	    if(ioctl(sk->fd, SIOCINQ, &inq))
+	    {
+		/* I don't really know what could go wrong here, so let's
+		 * assume it's transient. */
+		flog(LOG_WARNING, "SIOCINQ return %s on socket %i, falling back to 2048 bytes", strerror(errno), sk->fd);
+		inq = 2048;
+	    }
+	} else {
+	    /* There are perils when trying to use SIOCINQ on files >2GiB... */
+	    inq = 65536;
 	}
 #else
 	inq = 2048;
@@ -516,8 +526,12 @@ static void sockflush(struct socket *sk)
 	    ret = write(sk->fd, sk->outbuf.s.buf, sk->outbuf.s.datasize);
 	if(ret < 0)
 	{
-	    /* For now, assume transient error, since
-	     * the socket is polled for errors */
+	    if((errno != EINTR) && (errno != EAGAIN))
+	    {
+		if(sk->errcb != NULL)
+		    sk->errcb(sk, errno, sk->data);
+		closesock(sk);
+	    }
 	    break;
 	}
 	if(ret > 0)
@@ -545,7 +559,7 @@ void closesock(struct socket *sk)
 {
     struct sockaddr_un *un;
     
-    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)&un, NULL) && (un->sun_family == PF_UNIX))
+    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, '/'))
 	{
@@ -819,67 +833,70 @@ static void acceptunix(struct socket *sk)
     int buf;
     
     buf = 1;
+#if UNIX_AUTH_STYLE == 1
     if(setsockopt(sk->fd, SOL_SOCKET, SO_PASSCRED, &buf, sizeof(buf)) < 0)
 	flog(LOG_WARNING, "could not enable SO_PASSCRED on Unix socket %i: %s", sk->fd, strerror(errno));
+#elif UNIX_AUTH_STYLE == 2
+    if(getpeereid(sk->fd, &sk->ucred.uid, &sk->ucred.gid) < 0)
+    {
+	flog(LOG_WARNING, "could not get peer creds on Unix socket %i: %s", sk->fd, strerror(errno));
+	sk->ucred.uid = -1;
+	sk->ucred.gid = -1;
+    }
+#endif
 }
 
 int pollsocks(int timeout)
 {
-    int i, num, ret;
+    int ret, fd;
     socklen_t retlen;
-    int newfd;
-    struct pollfd *pfds;
+    int newfd, maxfd;
+    fd_set rfds, wfds, efds;
     struct socket *sk, *next, *newsk;
     struct sockaddr_storage ss;
     socklen_t sslen;
+    struct timeval tv;
     
-    pfds = smalloc(sizeof(*pfds) * (num = numsocks));
-    for(i = 0, sk = sockets; i < num; sk = sk->next)
+    FD_ZERO(&rfds);
+    FD_ZERO(&wfds);
+    FD_ZERO(&efds);
+    for(maxfd = 0, sk = sockets; sk != NULL; sk = sk->next)
     {
-	if(sk->state == SOCK_STL)
-	{
-	    num--;
+	if((sk->state == SOCK_STL) || (sk->fd < 0))
 	    continue;
-	}
-	pfds[i].fd = sk->fd;
-	pfds[i].events = 0;
 	if(!sk->ignread)
-	    pfds[i].events |= POLLIN;
+	    FD_SET(sk->fd, &rfds);
 	if((sk->state == SOCK_SYN) || (sockqueuesize(sk) > 0))
-	    pfds[i].events |= POLLOUT;
-	pfds[i].revents = 0;
-	i++;
+	    FD_SET(sk->fd, &wfds);
+	FD_SET(sk->fd, &efds);
+	if(sk->fd > maxfd)
+	    maxfd = sk->fd;
     }
-    ret = poll(pfds, num, timeout);
+    tv.tv_sec = timeout / 1000;
+    tv.tv_usec = (timeout % 1000) * 1000;
+    ret = select(maxfd + 1, &rfds, &wfds, &efds, (timeout < 0)?NULL:&tv);
     if(ret < 0)
     {
 	if(errno != EINTR)
 	{
-	    flog(LOG_CRIT, "pollsocks: poll errored out: %s", strerror(errno));
+	    flog(LOG_CRIT, "pollsocks: select errored out: %s", strerror(errno));
 	    /* To avoid CPU hogging in case it's bad, which it
 	     * probably is. */
 	    sleep(1);
 	}
-	free(pfds);
 	return(1);
     }
     for(sk = sockets; sk != NULL; sk = next)
     {
 	next = sk->next;
-	for(i = 0; i < num; i++)
-	{
-	    if(pfds[i].fd == sk->fd)
-		break;
-	}
-	if(i == num)
-	    continue;
+	fd = sk->fd;
 	switch(sk->state)
 	{
 	case SOCK_LST:
-	    if(pfds[i].revents & POLLIN)
+	    if(FD_ISSET(fd, &rfds))
 	    {
 		sslen = sizeof(ss);
-		if((newfd = accept(sk->fd, (struct sockaddr *)&ss, &sslen)) < 0)
+		if((newfd = accept(fd, (struct sockaddr *)&ss, &sslen)) < 0)
 		{
 		    if(sk->errcb != NULL)
 			sk->errcb(sk, errno, sk->data);
@@ -896,26 +913,26 @@ int pollsocks(int timeout)
 		    sk->acceptcb(sk, newsk, sk->data);
 		putsock(newsk);
 	    }
-	    if(pfds[i].revents & POLLERR)
+	    if(FD_ISSET(fd, &efds))
 	    {
 		retlen = sizeof(ret);
-		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
+		getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
 		if(sk->errcb != NULL)
 		    sk->errcb(sk, ret, sk->data);
 		continue;
 	    }
 	    break;
 	case SOCK_SYN:
-	    if(pfds[i].revents & POLLERR)
+	    if(FD_ISSET(fd, &efds))
 	    {
 		retlen = sizeof(ret);
-		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
+		getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
 		if(sk->conncb != NULL)
 		    sk->conncb(sk, ret, sk->data);
 		closesock(sk);
 		continue;
 	    }
-	    if(pfds[i].revents & (POLLIN | POLLOUT))
+	    if(FD_ISSET(fd, &rfds) || FD_ISSET(fd, &wfds))
 	    {
 		sk->state = SOCK_EST;
 		if(sk->conncb != NULL)
@@ -923,41 +940,25 @@ int pollsocks(int timeout)
 	    }
 	    break;
 	case SOCK_EST:
-	    if(pfds[i].revents & POLLERR)
+	    if(FD_ISSET(fd, &efds))
 	    {
 		retlen = sizeof(ret);
-		getsockopt(sk->fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
+		getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &retlen);
 		if(sk->errcb != NULL)
 		    sk->errcb(sk, ret, sk->data);
 		closesock(sk);
 		continue;
 	    }
-	    if(pfds[i].revents & POLLIN)
+	    if(FD_ISSET(fd, &rfds))
 		sockrecv(sk);
-	    if(pfds[i].revents & POLLOUT)
+	    if(FD_ISSET(fd, &wfds))
 	    {
 		if(sockqueuesize(sk) > 0)
 		    sockflush(sk);
 	    }
 	    break;
 	}
-	if(pfds[i].revents & POLLNVAL)
-	{
-	    flog(LOG_CRIT, "BUG: stale socket struct on fd %i", sk->fd);
-	    sk->state = SOCK_STL;
-	    unlinksock(sk);
-	    continue;
-	}
-	if(pfds[i].revents & POLLHUP)
-	{
-	    if(sk->errcb != NULL)
-		sk->errcb(sk, 0, sk->data);
-	    closesock(sk);
-	    unlinksock(sk);
-	    continue;
-	}
     }
-    free(pfds);
     for(sk = sockets; sk != NULL; sk = next)
     {
 	next = sk->next;
@@ -1006,7 +1007,7 @@ 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, SOL_IP, IP_TOS, &buf, sizeof(buf)) < 0)
+	if(setsockopt(sk->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);
@@ -1070,7 +1071,7 @@ static void resolvecb(pid_t pid, int status, struct resolvedata *data)
     {
 	if((ret = read(data->fd, buf, sizeof(buf))) != 4)
 	{
-	    errno = ENONET;
+	    errno = ENOENT;
 	    data->callback(NULL, 0, data->data);
 	} else {
 	    ipv4 = (struct sockaddr_in *)&data->addr;
@@ -1078,7 +1079,7 @@ static void resolvecb(pid_t pid, int status, struct resolvedata *data)
 	    data->callback((struct sockaddr *)ipv4, sizeof(*ipv4), data->data);
 	}
     } else {
-	errno = ENONET;
+	errno = ENOENT;
 	data->callback(NULL, 0, data->data);
     }
     close(data->fd);