[src/trunk]: src/usr.sbin/pppd/pppd turn on IPv6 when ipv6 ifid is present (f...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/245f68dbf201
branches:  trunk
changeset: 485039:245f68dbf201
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Apr 17 08:55:33 2000 +0000

description:
turn on IPv6 when ipv6 ifid is present (from 2.3.11)
don't check for Ipv6 ifid readiness on on-demand dialing, when IPv6CP
is disabled.  From: Fong Siu Lung Gordon <ein%hkstar.com@localhost>

diffstat:

 usr.sbin/pppd/pppd/ipv6cp.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 51d3e6a1d62b -r 245f68dbf201 usr.sbin/pppd/pppd/ipv6cp.c
--- a/usr.sbin/pppd/pppd/ipv6cp.c       Mon Apr 17 07:57:21 2000 +0000
+++ b/usr.sbin/pppd/pppd/ipv6cp.c       Mon Apr 17 08:55:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipv6cp.c,v 1.5 2000/04/17 06:13:18 itojun Exp $        */
+/*     $NetBSD: ipv6cp.c,v 1.6 2000/04/17 08:55:33 itojun Exp $        */
 
 /*
  * ipv6cp.c - PPP IPV6 Control Protocol.
@@ -35,7 +35,7 @@
 #if 0
 #define RCSID  "Id: ipv6cp.c,v 1.3 1999/08/24 05:31:09 paulus Exp "
 #else
-__RCSID("$NetBSD: ipv6cp.c,v 1.5 2000/04/17 06:13:18 itojun Exp $");
+__RCSID("$NetBSD: ipv6cp.c,v 1.6 2000/04/17 08:55:33 itojun Exp $");
 #endif
 #endif
 
@@ -255,6 +255,7 @@
        wo->opt_remote = 1;
     }
 
+    ipv6cp_protent.enabled_flag = 1;
     return 1;
 }
 
@@ -937,6 +938,9 @@
 {
     ipv6cp_options *wo = &ipv6cp_wantoptions[0];
 
+    if (!ipv6cp_protent.enabled_flag)
+       return;
+
     if (!wo->opt_local) {      /* init interface identifier */
        if (wo->use_ip && eui64_iszero(wo->ourid)) {
            eui64_setlo32(wo->ourid, ntohl(ipcp_wantoptions[0].ouraddr));