Module Name: src
Committed By: christos
Date: Sat Oct 19 15:59:15 UTC 2013
Modified Files:
src/sbin/ifconfig: tunnel.c
src/sbin/route: route.c
Log Message:
use correct function
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/tunnel.c
cvs rdiff -u -r1.143 -r1.144 src/sbin/route/route.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/tunnel.c
diff -u src/sbin/ifconfig/tunnel.c:1.19 src/sbin/ifconfig/tunnel.c:1.20
--- src/sbin/ifconfig/tunnel.c:1.19 Sat Oct 19 11:50:26 2013
+++ src/sbin/ifconfig/tunnel.c Sat Oct 19 11:59:15 2013
@@ -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
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#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 */
#include <sys/param.h>
@@ -126,7 +126,7 @@ settunnel(prop_dictionary_t env, prop_di
errx(EXIT_FAILURE, "tunnel src/dst is multicast");
/* embed scopeid */
inet6_putscopeid(s6, INET6_IS_ADDR_LINKLOCAL);
- inet6_getscopeid(d, INET6_IS_ADDR_LINKLOCAL);
+ inet6_putscopeid(d, INET6_IS_ADDR_LINKLOCAL);
}
#endif /* INET6 */
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.143 src/sbin/route/route.c:1.144
--- src/sbin/route/route.c:1.143 Sat Oct 19 11:50:26 2013
+++ src/sbin/route/route.c Sat Oct 19 11:59:15 2013
@@ -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
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#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 /* not lint */
@@ -696,7 +696,7 @@ netname(const struct sockaddr *sa, struc
memcpy(&sin6, sa, sa->sa_len);
sin6.sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_family = AF_INET6;
- inet6_putscopeid(&sin6, INET6_IS_ADDR_LINKLOCAL|
+ inet6_getscopeid(&sin6, INET6_IS_ADDR_LINKLOCAL|
INET6_IS_ADDR_MC_LINKLOCAL);
nml = netmask_length(nm, AF_INET6);
if (IN6_IS_ADDR_UNSPECIFIED(&sin6.sin6_addr)) {
@@ -1237,7 +1237,7 @@ getaddr(int which, const char *s, struct
}
memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6));
freeaddrinfo(res);
- inet6_getscopeid(&su->sin6, INET6_IS_ADDR_LINKLOCAL|
+ inet6_putscopeid(&su->sin6, INET6_IS_ADDR_LINKLOCAL|
INET6_IS_ADDR_MC_LINKLOCAL);
if (hints.ai_flags == AI_NUMERICHOST) {
if (slash)
