Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use correct function

Browse Source
This commit is contained in:
christos 2013-10-19 15:59:15 +00:00
parent 04908d82dd
commit 740c6aa538
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/ifconfig/tunnel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tunnel.c,v 1.19 2013/10/19 15:50:26 christos Exp $ */ /* $NetBSD: tunnel.c,v 1.20 2013/10/19 15:59:15 christos Exp $ */
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
@ -31,7 +31,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: tunnel.c,v 1.19 2013/10/19 15:50:26 christos Exp $"); __RCSID("$NetBSD: tunnel.c,v 1.20 2013/10/19 15:59:15 christos Exp $");
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -126,7 +126,7 @@ settunnel(prop_dictionary_t env, prop_dictionary_t oenv)
errx(EXIT_FAILURE, "tunnel src/dst is multicast"); errx(EXIT_FAILURE, "tunnel src/dst is multicast");
/* embed scopeid */ /* embed scopeid */
inet6_putscopeid(s6, INET6_IS_ADDR_LINKLOCAL); inet6_putscopeid(s6, INET6_IS_ADDR_LINKLOCAL);
inet6_getscopeid(d, INET6_IS_ADDR_LINKLOCAL); inet6_putscopeid(d, INET6_IS_ADDR_LINKLOCAL);
} }
#endif /* INET6 */ #endif /* INET6 */

8
sbin/route/route.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: route.c,v 1.143 2013/10/19 15:50:26 christos Exp $ */ /* $NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $ */
/* /*
* Copyright (c) 1983, 1989, 1991, 1993 * Copyright (c) 1983, 1989, 1991, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1991, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: route.c,v 1.143 2013/10/19 15:50:26 christos Exp $"); __RCSID("$NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -696,7 +696,7 @@ netname(const struct sockaddr *sa, struct sockaddr *nm)
memcpy(&sin6, sa, sa->sa_len); memcpy(&sin6, sa, sa->sa_len);
sin6.sin6_len = sizeof(struct sockaddr_in6); sin6.sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_family = AF_INET6; sin6.sin6_family = AF_INET6;
inet6_putscopeid(&sin6, INET6_IS_ADDR_LINKLOCAL| inet6_getscopeid(&sin6, INET6_IS_ADDR_LINKLOCAL|
INET6_IS_ADDR_MC_LINKLOCAL); INET6_IS_ADDR_MC_LINKLOCAL);
nml = netmask_length(nm, AF_INET6); nml = netmask_length(nm, AF_INET6);
if (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr)) { if (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr)) {
@ -1237,7 +1237,7 @@ getaddr(int which, const char *s, struct hostent **hpp, struct sou *soup)
} }
memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6)); memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6));
freeaddrinfo(res); freeaddrinfo(res);
inet6_getscopeid(&su->sin6, INET6_IS_ADDR_LINKLOCAL| inet6_putscopeid(&su->sin6, INET6_IS_ADDR_LINKLOCAL|
INET6_IS_ADDR_MC_LINKLOCAL); INET6_IS_ADDR_MC_LINKLOCAL);
if (hints.ai_flags == AI_NUMERICHOST) { if (hints.ai_flags == AI_NUMERICHOST) {
if (slash) if (slash)