summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ppp/bundle.c
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2001-08-15 13:53:38 +0000
committerbrian <brian@FreeBSD.org>2001-08-15 13:53:38 +0000
commit1b1f9ae87849ba39b6e788293de28036e0b1dd38 (patch)
treeeaaf26c704b6c4694590d7b0932894ce1fe8067f /usr.sbin/ppp/bundle.c
parentbbebfb9f8c06d991af6a4d982893bb211e80d572 (diff)
downloadFreeBSD-src-1b1f9ae87849ba39b6e788293de28036e0b1dd38.zip
FreeBSD-src-1b1f9ae87849ba39b6e788293de28036e0b1dd38.tar.gz
Probe for the availability of AF_INET6 at startup. If it's not
available, default ipv6cp to disabled and refuse to let the user enable it.
Diffstat (limited to 'usr.sbin/ppp/bundle.c')
-rw-r--r--usr.sbin/ppp/bundle.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index d00aaa1..adf5257 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -99,6 +99,7 @@
#include "datalink.h"
#include "iface.h"
#include "server.h"
+#include "probe.h"
#ifdef HAVE_DES
#include "mppe.h"
#endif
@@ -809,10 +810,12 @@ bundle_Create(const char *prefix, int type, int unit)
*bundle.cfg.auth.name = '\0';
*bundle.cfg.auth.key = '\0';
bundle.cfg.opt = OPT_IDCHECK | OPT_LOOPBACK | OPT_SROUTES | OPT_TCPMSSFIXUP |
+ OPT_THROUGHPUT | OPT_UTMP;
#ifndef NOINET6
- OPT_IPCP | OPT_IPV6CP |
+ bundle.cfg.opt |= OPT_IPCP;
+ if (probe.ipv6_available)
+ bundle.cfg.opt |= OPT_IPV6CP;
#endif
- OPT_THROUGHPUT | OPT_UTMP;
*bundle.cfg.label = '\0';
bundle.cfg.ifqueue = DEF_IFQUEUE;
bundle.cfg.choked.timeout = CHOKED_TIMEOUT;
OpenPOWER on IntegriCloud