diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-17 13:38:52 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-17 13:38:52 +0000 |
| commit | 2ada0f0db45daf9f37eef4c03d301666acad74b3 (patch) | |
| tree | 3aab595453ec31c3f171a3f215f194f914b29bd1 | |
| parent | Remove a __KAME__ block for extracting the scope_id from IPV6_PKTINFO. (diff) | |
| download | wireguard-openbsd-2ada0f0db45daf9f37eef4c03d301666acad74b3.tar.xz wireguard-openbsd-2ada0f0db45daf9f37eef4c03d301666acad74b3.zip | |
Remove a __KAME__ block for extracting the scope_id from IPV6_PKTINFO.
struct in6_pktinfo includes the interface index in ipi6_ifindex but no
struct sockaddr_in6.
OK jca@
| -rw-r--r-- | usr.sbin/tftp-proxy/tftp-proxy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/tftp-proxy/tftp-proxy.c b/usr.sbin/tftp-proxy/tftp-proxy.c index 102c34f4d42..1d494bbc5f4 100644 --- a/usr.sbin/tftp-proxy/tftp-proxy.c +++ b/usr.sbin/tftp-proxy/tftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftp-proxy.c,v 1.21 2017/07/04 12:47:51 florian Exp $ +/* $OpenBSD: tftp-proxy.c,v 1.22 2021/01/17 13:38:52 claudio Exp $ * * Copyright (c) 2005 DLS Internet Services * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -661,10 +661,8 @@ proxy_dst6(struct cmsghdr *cmsg, struct sockaddr_storage *ss) case IPV6_PKTINFO: memcpy(&sin6->sin6_addr, &ipi->ipi6_addr, sizeof(sin6->sin6_addr)); -#ifdef __KAME__ if (IN6_IS_ADDR_LINKLOCAL(&ipi->ipi6_addr)) sin6->sin6_scope_id = ipi->ipi6_ifindex; -#endif break; case IPV6_RECVDSTPORT: memcpy(&sin6->sin6_port, CMSG_DATA(cmsg), |