X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fnet.c;h=6af0e0a5254ea4d72dbf353cdb2908ff14485433;hb=302a260054ea38d3cb97be6d1a3010082c09265d;hp=d8038d1ed0fefca0e1ce24bdb1b88bd2e07095e9;hpb=6fb0c6ac0396f47c19f2ecc0394fd4e15cad89cb;p=doldaconnect.git diff --git a/daemon/net.c b/daemon/net.c index d8038d1..6af0e0a 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 * * 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 @@ -33,6 +33,7 @@ #include #include #include +#include /* For rebindunix() */ #ifdef HAVE_LINUX_SOCKIOS_H #include #endif @@ -48,17 +49,40 @@ static struct configvar myvars[] = { - /* 0 = Direct mode, 1 = Passive mode, 2 = SOCKS proxy */ + /** The network mode to use. Currently supported values are 0 for + * active mode and 1 for passive mode. In the future, SOCKS5 proxy + * support may be added. */ {CONF_VAR_INT, "mode", {.num = 0}}, + /** Set the SO_REUSEADDR socket option on listening sockets, so + * that dead TCP connections waiting for timeout are ignored. */ {CONF_VAR_BOOL, "reuseaddr", {.num = 0}}, - /* Only for direct mode */ + /** Overrides the IPv4 address reported to other clients in active + * mode. Useful for servers behind NAT routers. If both this and + * net.publicif are unspecified the address of the hub connection + * is used. */ {CONF_VAR_IPV4, "visibleipv4", {.ipv4 = {0}}}, + /** Specifies an interface name from which to fetch the IPv4 + * address reported to other clients in active mode. If both this + * and net.visibleipv4 are unspecified the address of the hub + * connection is used. */ {CONF_VAR_STRING, "publicif", {.str = L""}}, /* Diffserv should be supported on IPv4, too, but I don't know the * API to do that. */ + /** The Diffserv value to use on IPv6 connections when the + * minimize cost TOS value is used (see the TOS VALUES + * section). */ {CONF_VAR_INT, "diffserv-mincost", {.num = 0}}, + /** The Diffserv value to use on IPv6 connections when the + * maximize reliability TOS value is used (see the TOS VALUES + * section). */ {CONF_VAR_INT, "diffserv-maxrel", {.num = 0}}, + /** The Diffserv value to use on IPv6 connections when the + * maximize throughput TOS value is used (see the TOS VALUES + * section). */ {CONF_VAR_INT, "diffserv-maxtp", {.num = 0}}, + /** The Diffserv value to use on IPv6 connections when the + * minimize delay TOS value is used (see the TOS VALUES + * section). */ {CONF_VAR_INT, "diffserv-mindelay", {.num = 0}}, {CONF_VAR_END} }; @@ -109,7 +133,7 @@ int getpublicaddr(int af, struct sockaddr **addr, socklen_t *lenbuf) ipv4 = NULL; for(ifr = conf.ifc_ifcu.ifcu_req; (void *)ifr < bufend; ifr++) { - if(strcmp(ifr->ifrname, pif)) + if(strcmp(ifr->ifr_name, pif)) continue; memset(&req, 0, sizeof(req)); memcpy(req.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name)); @@ -159,6 +183,8 @@ static struct socket *newsock(int type) new->close = 0; new->remote = NULL; new->remotelen = 0; + new->ucred.uid = -1; + new->ucred.gid = -1; switch(type) { case SOCK_STREAM: @@ -253,18 +279,19 @@ void putsock(struct socket *sk) { sk->outbuf.d.f = buf->next; free(buf->data); + free(buf->addr); free(buf); } while((buf = sk->inbuf.d.f) != NULL) { sk->inbuf.d.f = buf->next; free(buf->data); + free(buf->addr); free(buf); } break; } - if(sk->fd >= 0) - close(sk->fd); + closesock(sk); if(sk->remote != NULL) free(sk->remote); free(sk); @@ -321,11 +348,40 @@ void *sockgetinbuf(struct socket *sk, size_t *size) return(NULL); } +static void recvcmsg(struct socket *sk, struct msghdr *msg) +{ + struct cmsghdr *cmsg; + + 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)) + { + struct ucred *cred; + if(sk->ucred.uid == -1) + { + cred = (struct ucred *)CMSG_DATA(cmsg); + sk->ucred.uid = cred->uid; + sk->ucred.gid = cred->gid; + } + } +#endif + } +} + static void sockrecv(struct socket *sk) { int ret, inq; struct dgrambuf *dbuf; + struct msghdr msg; + char cbuf[65536]; + struct iovec bufvec; + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &bufvec; + msg.msg_iovlen = 1; + msg.msg_control = cbuf; + msg.msg_controllen = sizeof(cbuf); switch(sk->type) { case SOCK_STREAM: @@ -345,7 +401,16 @@ static void sockrecv(struct socket *sk) if(inq > 65536) inq = 65536; sizebuf(&sk->inbuf.s.buf, &sk->inbuf.s.bufsize, sk->inbuf.s.datasize + inq, 1, 1); - ret = read(sk->fd, sk->inbuf.s.buf + sk->inbuf.s.datasize, inq); + if(sk->isrealsocket) + { + bufvec.iov_base = sk->inbuf.s.buf + sk->inbuf.s.datasize; + bufvec.iov_len = inq; + ret = recvmsg(sk->fd, &msg, 0); + } else { + ret = read(sk->fd, sk->inbuf.s.buf + sk->inbuf.s.datasize, inq); + msg.msg_controllen = 0; + msg.msg_flags = 0; + } if(ret < 0) { if((errno == EINTR) || (errno == EAGAIN)) @@ -355,6 +420,10 @@ static void sockrecv(struct socket *sk) closesock(sk); return; } + if(msg.msg_flags & MSG_CTRUNC) + flog(LOG_DEBUG, "ancillary data was truncated"); + else + recvcmsg(sk, &msg); if(ret == 0) { if(sk->errcb != NULL) @@ -367,6 +436,7 @@ static void sockrecv(struct socket *sk) sk->readcb(sk, sk->data); break; case SOCK_DGRAM: +#if defined(HAVE_LINUX_SOCKIOS_H) && defined(SIOCINQ) if(ioctl(sk->fd, SIOCINQ, &inq)) { /* I don't really know what could go wrong here, so let's @@ -374,10 +444,21 @@ static void sockrecv(struct socket *sk) flog(LOG_WARNING, "SIOCINQ return %s on socket %i", strerror(errno), sk->fd); return; } +#else + inq = 65536; +#endif dbuf = smalloc(sizeof(*dbuf)); dbuf->data = smalloc(inq); dbuf->addr = smalloc(dbuf->addrlen = sizeof(struct sockaddr_storage)); + /* ret = recvfrom(sk->fd, dbuf->data, inq, 0, dbuf->addr, &dbuf->addrlen); + */ + msg.msg_name = dbuf->addr; + msg.msg_namelen = dbuf->addrlen; + bufvec.iov_base = dbuf->data; + bufvec.iov_len = inq; + ret = recvmsg(sk->fd, &msg, 0); + dbuf->addrlen = msg.msg_namelen; if(ret < 0) { free(dbuf->addr); @@ -390,6 +471,10 @@ static void sockrecv(struct socket *sk) closesock(sk); return; } + if(msg.msg_flags & MSG_CTRUNC) + flog(LOG_DEBUG, "ancillary data was truncated"); + else + recvcmsg(sk, &msg); /* On UDP/IPv[46], ret == 0 doesn't mean EOF (since UDP can't * have EOF), but rather an empty packet. I don't know if any * other potential DGRAM protocols might have an EOF @@ -462,6 +547,16 @@ static void sockflush(struct socket *sk) 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->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)); + } + } sk->state = SOCK_STL; close(sk->fd); sk->fd = -1; @@ -538,6 +633,29 @@ size_t sockqueuesize(struct socket *sk) } /* + * Seriously, I don't know if it's naughty or not to remove + * pre-existing Unix sockets. + */ +static int rebindunix(struct socket *sk, struct sockaddr *name, socklen_t namelen) +{ + struct sockaddr_un *un; + struct stat sb; + + if((sk->family != AF_UNIX) || (name->sa_family != PF_UNIX)) + return(-1); + un = (struct sockaddr_un *)name; + if(stat(un->sun_path, &sb)) + return(-1); + if(!S_ISSOCK(sb.st_mode)) + return(-1); + if(unlink(un->sun_path)) + return(-1); + if(bind(sk->fd, name, namelen) < 0) + return(-1); + return(0); +} + +/* * The difference between netcslisten() and netcslistenlocal() is that * netcslistenlocal() always listens on the local host, instead of * following proxy/passive mode directions. It is suitable for eg. the @@ -564,7 +682,7 @@ struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namel intbuf = 1; setsockopt(sk->fd, SOL_SOCKET, SO_REUSEADDR, &intbuf, sizeof(intbuf)); } - if(bind(sk->fd, name, namelen) < 0) + if((bind(sk->fd, name, namelen) < 0) && ((errno != EADDRINUSE) || (rebindunix(sk, name, namelen) < 0))) { putsock(sk); return(NULL); @@ -700,9 +818,28 @@ struct socket *netcsconn(struct sockaddr *addr, socklen_t addrlen, void (*func)( return(NULL); } +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, retlen; + int i, num, ret; + socklen_t retlen; int newfd; struct pollfd *pfds; struct socket *sk, *next, *newsk; @@ -766,9 +903,11 @@ int pollsocks(int timeout) newsk->state = SOCK_EST; memcpy(newsk->remote = smalloc(sslen), &ss, sslen); newsk->remotelen = sslen; - putsock(newsk); + if(ss.ss_family == PF_UNIX) + acceptunix(newsk); if(sk->acceptcb != NULL) sk->acceptcb(sk, newsk, sk->data); + putsock(newsk); } if(pfds[i].revents & POLLERR) { @@ -855,6 +994,8 @@ int socksettos(struct socket *sk, int tos) { int buf; + if(sk->family == AF_UNIX) + return(0); /* Unix sockets are always perfect. :) */ if(sk->family == AF_INET) { switch(tos) @@ -878,7 +1019,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); @@ -942,7 +1083,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; @@ -950,7 +1091,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); @@ -1035,13 +1176,52 @@ int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *le return(-1); } *namebuf = memcpy(smalloc(len), &name, len); - *lenbuf = len; + if(lenbuf != NULL) + *lenbuf = len; return(0); } -int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf) +static void sethostaddr(struct sockaddr *dst, struct sockaddr *src) +{ + if(dst->sa_family != src->sa_family) + { + flog(LOG_ERR, "BUG: non-matching socket families in sethostaddr (%i -> %i)", src->sa_family, dst->sa_family); + return; + } + switch(src->sa_family) + { + case AF_INET: + ((struct sockaddr_in *)dst)->sin_addr = ((struct sockaddr_in *)src)->sin_addr; + break; + case AF_INET6: + ((struct sockaddr_in6 *)dst)->sin6_addr = ((struct sockaddr_in6 *)src)->sin6_addr; + break; + default: + flog(LOG_WARNING, "sethostaddr unimplemented for family %i", src->sa_family); + break; + } +} + +static int makepublic(struct sockaddr *addr) { int ret; + socklen_t plen; + struct sockaddr *pname; + + if((ret = getpublicaddr(addr->sa_family, &pname, &plen)) < 0) + { + flog(LOG_ERR, "could not get public address: %s", strerror(errno)); + return(-1); + } + if(ret) + return(0); + sethostaddr(addr, pname); + free(pname); + return(0); +} + +int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *lenbuf) +{ socklen_t len; struct sockaddr *name; @@ -1050,22 +1230,15 @@ int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *l case 0: *namebuf = NULL; if((sk->state == SOCK_STL) || (sk->fd < 0)) - return(-1); - if((ret = getpublicaddr(sk->family, &name, &len)) < 0) { - flog(LOG_ERR, "could not get public address: %s", strerror(errno)); + errno = EBADF; return(-1); } - if(ret == 0) - { - *namebuf = name; - *lenbuf = len; - return(0); - } if(!sockgetlocalname(sk, &name, &len)) { *namebuf = name; *lenbuf = len; + makepublic(name); return(0); } flog(LOG_ERR, "could not get remotely accessible name by any means"); @@ -1080,6 +1253,29 @@ int sockgetremotename(struct socket *sk, struct sockaddr **namebuf, socklen_t *l } } +int sockgetremotename2(struct socket *sk, struct socket *sk2, struct sockaddr **namebuf, socklen_t *lenbuf) +{ + struct sockaddr *name1, *name2; + socklen_t len1, len2; + + if(sk->family != sk2->family) + { + flog(LOG_ERR, "using sockgetremotename2 with sockets of differing family: %i %i", sk->family, sk2->family); + return(-1); + } + if(sockgetremotename(sk, &name1, &len1)) + return(-1); + if(sockgetremotename(sk2, &name2, &len2)) { + free(name1); + return(-1); + } + sethostaddr(name1, name2); + free(name2); + *namebuf = name1; + *lenbuf = len1; + return(0); +} + int addreq(struct sockaddr *x, struct sockaddr *y) { struct sockaddr_un *u1, *u2; @@ -1103,6 +1299,7 @@ int addreq(struct sockaddr *x, struct sockaddr *y) if(n1->sin_addr.s_addr != n2->sin_addr.s_addr) return(0); break; +#ifdef HAVE_IPV6 case AF_INET6: s1 = (struct sockaddr_in6 *)x; s2 = (struct sockaddr_in6 *)y; if(s1->sin6_port != s2->sin6_port) @@ -1110,15 +1307,13 @@ int addreq(struct sockaddr *x, struct sockaddr *y) if(memcmp(s1->sin6_addr.s6_addr, s2->sin6_addr.s6_addr, sizeof(s1->sin6_addr.s6_addr))) return(0); break; +#endif } return(1); } char *formataddress(struct sockaddr *arg, socklen_t arglen) { - struct sockaddr_un *UNIX; /* Some wise guy has #defined unix with - * lowercase letters to 1, so I do this - * instead. */ struct sockaddr_in *ipv4; #ifdef HAVE_IPV6 struct sockaddr_in6 *ipv6; @@ -1132,8 +1327,7 @@ char *formataddress(struct sockaddr *arg, socklen_t arglen) switch(arg->sa_family) { case AF_UNIX: - UNIX = (struct sockaddr_un *)arg; - ret = sprintf2("%s", UNIX->sun_path); + ret = sstrdup("Unix socket"); break; case AF_INET: ipv4 = (struct sockaddr_in *)arg;