From 0391f793f0bfca4220b91439862c496787348e27 Mon Sep 17 00:00:00 2001 From: Claudio Jeker Date: Sun, 17 Jan 2021 13:38:53 +0000 Subject: 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@ --- usr.sbin/tftp-proxy/tftp-proxy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'usr.sbin/tftp-proxy') 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, @@ -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), -- cgit v1.2.3