IPv6 supported ppp from freebsd-current.

kame · Sep 3, 2001 · c5bbdc6 · c5bbdc6
1 parent 24a41b7
commit c5bbdc6
Show file tree

Hide file tree

Showing 108 changed files with 15,553 additions and 3,288 deletions.
diff --git a/freebsd4/usr.sbin/ppp/Makefile b/freebsd4/usr.sbin/ppp/Makefile
@@ -1,28 +1,38 @@
-# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.73.2.2 2000/08/19 09:29:59 brian Exp $
+# $FreeBSD: src/usr.sbin/ppp/Makefile,v 1.91 2001/08/14 16:05:50 brian Exp $
 
 PROG=	ppp
+MAN=	ppp.8
 SRCS=	acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
 	command.c datalink.c deflate.c defs.c exec.c filter.c fsm.c hdlc.c \
-	iface.c ip.c ipcp.c iplist.c lcp.c link.c log.c lqr.c main.c \
+	iface.c ip.c ipcp.c ipv6cp.c iplist.c lcp.c link.c log.c lqr.c main.c \
-	mbuf.c mp.c pap.c physical.c pred.c probe.c prompt.c proto.c route.c \
+	mbuf.c mp.c ncp.c ncpaddr.c pap.c physical.c pred.c probe.c prompt.c \
-	server.c sig.c slcompress.c sync.c systems.c tcp.c throughput.c \
+	proto.c route.c server.c sig.c slcompress.c sync.c systems.c tcp.c \
-	timer.c tty.c tun.c udp.c vjcomp.c
+	tcpmss.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c
-CFLAGS+=-Wall
-LDADD+= -lcrypt -lmd -lutil -lz
-DPADD+=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
 .if defined(NOSUID) || defined(PPP_NOSUID)
 BINMODE=554
 .else
 BINMODE=4554
 BINOWN=	root
 .endif
 BINGRP=	network
-MAN8=	ppp.8
+M4FLAGS=
+
+LDADD= -lcrypt -lmd -lutil -lz
+DPADD=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
+
+.SUFFIXES: .8 .8.m4
+
+.8.m4.8:
+	m4 ${M4FLAGS} ${.IMPSRC} >${.TARGET}
 
 .if defined(RELEASE_CRUNCH)
 CFLAGS+=-DRELEASE_CRUNCH
 .endif
 
+.if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR)
+CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
+.endif
+
 .if defined(NOKLDLOAD)
 CFLAGS+=-DNOKLDLOAD
 .endif
@@ -41,6 +51,12 @@ DPADD+= ${LIBALIAS}
 .endif
 .endif
 
+.if defined(NOATM) || defined(RELEASE_CRUNCH)
+CFLAGS+=-DNOATM
+.else
+SRCS+=	atm.c
+.endif
+
 .if defined(NOSUID) || defined(PPP_NOSUID)
 CFLAGS+=-DNOSUID
 .else
@@ -52,7 +68,7 @@ SRCS+=	id.c
 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 CFLAGS+=-DHAVE_DES
-SRCS+=	chap_ms.c
+SRCS+=	chap_ms.c mppe.c
 LDADD+= -lcrypto
 DPADD+= ${LIBCRYPTO}
 .endif
@@ -82,13 +98,7 @@ DPADD+= ${LIBNETGRAPH}
 .endif
 
 .if defined(RELEASE_CRUNCH)
-# We must create these objects because crunchgen will link them,
-# and we don't want any unused symbols to spoil the final link.
 CFLAGS+=-DNONAT -DNORADIUS -DNOI4B -DNOSUID
-OBJS+=	chap_ms.o id.o nat_cmd.o radius.o
-chap_ms.o id.o nat_cmd.o radius.o:
-	>null_${.PREFIX}.c
-	cc -c -o ${.TARGET} null_${.PREFIX}.c
 .endif
 
 .include <bsd.prog.mk>
diff --git a/freebsd4/usr.sbin/ppp/README.changes b/freebsd4/usr.sbin/ppp/README.changes
@@ -1,4 +1,29 @@
-$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.16.2.3 2000/08/19 09:29:59 brian Exp $
+Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
+              based on work by Eivind Eklund <perhaps@yes.no>,
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+$FreeBSD: src/usr.sbin/ppp/README.changes,v 1.23 2001/06/04 14:38:28 brian Exp $
 
 This file summarises changes made to ppp that effect
 its configuration.
@@ -106,3 +131,10 @@ o The ``!'' at the start of chat scripts and authkey can be made literal
   (rather than meaning execute) by doubling it to ``!!''.
 o MP autoload throughput measurements are now based on the maximum of input
   and output averages rather than on the total.
+o When only one link is open in MP mode, MP link level compression is not
+  open and the peer MRU >= the peer MRRU, ppp sends outbound traffic as
+  PROTO_IP traffic rather than PROTO_MP.
+o MSCHAPv2 is now accepted by default.  If you don't wish to negotiate
+  this, you must explicitly deny it.
+o MPPE is enabled and accepted by default (although deflate and predictor1
+  are preferred.
diff --git a/freebsd4/usr.sbin/ppp/README.devel b/freebsd4/usr.sbin/ppp/README.devel
@@ -1,3 +1,31 @@
+Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
+              based on work by Eivind Eklund <perhaps@yes.no>,
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+$FreeBSD: src/usr.sbin/ppp/README.devel,v 1.5 2001/06/04 14:38:28 brian Exp $
+
+This file summarises changes made to ppp that effect
 This program was originally written by Toshiharu OHNO <tony-o@iij.ad.jp>,
 and was submitted to FreeBSD-2.0.5 by Atsushi Murai <amurai@spec.co.jp>.
 The original version was usually referred to as iij-ppp.