#define WANT(n_) do { if (sz < (n_)) goto nospace; } while (0)
#define PUTC(c_) do { *buf++ = (c_); sz--; } while (0)
+ if (!sa) return "<null-address>";
if (!sz) return "<no-space-in-buffer>";
if (!len) len = family_socklen(sa->sa_family);
return (rc);
}
+/* Convert the IP address SA to a Unix-domain address SUN. Fail if the
+ * address seems already taken. If DESPARATEP then try cleaning up stale old
+ * sockets.
+ */
+static int encode_unused_inet_addr(struct sockaddr *sa,
+ struct sockaddr_un *sun,
+ int desperatep)
+{
+ address waddr;
+ struct sockaddr_un wsun;
+ int rc;
+ char buf[ADDRBUFSZ];
+
+ snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
+ present_sockaddr(sa, 0, buf, sizeof(buf)));
+ if ((rc = unix_socket_status(sun, !desperatep)) == USED) return (-1);
+ else if (rc == STALE) unlink(sun->sun_path);
+
+ wildcard_address(sa->sa_family, &waddr.sa);
+ port_to_sockaddr(&waddr.sa, port_from_sockaddr(sa));
+ snprintf(wsun.sun_path, sizeof(wsun.sun_path), "%s/%s", sockdir,
+ present_sockaddr(&waddr.sa, 0, buf, sizeof(buf)));
+ if ((rc = unix_socket_status(&wsun, !desperatep)) == USED) return (-1);
+ else if (rc == STALE) unlink(wsun.sun_path);
+
+ return (0);
+}
+
/* Encode the Internet address SA as a Unix-domain address SUN. If WANT is
* WANT_FRESH, and SA's port number is zero, then we pick an arbitrary local
* port. Otherwise we pick the port given. There's an unpleasant hack to
copy_sockaddr(&addr.sa, sa);
for (i = 0; i < 10; i++) {
port_to_sockaddr(&addr.sa, randrange(minautoport, maxautoport));
- snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
- present_sockaddr(&addr.sa, 0, buf, sizeof(buf)));
- if (unix_socket_status(sun, 1) == UNUSED) goto found;
+ if (!encode_unused_inet_addr(&addr.sa, sun, 0)) goto found;
}
for (desperatep = 0; desperatep < 2; desperatep++) {
for (i = minautoport; i <= maxautoport; i++) {
port_to_sockaddr(&addr.sa, i);
- snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
- present_sockaddr(&addr.sa, 0, buf, sizeof(buf)));
- rc = unix_socket_status(sun, !desperatep);
- switch (rc) {
- case STALE: unlink(sun->sun_path);
- case UNUSED: goto found;
- }
+ if (!encode_unused_inet_addr(&addr.sa, sun, 0)) goto found;
}
}
errno = EADDRINUSE;
if (*p != ',') break;
if (*p) p++;
}
+ if (*p) goto bad;
*pp = p;
return;
return;
}
+/* Parse an ACL from an environment variable VAR, attaching it to the list
+ * TAIL.
+ */
+static void parse_acl_env(const char *var, aclnode ***tail)
+{
+ char *p, *q;
+
+ if ((p = getenv(var)) != 0) {
+ p = q = xstrdup(p);
+ parse_acl_line(&q, tail);
+ free(p);
+ }
+}
+
/* Parse the autoports configuration directive. Syntax is MIN - MAX. */
static void parse_autoports(char **pp)
{
if (*p != '-') goto bad; p++;
NEXTNUMBER(q, del); y = strtoul(q, 0, 0); RESCAN(del);
minautoport = x; maxautoport = y;
+ SKIPSPC; if (*p) goto bad;
*pp = p;
return;
return;
}
-/* Parse an ACL from an environment variable VAR, attaching it to the list
- * TAIL. */
-static void parse_acl_env(const char *var, aclnode ***tail)
-{
- char *p, *q;
-
- if ((p = getenv(var)) != 0) {
- p = q = xstrdup(p);
- parse_acl_line(&q, tail);
- free(p);
- }
-}
-
/* Read the configuration from the config file and environment. */
static void readconfig(void)
{
/*----- Overridden system calls -------------------------------------------*/
+static void dump_syserr(long rc)
+ { fprintf(stderr, " => %ld (E%d)\n", rc, errno); }
+
+static void dump_sysresult(long rc)
+{
+ if (rc < 0) dump_syserr(rc);
+ else fprintf(stderr, " => %ld\n", rc);
+}
+
+static void dump_addrresult(long rc, const struct sockaddr *sa,
+ socklen_t len)
+{
+ char addrbuf[ADDRBUFSZ];
+
+ if (rc < 0) dump_syserr(rc);
+ else {
+ fprintf(stderr, " => %ld [%s]\n", rc,
+ present_sockaddr(sa, len, addrbuf, sizeof(addrbuf)));
+ }
+}
+
int socket(int pf, int ty, int proto)
{
+ int sk;
+
+ D( fprintf(stderr, "noip(%d): SOCKET pf=%d, type=%d, proto=%d",
+ getpid(), pf, ty, proto); )
+
switch (pf) {
default:
if (!family_known_p(pf)) {
+ D( fprintf(stderr, " -> unknown; refuse\n"); )
errno = EAFNOSUPPORT;
- return (-1);
+ sk = -1;
}
+ D( fprintf(stderr, " -> inet; substitute"); )
pf = PF_UNIX;
proto = 0;
+ break;
case PF_UNIX:
#ifdef PF_NETLINK
case PF_NETLINK:
#endif
- return (real_socket(pf, ty, proto));
+ D( fprintf(stderr, " -> safe; permit"); )
+ break;
}
+ sk = real_socket(pf, ty, proto);
+ D( dump_sysresult(sk); )
+ return (sk);
}
int socketpair(int pf, int ty, int proto, int *sk)
{
- if (family_known_p(pf)) {
+ int rc;
+
+ D( fprintf(stderr, "noip(%d): SOCKETPAIR pf=%d, type=%d, proto=%d",
+ getpid(), pf, ty, proto); )
+ if (!family_known_p(pf))
+ D( fprintf(stderr, " -> unknown; permit"); )
+ else {
+ D( fprintf(stderr, " -> inet; substitute"); )
pf = PF_UNIX;
proto = 0;
}
- return (real_socketpair(pf, ty, proto, sk));
+ rc = real_socketpair(pf, ty, proto, sk);
+ D( if (rc < 0) dump_syserr(rc);
+ else fprintf(stderr, " => %d (%d, %d)\n", rc, sk[0], sk[1]); )
+ return (rc);
}
int bind(int sk, const struct sockaddr *sa, socklen_t len)
{
struct sockaddr_un sun;
+ int rc;
+ Dpid;
+
+ D({ char buf[ADDRBUFSZ];
+ fprintf(stderr, "noip(%d): BIND sk=%d, sa[%d]=%s", pid,
+ sk, len, present_sockaddr(sa, len, buf, sizeof(buf))); })
- if (family_known_p(sa->sa_family)) {
+ if (!family_known_p(sa->sa_family))
+ D( fprintf(stderr, " -> unknown af; pass through"); )
+ else {
+ D( fprintf(stderr, " -> checking...\n"); )
PRESERVING_ERRNO({
if (acl_allows_p(bind_real, sa)) {
if (fixup_real_ip_socket(sk, sa->sa_family, 0))
len = SUN_LEN(&sun);
}
});
+ D( fprintf(stderr, "noip(%d): BIND ...", pid); )
}
- return (real_bind(sk, sa, len));
+ rc = real_bind(sk, sa, len);
+ D( dump_sysresult(rc); )
+ return (rc);
}
int connect(int sk, const struct sockaddr *sa, socklen_t len)
{
struct sockaddr_un sun;
int rc;
+ Dpid;
- if (!family_known_p(sa->sa_family))
+ D({ char buf[ADDRBUFSZ];
+ fprintf(stderr, "noip(%d): CONNECT sk=%d, sa[%d]=%s", pid,
+ sk, len, present_sockaddr(sa, len, buf, sizeof(buf))); })
+
+ if (!family_known_p(sa->sa_family)) {
+ D( fprintf(stderr, " -> unknown af; pass through"); )
rc = real_connect(sk, sa, len);
- else {
+ } else {
+ D( fprintf(stderr, " -> checking...\n"); )
PRESERVING_ERRNO({
do_implicit_bind(sk, &sa, &len, &sun);
});
+ D( fprintf(stderr, "noip(%d): CONNECT ...", pid); )
rc = real_connect(sk, sa, len);
if (rc < 0) {
switch (errno) {
}
}
}
+ D( dump_sysresult(rc); )
return (rc);
}
const struct sockaddr *to, socklen_t tolen)
{
struct sockaddr_un sun;
+ ssize_t n;
+ Dpid;
- if (to && family_known_p(to->sa_family)) {
+ D({ char addrbuf[ADDRBUFSZ];
+ fprintf(stderr, "noip(%d): SENDTO sk=%d, len=%lu, flags=%d, to[%d]=%s",
+ pid, sk, (unsigned long)len, flags, tolen,
+ present_sockaddr(to, tolen, addrbuf, sizeof(addrbuf))); })
+
+ if (!to)
+ D( fprintf(stderr, " -> null address; leaving"); )
+ else if (!family_known_p(to->sa_family))
+ D( fprintf(stderr, " -> unknown af; pass through"); )
+ else {
+ D( fprintf(stderr, " -> checking...\n"); )
PRESERVING_ERRNO({
do_implicit_bind(sk, &to, &tolen, &sun);
});
+ D( fprintf(stderr, "noip(%d): SENDTO ...", pid); )
}
- return (real_sendto(sk, buf, len, flags, to, tolen));
+ n = real_sendto(sk, buf, len, flags, to, tolen);
+ D( dump_sysresult(n); )
+ return (n);
}
ssize_t recvfrom(int sk, void *buf, size_t len, int flags,
char sabuf[1024];
socklen_t mylen = sizeof(sabuf);
ssize_t n;
+ Dpid;
- if (!from)
- return real_recvfrom(sk, buf, len, flags, 0, 0);
- PRESERVING_ERRNO({
- n = real_recvfrom(sk, buf, len, flags, SA(sabuf), &mylen);
- if (n < 0)
- return (-1);
- return_fake_name(SA(sabuf), mylen, from, fromlen);
- });
+ D( fprintf(stderr, "noip(%d): RECVFROM sk=%d, len=%lu, flags=%d",
+ pid, sk, (unsigned long)len, flags); )
+
+ if (!from) {
+ D( fprintf(stderr, " -> null addr; pass through"); )
+ n = real_recvfrom(sk, buf, len, flags, 0, 0);
+ } else {
+ PRESERVING_ERRNO({
+ n = real_recvfrom(sk, buf, len, flags, SA(sabuf), &mylen);
+ if (n >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, from, fromlen);
+ D( fprintf(stderr, "noip(%d): ... RECVFROM", pid); )
+ }
+ });
+ }
+ D( dump_addrresult(n, from, fromlen ? *fromlen : 0); )
return (n);
}
ssize_t sendmsg(int sk, const struct msghdr *msg, int flags)
{
struct sockaddr_un sun;
- const struct sockaddr *sa;
+ const struct sockaddr *sa = SA(msg->msg_name);
struct msghdr mymsg;
+ ssize_t n;
+ Dpid;
- if (msg->msg_name && family_known_p(SA(msg->msg_name)->sa_family)) {
+ D({ char addrbuf[ADDRBUFSZ];
+ fprintf(stderr, "noip(%d): SENDMSG sk=%d, "
+ "msg_flags=%d, msg_name[%d]=%s, ...",
+ pid, sk, msg->msg_flags, msg->msg_namelen,
+ present_sockaddr(sa, msg->msg_namelen,
+ addrbuf, sizeof(addrbuf))); })
+
+ if (!sa)
+ D( fprintf(stderr, " -> null address; leaving"); )
+ else if (!family_known_p(sa->sa_family))
+ D( fprintf(stderr, " -> unknown af; pass through"); )
+ else {
+ D( fprintf(stderr, " -> checking...\n"); )
PRESERVING_ERRNO({
- sa = SA(msg->msg_name);
mymsg = *msg;
do_implicit_bind(sk, &sa, &mymsg.msg_namelen, &sun);
mymsg.msg_name = SA(sa);
msg = &mymsg;
});
+ D( fprintf(stderr, "noip(%d): SENDMSG ...", pid); )
}
- return (real_sendmsg(sk, msg, flags));
+ n = real_sendmsg(sk, msg, flags);
+ D( dump_sysresult(n); )
+ return (n);
}
ssize_t recvmsg(int sk, struct msghdr *msg, int flags)
{
char sabuf[1024];
- struct sockaddr *sa;
- socklen_t len;
+ struct sockaddr *sa = SA(msg->msg_name);
+ socklen_t len = msg->msg_namelen;
ssize_t n;
+ Dpid;
- if (!msg->msg_name)
+ D( fprintf(stderr, "noip(%d): RECVMSG sk=%d msg_flags=%d, ...",
+ pid, sk, msg->msg_flags); )
+
+ if (!msg->msg_name) {
+ D( fprintf(stderr, " -> null addr; pass through"); )
return (real_recvmsg(sk, msg, flags));
- PRESERVING_ERRNO({
- sa = SA(msg->msg_name);
- len = msg->msg_namelen;
- msg->msg_name = sabuf;
- msg->msg_namelen = sizeof(sabuf);
- n = real_recvmsg(sk, msg, flags);
- if (n < 0)
- return (-1);
- return_fake_name(SA(sabuf), msg->msg_namelen, sa, &len);
- msg->msg_name = sa;
- msg->msg_namelen = len;
- });
+ } else {
+ PRESERVING_ERRNO({
+ msg->msg_name = sabuf;
+ msg->msg_namelen = sizeof(sabuf);
+ n = real_recvmsg(sk, msg, flags);
+ if (n >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), msg->msg_namelen, sa, &len);
+ D( fprintf(stderr, "noip(%d): ... RECVMSG", pid); )
+ }
+ msg->msg_name = sa;
+ msg->msg_namelen = len;
+ });
+ }
+ D( dump_addrresult(n, sa, len); )
return (n);
}
{
char sabuf[1024];
socklen_t mylen = sizeof(sabuf);
- int nsk = real_accept(sk, SA(sabuf), &mylen);
+ int nsk;
+ Dpid;
- if (nsk < 0)
- return (-1);
- return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ACCEPT sk=%d", pid, sk); )
+
+ nsk = real_accept(sk, SA(sabuf), &mylen);
+ if (nsk < 0) /* failed */;
+ else if (!sa) D( fprintf(stderr, " -> address not wanted"); )
+ else {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ... ACCEPT", pid); )
+ }
+ D( dump_addrresult(nsk, sa, len ? *len : 0); )
return (nsk);
}
int getsockname(int sk, struct sockaddr *sa, socklen_t *len)
{
+ int rc;
+ Dpid;
+
+ D( fprintf(stderr, "noip(%d): GETSOCKNAME sk=%d", pid, sk); )
PRESERVING_ERRNO({
char sabuf[1024];
socklen_t mylen = sizeof(sabuf);
- if (real_getsockname(sk, SA(sabuf), &mylen))
- return (-1);
- return_fake_name(SA(sabuf), mylen, sa, len);
+ rc = real_getsockname(sk, SA(sabuf), &mylen);
+ if (rc >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ... GETSOCKNAME", pid); )
+ }
});
- return (0);
+ D( dump_addrresult(rc, sa, *len); )
+ return (rc);
}
int getpeername(int sk, struct sockaddr *sa, socklen_t *len)
{
+ int rc;
+ Dpid;
+
+ D( fprintf(stderr, "noip(%d): GETPEERNAME sk=%d", pid, sk); )
PRESERVING_ERRNO({
char sabuf[1024];
socklen_t mylen = sizeof(sabuf);
- if (real_getpeername(sk, SA(sabuf), &mylen))
- return (-1);
- return_fake_name(SA(sabuf), mylen, sa, len);
+ rc = real_getpeername(sk, SA(sabuf), &mylen);
+ if (rc >= 0) {
+ D( fprintf(stderr, " -> converting...\n"); )
+ return_fake_name(SA(sabuf), mylen, sa, len);
+ D( fprintf(stderr, "noip(%d): ... GETPEERNAME", pid); )
+ }
});
+ D( dump_addrresult(rc, sa, *len); )
return (0);
}