/*----- Data structures ---------------------------------------------------*/
enum { UNUSED, STALE, USED }; /* Unix socket status values */
-enum { WANT_FRESH, WANT_EXISTING }; /* Socket address dispositions */
enum { DENY, ALLOW }; /* ACL verdicts */
static int address_families[] = { AF_INET, AF_INET6, -1 };
present_sockaddr(sa, 0, buf, sizeof(buf))); })
for (; a; a = a->next) {
D( dump_aclnode(a); )
- if (sockaddr_in_range_p(sa, &a->minaddr, &a->maxaddr) &&
+ if (a->af == sa->sa_family &&
+ sockaddr_in_range_p(sa, &a->minaddr, &a->maxaddr) &&
a->minport <= port && port <= a->maxport) {
D( fprintf(stderr, "noip(%d): aha! %s\n", pid,
a->act ? "ALLOW" : "DENY"); )
struct sockaddr_un wsun;
int rc;
char buf[ADDRBUFSZ];
+ int port = port_from_sockaddr(sa);
snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
present_sockaddr(sa, 0, buf, sizeof(buf)));
else if (rc == STALE) unlink(sun->sun_path);
wildcard_address(sa->sa_family, &waddr.sa);
- port_to_sockaddr(&waddr.sa, port_from_sockaddr(sa));
+ port_to_sockaddr(&waddr.sa, port);
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);
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
- * find servers bound to local wildcard addresses. Returns zero on success;
- * -1 on failure.
+/* Encode the Internet address SA as a Unix-domain address SUN. If the flag
+ * `ENCF_FRESH' is set, 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 find servers bound to local wildcard addresses.
+ * Returns zero on success; -1 on failure.
*/
+#define ENCF_FRESH 1u
static int encode_inet_addr(struct sockaddr_un *sun,
const struct sockaddr *sa,
- int want)
+ unsigned f)
{
int i;
int desperatep = 0;
address addr;
+ int port = port_from_sockaddr(sa);
char buf[ADDRBUFSZ];
int rc;
D( fprintf(stderr, "noip(%d): encode %s (%s)", getpid(),
present_sockaddr(sa, 0, buf, sizeof(buf)),
- want == WANT_EXISTING ? "EXISTING" : "FRESH"); )
+ (f&ENCF_FRESH) ? "FRESH" : "EXISTING"); )
sun->sun_family = AF_UNIX;
- if (port_from_sockaddr(sa) || want == WANT_EXISTING) {
+ if (port || !(f&ENCF_FRESH)) {
snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
present_sockaddr(sa, 0, buf, sizeof(buf)));
rc = unix_socket_status(sun, 0);
if (rc == STALE) unlink(sun->sun_path);
- if (rc != USED && want == WANT_EXISTING) {
+ if (rc != USED && !(f&ENCF_FRESH)) {
wildcard_address(sa->sa_family, &addr.sa);
- port_to_sockaddr(&addr.sa, port_from_sockaddr(sa));
+ port_to_sockaddr(&addr.sa, port);
snprintf(sun->sun_path, sizeof(sun->sun_path), "%s/%s", sockdir,
present_sockaddr(&addr.sa, 0, buf, sizeof(buf)));
if (unix_socket_status(sun, 0) == STALE) unlink(sun->sun_path);
errno = EADDRINUSE;
D( fprintf(stderr, " -- can't resolve\n"); )
return (-1);
- found:;
}
+found:
D( fprintf(stderr, " -> `%s'\n", sun->sun_path); )
return (0);
}
D( fprintf(stderr, "noip(%d): no match; using wildcard\n", pid); )
wildcard_address((*sa)->sa_family, &addr.sa);
found:
- encode_inet_addr(sun, &addr.sa, WANT_FRESH);
+ encode_inet_addr(sun, &addr.sa, ENCF_FRESH);
if (real_bind(sk, SA(sun), SUN_LEN(sun))) return (-1);
}
- encode_inet_addr(sun, *sa, WANT_EXISTING);
+ encode_inet_addr(sun, *sa, 0);
*sa = SA(sun);
*len = SUN_LEN(sun);
}
SKIPSPC;
NEXTNUMBER(q, del); x = strtoul(q, 0, 0); RESCAN(del);
SKIPSPC;
- if (*p != '-') goto bad; p++;
+ if (*p != '-') goto bad;
+ p++;
NEXTNUMBER(q, del); y = strtoul(q, 0, 0); RESCAN(del);
minautoport = x; maxautoport = y;
SKIPSPC; if (*p) goto bad;
if (fixup_real_ip_socket(sk, sa->sa_family, 0))
return (-1);
} else {
- encode_inet_addr(&sun, sa, WANT_FRESH);
+ encode_inet_addr(&sun, sa, ENCF_FRESH);
sa = SA(&sun);
len = SUN_LEN(&sun);
}
int getsockname(int sk, struct sockaddr *sa, socklen_t *len)
{
+ char sabuf[1024];
+ socklen_t mylen = sizeof(sabuf);
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETSOCKNAME sk=%d", pid, sk); )
- PRESERVING_ERRNO({
- char sabuf[1024];
- socklen_t mylen = sizeof(sabuf);
- 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); )
- }
- });
+ 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); )
+ }
D( dump_addrresult(rc, sa, *len); )
return (rc);
}
int getpeername(int sk, struct sockaddr *sa, socklen_t *len)
{
+ char sabuf[1024];
+ socklen_t mylen = sizeof(sabuf);
int rc;
Dpid;
D( fprintf(stderr, "noip(%d): GETPEERNAME sk=%d", pid, sk); )
- PRESERVING_ERRNO({
- char sabuf[1024];
- socklen_t mylen = sizeof(sabuf);
- 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); )
- }
- });
+ 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);
}
int getsockopt(int sk, int lev, int opt, void *p, socklen_t *len)
{
switch (lev) {
- case SOL_IP:
- case SOL_TCP:
- case SOL_UDP:
+ case IPPROTO_IP:
+ case IPPROTO_IPV6:
+ case IPPROTO_TCP:
+ case IPPROTO_UDP:
if (*len > 0)
memset(p, 0, *len);
return (0);
int setsockopt(int sk, int lev, int opt, const void *p, socklen_t len)
{
switch (lev) {
- case SOL_IP:
- case SOL_TCP:
- case SOL_UDP:
+ case IPPROTO_IP:
+ case IPPROTO_IPV6:
+ case IPPROTO_TCP:
+ case IPPROTO_UDP:
return (0);
}
switch (opt) {
~mdw / preload-hacks / blobdiff