mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Remove a __KAME__ block for extracting the scope_id from IPV6_PKTINFO.

Browse Source 
struct in6_pktinfo includes the interface index in ipi6_ifindex but no
struct sockaddr_in6.
OK jca@
This commit is contained in:
claudio 2021-01-17 13:38:52 +00:00
parent 484dac4afd
commit 2ada0f0db4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/tftp-proxy/tftp-proxy.c
View File

@ -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),