Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin use correct function



details:   https://anonhg.NetBSD.org/src/rev/8c78b49e2843
branches:  trunk
changeset: 790690:8c78b49e2843
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Oct 19 15:59:15 2013 +0000

description:
use correct function

diffstat:

 sbin/ifconfig/tunnel.c |  6 +++---
 sbin/route/route.c     |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r eeb7a7f08a02 -r 8c78b49e2843 sbin/ifconfig/tunnel.c
--- a/sbin/ifconfig/tunnel.c    Sat Oct 19 15:56:05 2013 +0000
+++ b/sbin/ifconfig/tunnel.c    Sat Oct 19 15:59:15 2013 +0000
@@ -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 @@
                        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 */
 
diff -r eeb7a7f08a02 -r 8c78b49e2843 sbin/route/route.c
--- a/sbin/route/route.c        Sat Oct 19 15:56:05 2013 +0000
+++ b/sbin/route/route.c        Sat Oct 19 15:59:15 2013 +0000
@@ -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 @@
 #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 @@
                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 @@
                }
                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)



Home | Main Index | Thread Index | Old Index