X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipv6cp.c;h=a80f222d908c203f0097354ba3a75c0a88b6fb00;hp=f444348f8dcbd1dfbfb7fa5b6d8776528dbd7fd4;hb=ff268e8e2eb130a0d3443b7e4974789ef67cada8;hpb=820cc91b8b57e1ec52cad6a9efafa128bcda2d7e

diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c
index f444348..a80f222 100644
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -95,10 +95,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipv6cp.c,v 1.6 1999/09/30 19:57:45 masputra Exp $ 
+ * $Id: ipv6cp.c,v 1.9 2000/04/15 01:27:11 masputra Exp $ 
  */
 
-#define RCSID	"$Id: ipv6cp.c,v 1.6 1999/09/30 19:57:45 masputra Exp $"
+#define RCSID	"$Id: ipv6cp.c,v 1.9 2000/04/15 01:27:11 masputra Exp $"
 
 /*
  * TODO: 
@@ -179,7 +179,7 @@ static fsm_callbacks ipv6cp_callbacks = { /* IPV6CP callback routines */
 static int setifaceid __P((char **arg));
 
 static option_t ipv6cp_option_list[] = {
-    { "ipv6", o_special, setifaceid,
+    { "ipv6", o_special, (void *)setifaceid,
       "Set interface identifiers for IPV6" },
     { "noipv6", o_bool, &ipv6cp_protent.enabled_flag,
       "Disable IPv6 and IPv6CP" },
@@ -916,14 +916,14 @@ ipv6cp_reqci(f, inp, len, reject_if_disagree)
 		orc = CONFREJ;
 		break;
 	    }
-#else
-	    orc = CONFREJ;
-	    break;
-#endif
 
 	    ho->neg_vj = 1;
 	    ho->vj_protocol = cishort;
 	    break;
+#else
+	    orc = CONFREJ;
+	    break;
+#endif
 
 	default:
 	    orc = CONFREJ;
@@ -1120,8 +1120,8 @@ ipv6cp_up(f)
 	    return;
 	}
     }
-    script_setenv("LLLOCAL", llv6_ntoa(go->ourid));
-    script_setenv("LLREMOTE", llv6_ntoa(ho->hisid));
+    script_setenv("LLLOCAL", llv6_ntoa(go->ourid), 0);
+    script_setenv("LLREMOTE", llv6_ntoa(ho->hisid), 0);
 
 #ifdef IPV6CP_COMP
     /* set tcp compression */
@@ -1203,12 +1203,6 @@ ipv6cp_up(f)
     np_up(f->unit, PPP_IPV6);
     ipv6cp_is_up = 1;
 
-    /*
-     * In Solaris, neighbor discovery and router advertisement are done
-     * automatically by in.ndpd daemon when the interface comes up or down
-     * and /etc/inet/ndpd.conf is configured properly
-     */
-#if !defined(SOL2)
     /*
      * Execute the ipv6-up script, like this:
      *	/etc/ppp/ipv6-up interface tty speed local-LL remote-LL
@@ -1217,7 +1211,6 @@ ipv6cp_up(f)
 	ipv6cp_script_state = s_up;
 	ipv6cp_script(_PATH_IPV6UP);
     }
-#endif /* !defined(SOL2) */
 }
 
 
@@ -1264,18 +1257,11 @@ ipv6cp_down(f)
 #endif
     }
 
-    /*
-     * In Solaris, neighbor discovery and router advertisement are done
-     * automatically by in.ndpd daemon when the interface comes up or down
-     * and /etc/inet/ndpd.conf is configured properly
-     */
-#if !defined(SOL2)
     /* Execute the ipv6-down script */
     if (ipv6cp_script_state == s_up && ipv6cp_script_pid == 0) {
 	ipv6cp_script_state = s_down;
 	ipv6cp_script(_PATH_IPV6DOWN);
     }
-#endif /* !defined(SOL2) */
 }
 
 
@@ -1437,7 +1423,7 @@ ipv6cp_printpkt(p, plen, printer, arg)
     case TERMREQ:
 	if (len > 0 && *p >= ' ' && *p < 0x7f) {
 	    printer(arg, " ");
-	    print_string(p, len, printer, arg);
+	    print_string((char *)p, len, printer, arg);
 	    p += len;
 	    len = 0;
 	}