diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-17 13:38:30 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-17 13:38:30 +0000 |
| commit | 484dac4afdf9b2af5002877515e9562f93501d9c (patch) | |
| tree | 95aaa85704bf8d4eb53814fe6e0e364f811c56b7 /usr.sbin/tftpd/tftpd.c | |
| parent | revert the previous, it makes everything think it can do 16.0 GT/s. (diff) | |
| download | wireguard-openbsd-484dac4afdf9b2af5002877515e9562f93501d9c.tar.xz wireguard-openbsd-484dac4afdf9b2af5002877515e9562f93501d9c.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@
Diffstat (limited to 'usr.sbin/tftpd/tftpd.c')
| -rw-r--r-- | usr.sbin/tftpd/tftpd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index 75666c1c104..7521114b6ea 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.45 2020/12/17 02:06:23 krw Exp $ */ +/* $OpenBSD: tftpd.c,v 1.46 2021/01/17 13:38:30 claudio Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -729,11 +729,9 @@ tftpd_recv(int fd, short events, void *arg) ipi = (struct in6_pktinfo *)CMSG_DATA(cmsg); memcpy(&((struct sockaddr_in6 *)&s_in)->sin6_addr, &ipi->ipi6_addr, sizeof(struct in6_addr)); -#ifdef __KAME__ if (IN6_IS_ADDR_LINKLOCAL(&ipi->ipi6_addr)) ((struct sockaddr_in6 *)&s_in)->sin6_scope_id = ipi->ipi6_ifindex; -#endif break; } } |