X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipv6cp.c;h=0026f54562e77e3c8b622f8147090fe550385c61;hp=3a370a0caa96fe55a5486c9a4c6730aeb2f8efc2;hb=fd25394d146bb83043189608d30dd0eeb983186d;hpb=0232ca8230065290dd165ffaecf8a96ec177c28d diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c index 3a370a0..0026f54 100644 --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c @@ -90,10 +90,10 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $ + * $Id: ipv6cp.c,v 1.16 2002/09/14 08:10:11 etbe Exp $ */ -#define RCSID "$Id: ipv6cp.c,v 1.15 2001/03/22 00:42:33 paulus Exp $" +#define RCSID "$Id: ipv6cp.c,v 1.16 2002/09/14 08:10:11 etbe Exp $" /* * TODO: @@ -193,7 +193,7 @@ static option_t ipv6cp_option_list[] = { { "ipv6cp-use-ipaddr", o_bool, &ipv6cp_allowoptions[0].use_ip, "Use (default) IPv4 address as interface identifier", 1 }, -#if defined(SOL2) +#if defined(SOL2) || defined(__linux__) { "ipv6cp-use-persistent", o_bool, &ipv6cp_wantoptions[0].use_persistent, "Use uniquely-available persistent value for link local address", 1 }, #endif /* defined(SOL2) */ @@ -330,6 +330,8 @@ setifaceid(argv) return 1; } +char *llv6_ntoa(eui64_t ifaceid); + static void printifaceid(opt, printer, arg) option_t *opt; @@ -1027,7 +1029,7 @@ ipv6_check_options() if (!ipv6cp_protent.enabled_flag) return; -#if defined(SOL2) +#if defined(SOL2) || defined(__linux__) /* * Persistent link-local id is only used when user has not explicitly * configure/hard-code the id