diff options
| author |   reyk <reyk@openbsd.org> | 2008-07-16 14:49:44 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2008-07-16 14:49:44 +0000 |
| commit | c086f8ec4d97998bf8a7d5558dabebd98100061a (patch) | |
| tree | 0c505ef1bc50788a1221b408926962a6f5f0c269 | |
| parent | - err with the pathbuf, if we know it (diff) | |
| download | wireguard-openbsd-c086f8ec4d97998bf8a7d5558dabebd98100061a.tar.xz wireguard-openbsd-c086f8ec4d97998bf8a7d5558dabebd98100061a.zip | |
use getsockname() to find out the local address of a connection before
doing a nat lookup. this fixes nat lookups when the relay is
listening to a wildcard IPv4/IPv6 address (like 0.0.0.0 or ::).
| -rw-r--r-- | usr.sbin/relayd/relay.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index c9432815bb0..baa9f697972 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.92 2008/07/09 17:16:51 reyk Exp $ */ +/* $OpenBSD: relay.c,v 1.93 2008/07/16 14:49:44 reyk Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -1975,8 +1975,15 @@ relay_accept(int fd, short sig, void *arg) cnl->id = con->se_id; cnl->proc = proc_id; cnl->proto = IPPROTO_TCP; + bcopy(&con->se_in.ss, &cnl->src, sizeof(cnl->src)); - bcopy(&rlay->rl_conf.ss, &cnl->dst, sizeof(cnl->dst)); + slen = sizeof(cnl->dst); + if (getsockname(s, + (struct sockaddr *)&cnl->dst, &slen) == -1) { + relay_close(con, "failed to get local address"); + return; + } + imsg_compose(ibuf_pfe, IMSG_NATLOOK, 0, 0, -1, cnl, sizeof(*cnl)); |