[Midnightbsd-cvs] src [10362] trunk/usr.sbin/ppp: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 19:05:06 EDT 2018
Revision: 10362
http://svnweb.midnightbsd.org/src/?rev=10362
Author: laffer1
Date: 2018-06-03 19:05:05 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/usr.sbin/ppp/Makefile
trunk/usr.sbin/ppp/acf.c
trunk/usr.sbin/ppp/acf.h
trunk/usr.sbin/ppp/arp.c
trunk/usr.sbin/ppp/arp.h
trunk/usr.sbin/ppp/async.c
trunk/usr.sbin/ppp/async.h
trunk/usr.sbin/ppp/atm.c
trunk/usr.sbin/ppp/atm.h
trunk/usr.sbin/ppp/auth.c
trunk/usr.sbin/ppp/auth.h
trunk/usr.sbin/ppp/bundle.c
trunk/usr.sbin/ppp/bundle.h
trunk/usr.sbin/ppp/cbcp.c
trunk/usr.sbin/ppp/cbcp.h
trunk/usr.sbin/ppp/ccp.c
trunk/usr.sbin/ppp/ccp.h
trunk/usr.sbin/ppp/chap.c
trunk/usr.sbin/ppp/chap.h
trunk/usr.sbin/ppp/chap_ms.c
trunk/usr.sbin/ppp/chap_ms.h
trunk/usr.sbin/ppp/chat.c
trunk/usr.sbin/ppp/chat.h
trunk/usr.sbin/ppp/command.c
trunk/usr.sbin/ppp/command.h
trunk/usr.sbin/ppp/datalink.c
trunk/usr.sbin/ppp/datalink.h
trunk/usr.sbin/ppp/deflate.c
trunk/usr.sbin/ppp/deflate.h
trunk/usr.sbin/ppp/defs.c
trunk/usr.sbin/ppp/defs.h
trunk/usr.sbin/ppp/descriptor.h
trunk/usr.sbin/ppp/ether.c
trunk/usr.sbin/ppp/ether.h
trunk/usr.sbin/ppp/exec.c
trunk/usr.sbin/ppp/exec.h
trunk/usr.sbin/ppp/filter.c
trunk/usr.sbin/ppp/filter.h
trunk/usr.sbin/ppp/fsm.c
trunk/usr.sbin/ppp/fsm.h
trunk/usr.sbin/ppp/hdlc.c
trunk/usr.sbin/ppp/hdlc.h
trunk/usr.sbin/ppp/id.c
trunk/usr.sbin/ppp/id.h
trunk/usr.sbin/ppp/iface.c
trunk/usr.sbin/ppp/iface.h
trunk/usr.sbin/ppp/ip.c
trunk/usr.sbin/ppp/ip.h
trunk/usr.sbin/ppp/ipcp.c
trunk/usr.sbin/ppp/ipcp.h
trunk/usr.sbin/ppp/iplist.c
trunk/usr.sbin/ppp/iplist.h
trunk/usr.sbin/ppp/ipv6cp.c
trunk/usr.sbin/ppp/ipv6cp.h
trunk/usr.sbin/ppp/layer.h
trunk/usr.sbin/ppp/lcp.c
trunk/usr.sbin/ppp/lcp.h
trunk/usr.sbin/ppp/link.c
trunk/usr.sbin/ppp/link.h
trunk/usr.sbin/ppp/log.c
trunk/usr.sbin/ppp/log.h
trunk/usr.sbin/ppp/lqr.c
trunk/usr.sbin/ppp/lqr.h
trunk/usr.sbin/ppp/main.c
trunk/usr.sbin/ppp/main.h
trunk/usr.sbin/ppp/mbuf.c
trunk/usr.sbin/ppp/mbuf.h
trunk/usr.sbin/ppp/mp.c
trunk/usr.sbin/ppp/mp.h
trunk/usr.sbin/ppp/mppe.c
trunk/usr.sbin/ppp/mppe.h
trunk/usr.sbin/ppp/nat_cmd.c
trunk/usr.sbin/ppp/nat_cmd.h
trunk/usr.sbin/ppp/ncp.c
trunk/usr.sbin/ppp/ncp.h
trunk/usr.sbin/ppp/ncpaddr.c
trunk/usr.sbin/ppp/ncpaddr.h
trunk/usr.sbin/ppp/netgraph.c
trunk/usr.sbin/ppp/netgraph.h
trunk/usr.sbin/ppp/pap.c
trunk/usr.sbin/ppp/pap.h
trunk/usr.sbin/ppp/physical.c
trunk/usr.sbin/ppp/physical.h
trunk/usr.sbin/ppp/pred.c
trunk/usr.sbin/ppp/pred.h
trunk/usr.sbin/ppp/probe.c
trunk/usr.sbin/ppp/probe.h
trunk/usr.sbin/ppp/prompt.c
trunk/usr.sbin/ppp/prompt.h
trunk/usr.sbin/ppp/proto.c
trunk/usr.sbin/ppp/proto.h
trunk/usr.sbin/ppp/radius.c
trunk/usr.sbin/ppp/radius.h
trunk/usr.sbin/ppp/route.c
trunk/usr.sbin/ppp/route.h
trunk/usr.sbin/ppp/server.c
trunk/usr.sbin/ppp/server.h
trunk/usr.sbin/ppp/sig.c
trunk/usr.sbin/ppp/sig.h
trunk/usr.sbin/ppp/slcompress.c
trunk/usr.sbin/ppp/slcompress.h
trunk/usr.sbin/ppp/sync.c
trunk/usr.sbin/ppp/sync.h
trunk/usr.sbin/ppp/systems.c
trunk/usr.sbin/ppp/systems.h
trunk/usr.sbin/ppp/tcp.c
trunk/usr.sbin/ppp/tcp.h
trunk/usr.sbin/ppp/tcpmss.c
trunk/usr.sbin/ppp/tcpmss.h
trunk/usr.sbin/ppp/throughput.c
Modified: trunk/usr.sbin/ppp/Makefile
===================================================================
--- trunk/usr.sbin/ppp/Makefile 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/Makefile 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/ppp/Makefile 278569 2015-02-11 08:52:29Z ngie $
.include <bsd.own.mk>
@@ -31,11 +32,14 @@
.if ${MK_PAM_SUPPORT} == "no"
PPP_NO_PAM=
.endif
+.if ${MK_RADIUS_SUPPORT} == "no"
+PPP_NO_RADIUS=
+.endif
.if defined(PPP_NO_SUID)
-BINMODE=550
+BINMODE=554
.else
-BINMODE=4550
+BINMODE=4554
BINOWN= root
.endif
BINGRP= network
@@ -44,13 +48,6 @@
LDADD= -lcrypt -lmd -lutil -lz
DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
-.SUFFIXES: .8 .8.m4
-
-.8.m4.8:
- m4 ${M4FLAGS} ${.IMPSRC} >${.TARGET}
-
-CLEANFILES= ppp.8
-
.if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR)
CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
.endif
Modified: trunk/usr.sbin/ppp/acf.c
===================================================================
--- trunk/usr.sbin/ppp/acf.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/acf.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/acf.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/acf.h
===================================================================
--- trunk/usr.sbin/ppp/acf.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/acf.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/acf.h 50479 1999-08-28 01:35:59Z peter $
*/
struct lcp;
Modified: trunk/usr.sbin/ppp/arp.c
===================================================================
--- trunk/usr.sbin/ppp/arp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/arp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* sys-bsd.c - System-dependent procedures for setting up
* PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.)
@@ -17,7 +18,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/arp.c 246143 2013-01-31 08:55:21Z glebius $
*
*/
@@ -91,7 +92,7 @@
*/
static struct {
struct rt_msghdr hdr;
- struct sockaddr_inarp dst;
+ struct sockaddr_in dst;
struct sockaddr_dl hwa;
char extra[128];
} arpmsg;
@@ -124,10 +125,9 @@
arpmsg.hdr.rtm_seq = ++bundle->routing_seq;
arpmsg.hdr.rtm_addrs = RTA_DST | RTA_GATEWAY;
arpmsg.hdr.rtm_inits = RTV_EXPIRE;
- arpmsg.dst.sin_len = sizeof(struct sockaddr_inarp);
+ arpmsg.dst.sin_len = sizeof(struct sockaddr_in);
arpmsg.dst.sin_family = AF_INET;
arpmsg.dst.sin_addr.s_addr = addr.s_addr;
- arpmsg.dst.sin_other = SIN_PROXY;
arpmsg.hdr.rtm_msglen = (char *) &arpmsg.hwa - (char *) &arpmsg
+ arpmsg.hwa.sdl_len;
Modified: trunk/usr.sbin/ppp/arp.h
===================================================================
--- trunk/usr.sbin/ppp/arp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/arp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/arp.h 134789 2004-09-05 01:46:52Z brian $
*/
struct sockaddr_dl;
Modified: trunk/usr.sbin/ppp/async.c
===================================================================
--- trunk/usr.sbin/ppp/async.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/async.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -28,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/ppp/async.c 134789 2004-09-05 01:46:52Z brian $");
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/async.h
===================================================================
--- trunk/usr.sbin/ppp/async.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/async.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/async.h 93418 2002-03-30 12:30:09Z brian $
*/
#define HDLCSIZE (MAX_MRU*2+6)
Modified: trunk/usr.sbin/ppp/atm.c
===================================================================
--- trunk/usr.sbin/ppp/atm.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/atm.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Jakob Stoklund Olesen <stoklund at taxidriver.dk>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/atm.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/atm.h
===================================================================
--- trunk/usr.sbin/ppp/atm.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/atm.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Jakob Stoklund Olesen <stoklund at taxidriver.dk>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/atm.h 134789 2004-09-05 01:46:52Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/auth.c
===================================================================
--- trunk/usr.sbin/ppp/auth.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/auth.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/auth.c 231994 2012-02-22 06:27:20Z kevlo $
*/
#include <sys/param.h>
@@ -126,9 +127,11 @@
/* Then look up the real password database */
struct passwd *pw;
int result;
+ char *cryptpw;
+ cryptpw = crypt(key, pw->pw_passwd);
result = (pw = getpwnam(name)) &&
- !strcmp(crypt(key, pw->pw_passwd), pw->pw_passwd);
+ (cryptpw == NULL || !strcmp(cryptpw, pw->pw_passwd));
endpwent();
return result;
#else /* !NOPAM */
Modified: trunk/usr.sbin/ppp/auth.h
===================================================================
--- trunk/usr.sbin/ppp/auth.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/auth.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/auth.h 134789 2004-09-05 01:46:52Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/bundle.c
===================================================================
--- trunk/usr.sbin/ppp/bundle.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/bundle.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/bundle.c 218397 2011-02-07 11:18:18Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/bundle.h
===================================================================
--- trunk/usr.sbin/ppp/bundle.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/bundle.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/bundle.h 138198 2004-11-29 17:11:15Z brian $
*/
#define PHASE_DEAD 0 /* Link is dead */
Modified: trunk/usr.sbin/ppp/cbcp.c
===================================================================
--- trunk/usr.sbin/ppp/cbcp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/cbcp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/cbcp.c 228990 2011-12-30 10:58:14Z uqs $
*/
#include <sys/param.h>
@@ -353,7 +354,7 @@
cbcp_AdjustResponse(struct cbcp *cbcp, struct cbcp_data *data)
{
/*
- * We've received a REQ (data). Adjust our reponse (cbcp->fsm.*)
+ * We've received a REQ (data). Adjust our response (cbcp->fsm.*)
* so that we (hopefully) agree with the peer
*/
struct cbcp_addr *addr;
Modified: trunk/usr.sbin/ppp/cbcp.h
===================================================================
--- trunk/usr.sbin/ppp/cbcp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/cbcp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/cbcp.h 50479 1999-08-28 01:35:59Z peter $
*/
struct mbuf;
Modified: trunk/usr.sbin/ppp/ccp.c
===================================================================
--- trunk/usr.sbin/ppp/ccp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ccp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ccp.c 136375 2004-10-11 09:45:58Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/ccp.h
===================================================================
--- trunk/usr.sbin/ppp/ccp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ccp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ccp.h 98132 2002-06-12 00:33:17Z brian $
*/
#define CCP_MAXCODE CODE_RESETACK
Modified: trunk/usr.sbin/ppp/chap.c
===================================================================
--- trunk/usr.sbin/ppp/chap.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chap.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chap.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/chap.h
===================================================================
--- trunk/usr.sbin/ppp/chap.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chap.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chap.h 173710 2007-11-17 23:14:06Z jb $
*/
struct mbuf;
Modified: trunk/usr.sbin/ppp/chap_ms.c
===================================================================
--- trunk/usr.sbin/ppp/chap_ms.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chap_ms.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Gabor Kincses <gabor at acm.org>
* 1997 - 2001 Brian Somers <brian at Awfulhak.org>
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chap_ms.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <ctype.h>
Modified: trunk/usr.sbin/ppp/chap_ms.h
===================================================================
--- trunk/usr.sbin/ppp/chap_ms.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chap_ms.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Gabor Kincses <gabor at acm.org>
* 1997 - 2001 Brian Somers <brian at Awfulhak.org>
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chap_ms.h 134789 2004-09-05 01:46:52Z brian $
*/
/* Max # of (Unicode) chars in an NT password */
Modified: trunk/usr.sbin/ppp/chat.c
===================================================================
--- trunk/usr.sbin/ppp/chat.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chat.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chat.c 262287 2014-02-21 09:25:52Z brueffer $
*/
#include <sys/param.h>
@@ -154,6 +155,11 @@
else {
/* c->state = CHAT_EXPECT; */
c->argptr = &arg_term;
+ /*
+ We have to clear the input buffer, because it contains output
+ from the previous (timed out) command.
+ */
+ c->bufstart = c->bufend;
}
c->TimedOut = 0;
}
Modified: trunk/usr.sbin/ppp/chat.h
===================================================================
--- trunk/usr.sbin/ppp/chat.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/chat.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/chat.h 228990 2011-12-30 10:58:14Z uqs $
*/
#define CHAT_EXPECT 0
@@ -52,8 +53,8 @@
char *nargptr; /* Our next for expect-send-expect */
char buf[LINE_LEN*2]; /* Our input */
- char *bufstart; /* start of relevent data */
- char *bufend; /* end of relevent data */
+ char *bufstart; /* start of relevant data */
+ char *bufend; /* end of relevant data */
int TimeoutSec; /* Expect timeout value */
int TimedOut; /* We timed out */
Modified: trunk/usr.sbin/ppp/command.c
===================================================================
--- trunk/usr.sbin/ppp/command.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/command.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/command.c 249582 2013-04-17 11:40:10Z gabor $
*/
#include <sys/param.h>
@@ -416,7 +417,7 @@
static char *
strstrword(char *big, const char *little)
{
- /* Get the first occurance of the word ``little'' in ``big'' */
+ /* Get the first occurrence of the word ``little'' in ``big'' */
char *pos;
int len;
@@ -1852,13 +1853,13 @@
case PHASE_ESTABLISH:
/* Make sure none of our links are DATALINK_LCP or greater */
if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) {
- log_Printf(LogWARN, "mrru: Only changable before LCP negotiations\n");
+ log_Printf(LogWARN, "mrru: Only changeable before LCP negotiations\n");
res = 1;
break;
}
break;
default:
- log_Printf(LogWARN, "mrru: Only changable at phase DEAD/ESTABLISH\n");
+ log_Printf(LogWARN, "mrru: Only changeable at phase DEAD/ESTABLISH\n");
res = 1;
break;
}
@@ -2944,13 +2945,13 @@
case PHASE_ESTABLISH:
/* Make sure none of our links are DATALINK_LCP or greater */
if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) {
- log_Printf(LogWARN, "shortseq: Only changable before"
+ log_Printf(LogWARN, "shortseq: Only changeable before"
" LCP negotiations\n");
return 1;
}
break;
default:
- log_Printf(LogWARN, "shortseq: Only changable at phase"
+ log_Printf(LogWARN, "shortseq: Only changeable at phase"
" DEAD/ESTABLISH\n");
return 1;
}
Modified: trunk/usr.sbin/ppp/command.h
===================================================================
--- trunk/usr.sbin/ppp/command.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/command.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/command.h 85991 2001-11-03 21:45:32Z brian $
*/
struct cmdtab;
Modified: trunk/usr.sbin/ppp/datalink.c
===================================================================
--- trunk/usr.sbin/ppp/datalink.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/datalink.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/datalink.c 136375 2004-10-11 09:45:58Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/datalink.h
===================================================================
--- trunk/usr.sbin/ppp/datalink.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/datalink.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/datalink.h 136375 2004-10-11 09:45:58Z brian $
*/
#define DATALINK_CLOSED (0)
Modified: trunk/usr.sbin/ppp/deflate.c
===================================================================
--- trunk/usr.sbin/ppp/deflate.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/deflate.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/deflate.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/deflate.h
===================================================================
--- trunk/usr.sbin/ppp/deflate.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/deflate.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/deflate.h 50479 1999-08-28 01:35:59Z peter $
*/
extern const struct ccp_algorithm PppdDeflateAlgorithm;
Modified: trunk/usr.sbin/ppp/defs.c
===================================================================
--- trunk/usr.sbin/ppp/defs.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/defs.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/defs.c 252826 2013-07-05 19:26:01Z rmh $
*/
@@ -43,7 +44,7 @@
#include <sys/module.h>
#endif
#include <termios.h>
-#if !defined(__FreeBSD__) || __FreeBSD__ < 3
+#ifndef __FreeBSD__
#include <time.h>
#endif
#include <unistd.h>
@@ -56,20 +57,11 @@
#define issep(c) ((c) == '\t' || (c) == ' ')
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#ifdef __NetBSD__
void
randinit()
{
-#if defined(__FreeBSD__)
- static int initdone; /* srandomdev() call is only required once */
-
- if (!initdone) {
- initdone = 1;
- srandomdev();
- }
-#else
srandom((time(NULL)^getpid())+random());
-#endif
}
#endif
Modified: trunk/usr.sbin/ppp/defs.h
===================================================================
--- trunk/usr.sbin/ppp/defs.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/defs.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,12 +26,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/defs.h 330805 2018-03-12 17:37:38Z eugen $
*/
/* Check the following definitions for your machine environment */
#ifdef __FreeBSD__
-# define MODEM_LIST "/dev/cuad1\0/dev/cuad0" /* name of tty device */
+# define MODEM_LIST "/dev/cuau1\0/dev/cuau0" /* name of tty device */
#else
# ifdef __OpenBSD__
# define MODEM_LIST "/dev/cua01\0/dev/cua00" /* name of tty device */
@@ -117,7 +118,9 @@
#define ROUNDUP(x) ((x) ? (1 + (((x) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#if defined(__NetBSD__) || __FreeBSD__ < 3
+#define NCP_ASCIIBUFFERSIZE 52
+
+#ifdef __NetBSD__
extern void randinit(void);
#else
#define random arc4random
Modified: trunk/usr.sbin/ppp/descriptor.h
===================================================================
--- trunk/usr.sbin/ppp/descriptor.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/descriptor.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/descriptor.h 58028 2000-03-14 01:46:09Z brian $
*/
#define PHYSICAL_DESCRIPTOR (1)
Modified: trunk/usr.sbin/ppp/ether.c
===================================================================
--- trunk/usr.sbin/ppp/ether.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ether.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ether.c 196513 2009-08-24 17:18:17Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/ether.h
===================================================================
--- trunk/usr.sbin/ppp/ether.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ether.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ether.h 134789 2004-09-05 01:46:52Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/exec.c
===================================================================
--- trunk/usr.sbin/ppp/exec.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/exec.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/exec.c 196514 2009-08-24 17:19:45Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/exec.h
===================================================================
--- trunk/usr.sbin/ppp/exec.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/exec.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/exec.h 196514 2009-08-24 17:19:45Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/filter.c
===================================================================
--- trunk/usr.sbin/ppp/filter.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/filter.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/filter.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/filter.h
===================================================================
--- trunk/usr.sbin/ppp/filter.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/filter.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/filter.h 134789 2004-09-05 01:46:52Z brian $
*/
/* Operations - f_srcop, f_dstop */
Modified: trunk/usr.sbin/ppp/fsm.c
===================================================================
--- trunk/usr.sbin/ppp/fsm.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/fsm.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/fsm.c 134833 2004-09-06 00:07:58Z marcel $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/fsm.h
===================================================================
--- trunk/usr.sbin/ppp/fsm.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/fsm.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/fsm.h 165777 2007-01-05 00:33:00Z ticso $
*/
/*
Modified: trunk/usr.sbin/ppp/hdlc.c
===================================================================
--- trunk/usr.sbin/ppp/hdlc.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/hdlc.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/hdlc.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/hdlc.h
===================================================================
--- trunk/usr.sbin/ppp/hdlc.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/hdlc.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/hdlc.h 134789 2004-09-05 01:46:52Z brian $
*/
/*
Modified: trunk/usr.sbin/ppp/id.c
===================================================================
--- trunk/usr.sbin/ppp/id.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/id.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/id.c 202192 2010-01-13 17:54:32Z ed $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/id.h
===================================================================
--- trunk/usr.sbin/ppp/id.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/id.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/id.h 202192 2010-01-13 17:54:32Z ed $
*/
#ifndef NOSUID
Modified: trunk/usr.sbin/ppp/iface.c
===================================================================
--- trunk/usr.sbin/ppp/iface.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/iface.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/iface.c 330805 2018-03-12 17:37:38Z eugen $
*/
#include <sys/param.h>
@@ -209,7 +210,7 @@
#endif
struct sockaddr_in *me4, *msk4, *peer4;
struct sockaddr_storage ssme, sspeer, ssmsk;
- int res;
+ int res, saved_errno;
ncprange_getsa(&addr->ifa, &ssme, &ssmsk);
ncpaddr_getsa(&addr->peer, &sspeer);
@@ -235,8 +236,9 @@
memcpy(peer4, &sspeer, sizeof *peer4);
res = ID0ioctl(s, SIOCDIFADDR, &ifra);
+ saved_errno = errno;
if (log_IsKept(LogDEBUG)) {
- char buf[100];
+ char buf[NCP_ASCIIBUFFERSIZE];
snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa));
log_Printf(LogWARN, "%s: DIFADDR %s -> %s returns %d\n",
@@ -260,12 +262,13 @@
ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME;
res = ID0ioctl(s, SIOCDIFADDR_IN6, &ifra6);
+ saved_errno = errno;
break;
#endif
}
if (res == -1) {
- char dst[40];
+ char dst[NCP_ASCIIBUFFERSIZE];
const char *end =
#ifndef NOINET6
ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" :
@@ -274,11 +277,11 @@
if (ncpaddr_family(&addr->peer) == AF_UNSPEC)
log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s): %s\n",
- end, ncprange_ntoa(&addr->ifa), strerror(errno));
+ end, ncprange_ntoa(&addr->ifa), strerror(saved_errno));
else {
snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer));
log_Printf(LogWARN, "iface rm: ioctl(SIOCDIFADDR%s, %s -> %s): %s\n",
- end, ncprange_ntoa(&addr->ifa), dst, strerror(errno));
+ end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno));
}
}
@@ -294,7 +297,7 @@
#endif
struct sockaddr_in *me4, *msk4, *peer4;
struct sockaddr_storage ssme, sspeer, ssmsk;
- int res;
+ int res, saved_errno;
ncprange_getsa(&addr->ifa, &ssme, &ssmsk);
ncpaddr_getsa(&addr->peer, &sspeer);
@@ -320,8 +323,9 @@
memcpy(peer4, &sspeer, sizeof *peer4);
res = ID0ioctl(s, SIOCAIFADDR, &ifra);
+ saved_errno = errno;
if (log_IsKept(LogDEBUG)) {
- char buf[100];
+ char buf[NCP_ASCIIBUFFERSIZE];
snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa));
log_Printf(LogWARN, "%s: AIFADDR %s -> %s returns %d\n",
@@ -345,12 +349,13 @@
ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME;
res = ID0ioctl(s, SIOCAIFADDR_IN6, &ifra6);
+ saved_errno = errno;
break;
#endif
}
if (res == -1) {
- char dst[40];
+ char dst[NCP_ASCIIBUFFERSIZE];
const char *end =
#ifndef NOINET6
ncprange_family(&addr->ifa) == AF_INET6 ? "_IN6" :
@@ -359,11 +364,11 @@
if (ncpaddr_family(&addr->peer) == AF_UNSPEC)
log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s): %s\n",
- end, ncprange_ntoa(&addr->ifa), strerror(errno));
+ end, ncprange_ntoa(&addr->ifa), strerror(saved_errno));
else {
snprintf(dst, sizeof dst, "%s", ncpaddr_ntoa(&addr->peer));
log_Printf(LogWARN, "iface add: ioctl(SIOCAIFADDR%s, %s -> %s): %s\n",
- end, ncprange_ntoa(&addr->ifa), dst, strerror(errno));
+ end, ncprange_ntoa(&addr->ifa), dst, strerror(saved_errno));
}
}
Modified: trunk/usr.sbin/ppp/iface.h
===================================================================
--- trunk/usr.sbin/ppp/iface.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/iface.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/iface.h 218397 2011-02-07 11:18:18Z brian $
*/
struct ifa_msghdr;
Modified: trunk/usr.sbin/ppp/ip.c
===================================================================
--- trunk/usr.sbin/ppp/ip.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ip.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ip.c 330805 2018-03-12 17:37:38Z eugen $
*/
#include <sys/param.h>
@@ -224,7 +225,7 @@
int match; /* true if condition matched */
int mindata; /* minimum data size or zero */
const struct filterent *fp = filter->rule;
- char dbuff[100], dstip[16];
+ char dbuff[100], dstip[NCP_ASCIIBUFFERSIZE];
struct ncpaddr srcaddr, dstaddr;
const char *payload; /* IP payload */
int datalen; /* IP datagram length */
@@ -473,7 +474,7 @@
ncpaddr_ntoa(&srcaddr), sport, dstip, dport);
}
return 1;
- } /* Explict match. Deny this packet */
+ } /* Explicit match. Deny this packet */
}
} else {
n++;
Modified: trunk/usr.sbin/ppp/ip.h
===================================================================
--- trunk/usr.sbin/ppp/ip.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ip.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ip.h 81634 2001-08-14 16:05:52Z brian $
*/
struct mbuf;
Modified: trunk/usr.sbin/ppp/ipcp.c
===================================================================
--- trunk/usr.sbin/ppp/ipcp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ipcp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ipcp.c 214011 2010-10-18 07:28:53Z glebius $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/ipcp.h
===================================================================
--- trunk/usr.sbin/ppp/ipcp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ipcp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ipcp.h 81634 2001-08-14 16:05:52Z brian $
*/
#define IPCP_MAXCODE CODE_CODEREJ
Modified: trunk/usr.sbin/ppp/iplist.c
===================================================================
--- trunk/usr.sbin/ppp/iplist.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/iplist.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/iplist.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/iplist.h
===================================================================
--- trunk/usr.sbin/ppp/iplist.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/iplist.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/iplist.h 50479 1999-08-28 01:35:59Z peter $
*/
struct iplist_cur {
Modified: trunk/usr.sbin/ppp/ipv6cp.c
===================================================================
--- trunk/usr.sbin/ppp/ipv6cp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ipv6cp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ipv6cp.c 330805 2018-03-12 17:37:38Z eugen $
*/
#include <sys/param.h>
@@ -465,7 +466,7 @@
{
/* We're now up */
struct ipv6cp *ipv6cp = fsm2ipv6cp(fp);
- char tbuff[40];
+ char tbuff[NCP_ASCIIBUFFERSIZE];
log_Printf(LogIPV6CP, "%s: LayerUp.\n", fp->link->name);
if (!ipv6cp_InterfaceUp(ipv6cp))
@@ -522,7 +523,7 @@
/* About to come down */
struct ipv6cp *ipv6cp = fsm2ipv6cp(fp);
static int recursing;
- char addr[40];
+ char addr[NCP_ASCIIBUFFERSIZE];
if (!recursing++) {
snprintf(addr, sizeof addr, "%s", ncpaddr_ntoa(&ipv6cp->myaddr));
Modified: trunk/usr.sbin/ppp/ipv6cp.h
===================================================================
--- trunk/usr.sbin/ppp/ipv6cp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ipv6cp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ipv6cp.h 102558 2002-08-29 02:44:58Z brian $
*/
#ifndef NOINET6
Modified: trunk/usr.sbin/ppp/layer.h
===================================================================
--- trunk/usr.sbin/ppp/layer.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/layer.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/layer.h 50479 1999-08-28 01:35:59Z peter $
*/
#define LAYER_ASYNC 2
Modified: trunk/usr.sbin/ppp/lcp.c
===================================================================
--- trunk/usr.sbin/ppp/lcp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/lcp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/lcp.c 162062 2006-09-06 06:23:55Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/lcp.h
===================================================================
--- trunk/usr.sbin/ppp/lcp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/lcp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/lcp.h 138799 2004-12-13 12:51:19Z brian $
*/
/* callback::opmask values */
Modified: trunk/usr.sbin/ppp/link.c
===================================================================
--- trunk/usr.sbin/ppp/link.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/link.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/link.c 300470 2016-05-23 05:41:23Z truckman $
*
*/
@@ -209,7 +210,7 @@
{ PROTO_LQR, "LQR" },
{ PROTO_CHAP, "CHAP" },
{ PROTO_MP, "MULTILINK" },
- { 0, "Others" }
+ { 0, "Others" } /* must be last */
};
void
@@ -218,13 +219,13 @@
int i;
for (i = 0; i < NPROTOSTAT; i++)
- if (ProtocolStat[i].number == proto)
+ if (ProtocolStat[i].number == proto || ProtocolStat[i].number == 0) {
+ if (type == PROTO_IN)
+ l->proto_in[i]++;
+ else
+ l->proto_out[i]++;
break;
-
- if (type == PROTO_IN)
- l->proto_in[i]++;
- else
- l->proto_out[i]++;
+ }
}
void
Modified: trunk/usr.sbin/ppp/link.h
===================================================================
--- trunk/usr.sbin/ppp/link.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/link.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/link.h 131327 2004-06-30 12:24:56Z brian $
*
*/
Modified: trunk/usr.sbin/ppp/log.c
===================================================================
--- trunk/usr.sbin/ppp/log.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/log.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/log.c 218397 2011-02-07 11:18:18Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/log.h
===================================================================
--- trunk/usr.sbin/ppp/log.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/log.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/log.h 218397 2011-02-07 11:18:18Z brian $
*/
#define LogLOG (0)
Modified: trunk/usr.sbin/ppp/lqr.c
===================================================================
--- trunk/usr.sbin/ppp/lqr.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/lqr.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/lqr.c 241496 2012-10-12 22:48:33Z n_hibma $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/lqr.h
===================================================================
--- trunk/usr.sbin/ppp/lqr.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/lqr.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/lqr.h 131327 2004-06-30 12:24:56Z brian $
*/
/*
Modified: trunk/usr.sbin/ppp/main.c
===================================================================
--- trunk/usr.sbin/ppp/main.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/main.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/main.c 218397 2011-02-07 11:18:18Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/main.h
===================================================================
--- trunk/usr.sbin/ppp/main.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/main.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/main.h 134789 2004-09-05 01:46:52Z brian $
*/
extern void Cleanup(void);
Modified: trunk/usr.sbin/ppp/mbuf.c
===================================================================
--- trunk/usr.sbin/ppp/mbuf.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mbuf.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mbuf.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/mbuf.h
===================================================================
--- trunk/usr.sbin/ppp/mbuf.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mbuf.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mbuf.h 134789 2004-09-05 01:46:52Z brian $
*/
struct mbuf {
Modified: trunk/usr.sbin/ppp/mp.c
===================================================================
--- trunk/usr.sbin/ppp/mp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mp.c 228990 2011-12-30 10:58:14Z uqs $
*/
#include <sys/param.h>
@@ -965,13 +966,13 @@
case PHASE_ESTABLISH:
/* Make sure none of our links are DATALINK_LCP or greater */
if (bundle_HighestState(arg->bundle) >= DATALINK_LCP) {
- log_Printf(LogWARN, "enddisc: Only changable before"
+ log_Printf(LogWARN, "enddisc: Only changeable before"
" LCP negotiations\n");
return 1;
}
break;
default:
- log_Printf(LogWARN, "enddisc: Only changable at phase DEAD/ESTABLISH\n");
+ log_Printf(LogWARN, "enddisc: Only changeable at phase DEAD/ESTABLISH\n");
return 1;
}
Modified: trunk/usr.sbin/ppp/mp.h
===================================================================
--- trunk/usr.sbin/ppp/mp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mp.h 134789 2004-09-05 01:46:52Z brian $
*/
struct mbuf;
Modified: trunk/usr.sbin/ppp/mppe.c
===================================================================
--- trunk/usr.sbin/ppp/mppe.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mppe.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Semen Ustimenko <semenu at FreeBSD.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mppe.c 134906 2004-09-07 15:48:27Z phk $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/mppe.h
===================================================================
--- trunk/usr.sbin/ppp/mppe.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/mppe.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Semen Ustimenko <semenu at FreeBSD.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/mppe.h 68461 2000-11-07 23:19:11Z brian $
*/
#define MPPE_KEY_LEN 16
Modified: trunk/usr.sbin/ppp/nat_cmd.c
===================================================================
--- trunk/usr.sbin/ppp/nat_cmd.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/nat_cmd.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Charles Mott <cm at linktel.net>
* Brian Somers <brian at Awfulhak.org>
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/nat_cmd.c 223492 2011-06-24 07:05:20Z kevlo $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/nat_cmd.h
===================================================================
--- trunk/usr.sbin/ppp/nat_cmd.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/nat_cmd.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Charles Mott <cm at linktel.net>
* Brian Somers <brian at Awfulhak.org>
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/nat_cmd.h 120372 2003-09-23 07:41:55Z marcus $
*/
struct cmdargs;
Modified: trunk/usr.sbin/ppp/ncp.c
===================================================================
--- trunk/usr.sbin/ppp/ncp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ncp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ncp.c 136377 2004-10-11 10:21:53Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/ncp.h
===================================================================
--- trunk/usr.sbin/ppp/ncp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ncp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ncp.h 134789 2004-09-05 01:46:52Z brian $
*/
struct port_range {
Modified: trunk/usr.sbin/ppp/ncpaddr.c
===================================================================
--- trunk/usr.sbin/ppp/ncpaddr.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ncpaddr.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ncpaddr.c 330805 2018-03-12 17:37:38Z eugen $
*/
#include <sys/types.h>
@@ -76,8 +77,6 @@
#define ncpaddr_ip6addr u.ip6addr
#endif
-#define NCP_ASCIIBUFFERSIZE 52
-
static struct in_addr
bits2mask4(int bits)
{
Modified: trunk/usr.sbin/ppp/ncpaddr.h
===================================================================
--- trunk/usr.sbin/ppp/ncpaddr.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/ncpaddr.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/ncpaddr.h 86815 2001-11-23 12:39:20Z brian $
*/
/*
Modified: trunk/usr.sbin/ppp/netgraph.c
===================================================================
--- trunk/usr.sbin/ppp/netgraph.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/netgraph.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/netgraph.c 196513 2009-08-24 17:18:17Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/netgraph.h
===================================================================
--- trunk/usr.sbin/ppp/netgraph.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/netgraph.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/netgraph.h 134789 2004-09-05 01:46:52Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/pap.c
===================================================================
--- trunk/usr.sbin/ppp/pap.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/pap.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/pap.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/pap.h
===================================================================
--- trunk/usr.sbin/ppp/pap.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/pap.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/pap.h 78189 2001-06-13 21:52:19Z brian $
*/
#define PAP_REQUEST 1
Modified: trunk/usr.sbin/ppp/physical.c
===================================================================
--- trunk/usr.sbin/ppp/physical.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/physical.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Written by Eivind Eklund <eivind at yes.no>
* for Yes Interactive
@@ -16,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/physical.c 230349 2012-01-20 01:37:49Z eadler $
*
*/
@@ -585,7 +586,7 @@
int fd, int *auxfd, int *nauxfd)
{
struct physical *p;
- int len, type;
+ int type;
unsigned h;
p = (struct physical *)iov[(*niov)++].iov_base;
@@ -598,7 +599,6 @@
p->desc.Write = physical_DescriptorWrite;
p->type = PHYS_DIRECT;
p->dl = dl;
- len = strlen(_PATH_DEV);
p->out = NULL;
p->connect_count = 1;
Modified: trunk/usr.sbin/ppp/physical.h
===================================================================
--- trunk/usr.sbin/ppp/physical.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/physical.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Written by Eivind Eklund <eivind at yes.no>
* for Yes Interactive
@@ -16,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/physical.h 202192 2010-01-13 17:54:32Z ed $
*
*/
Modified: trunk/usr.sbin/ppp/pred.c
===================================================================
--- trunk/usr.sbin/ppp/pred.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/pred.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* Ian Donaldson <iand at labtam.labtam.oz.au>
@@ -26,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/pred.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/pred.h
===================================================================
--- trunk/usr.sbin/ppp/pred.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/pred.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/pred.h 78189 2001-06-13 21:52:19Z brian $
*/
extern const struct ccp_algorithm Pred1Algorithm;
Modified: trunk/usr.sbin/ppp/probe.c
===================================================================
--- trunk/usr.sbin/ppp/probe.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/probe.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/probe.c 89422 2002-01-16 14:03:52Z brian $
*/
#include <sys/time.h>
Modified: trunk/usr.sbin/ppp/probe.h
===================================================================
--- trunk/usr.sbin/ppp/probe.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/probe.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/probe.h 81697 2001-08-15 13:53:38Z brian $
*/
struct probe {
Modified: trunk/usr.sbin/ppp/prompt.c
===================================================================
--- trunk/usr.sbin/ppp/prompt.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/prompt.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/prompt.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/prompt.h
===================================================================
--- trunk/usr.sbin/ppp/prompt.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/prompt.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1998 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/prompt.h 102500 2002-08-27 20:11:58Z brian $
*/
#define LOCAL_AUTH 0x01
Modified: trunk/usr.sbin/ppp/proto.c
===================================================================
--- trunk/usr.sbin/ppp/proto.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/proto.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/proto.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/proto.h
===================================================================
--- trunk/usr.sbin/ppp/proto.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/proto.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/proto.h 87544 2001-12-09 01:29:12Z brian $
*/
/*
Modified: trunk/usr.sbin/ppp/radius.c
===================================================================
--- trunk/usr.sbin/ppp/radius.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/radius.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/radius.c 241844 2012-10-22 03:00:37Z eadler $
*
*/
Modified: trunk/usr.sbin/ppp/radius.h
===================================================================
--- trunk/usr.sbin/ppp/radius.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/radius.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright 1999 Internet Business Solutions Ltd., Switzerland
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/radius.h 169986 2007-05-25 13:45:49Z novel $
*/
#define MPPE_POLICY_ALLOWED 1
Modified: trunk/usr.sbin/ppp/route.c
===================================================================
--- trunk/usr.sbin/ppp/route.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/route.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/route.c 330805 2018-03-12 17:37:38Z eugen $
*/
#include <sys/param.h>
@@ -158,14 +159,10 @@
{ RTF_MODIFIED, 'M' },
{ RTF_DONE, 'd' },
{ RTF_XRESOLVE, 'X' },
-#ifdef RTF_CLONING
- { RTF_CLONING, 'C' },
-#endif
{ RTF_STATIC, 'S' },
{ RTF_PROTO1, '1' },
{ RTF_PROTO2, '2' },
{ RTF_BLACKHOLE, 'B' },
-
#ifdef RTF_LLINFO
{ RTF_LLINFO, 'L' },
#endif
@@ -172,12 +169,6 @@
#ifdef RTF_CLONING
{ RTF_CLONING, 'C' },
#endif
-#ifdef RTF_WASCLONED
- { RTF_WASCLONED, 'W' },
-#endif
-#ifdef RTF_PRCLONING
- { RTF_PRCLONING, 'c' },
-#endif
#ifdef RTF_PROTO3
{ RTF_PROTO3, '3' },
#endif
@@ -187,10 +178,6 @@
{ 0, '\0' }
};
-#ifndef RTF_WASCLONED
-#define RTF_WASCLONED (0)
-#endif
-
static void
p_flags(struct prompt *prompt, u_int32_t f, unsigned max)
{
@@ -434,7 +421,7 @@
* route X was cloned from route Y (and is no longer there 'cos it
* may have gone with route Y).
*/
- if (RTF_WASCLONED == 0 && pass == 0)
+ if (pass == 0)
/* So we can't tell ! */
continue;
for (cp = sp; cp < ep; cp += rtm->rtm_msglen) {
@@ -449,7 +436,7 @@
) &&
(all || (rtm->rtm_flags & RTF_GATEWAY))) {
if (log_IsKept(LogDEBUG)) {
- char gwstr[41];
+ char gwstr[NCP_ASCIIBUFFERSIZE];
struct ncpaddr gw;
ncprange_setsa(&range, sa[RTAX_DST], sa[RTAX_NETMASK]);
ncpaddr_setsa(&gw, sa[RTAX_GATEWAY]);
@@ -461,8 +448,7 @@
sa[RTAX_GATEWAY]->sa_family == AF_INET6 ||
#endif
sa[RTAX_GATEWAY]->sa_family == AF_LINK) {
- if ((pass == 0 && (rtm->rtm_flags & RTF_WASCLONED)) ||
- (pass == 1 && !(rtm->rtm_flags & RTF_WASCLONED))) {
+ if (pass == 1) {
ncprange_setsa(&range, sa[RTAX_DST], sa[RTAX_NETMASK]);
rt_Set(bundle, RTM_DELETE, &range, NULL, 0, 0);
} else
@@ -855,7 +841,7 @@
}
if (log_IsKept(LogDEBUG)) {
- char gwstr[40];
+ char gwstr[NCP_ASCIIBUFFERSIZE];
if (gw)
snprintf(gwstr, sizeof gwstr, "%s", ncpaddr_ntoa(gw));
Modified: trunk/usr.sbin/ppp/route.h
===================================================================
--- trunk/usr.sbin/ppp/route.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/route.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/route.h 191316 2009-04-20 14:38:48Z bz $
*/
struct bundle;
Modified: trunk/usr.sbin/ppp/server.c
===================================================================
--- trunk/usr.sbin/ppp/server.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/server.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/server.c 162389 2006-09-18 03:50:30Z ume $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/server.h
===================================================================
--- trunk/usr.sbin/ppp/server.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/server.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/server.h 74001 2001-03-08 23:51:50Z brian $
*/
struct bundle;
Modified: trunk/usr.sbin/ppp/sig.c
===================================================================
--- trunk/usr.sbin/ppp/sig.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/sig.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 - 1999, 2001 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/sig.c 97140 2002-05-22 21:08:58Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/sig.h
===================================================================
--- trunk/usr.sbin/ppp/sig.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/sig.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/sig.h 50479 1999-08-28 01:35:59Z peter $
*/
typedef void (*sig_type)(int);
Modified: trunk/usr.sbin/ppp/slcompress.c
===================================================================
--- trunk/usr.sbin/ppp/slcompress.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/slcompress.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -36,7 +37,7 @@
* Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989:
* - Initial distribution.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/slcompress.c 139979 2005-01-10 11:47:17Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/slcompress.h
===================================================================
--- trunk/usr.sbin/ppp/slcompress.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/slcompress.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Definitions for tcp compression routines.
*
@@ -31,7 +32,7 @@
* Van Jacobson (van at helios.ee.lbl.gov), Dec 31, 1989:
* - Initial distribution.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/slcompress.h 139979 2005-01-10 11:47:17Z brian $
*/
#define MIN_VJ_STATES 3
Modified: trunk/usr.sbin/ppp/sync.c
===================================================================
--- trunk/usr.sbin/ppp/sync.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/sync.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/sync.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/sync.h
===================================================================
--- trunk/usr.sbin/ppp/sync.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/sync.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/sync.h 50479 1999-08-28 01:35:59Z peter $
*/
extern struct layer synclayer;
Modified: trunk/usr.sbin/ppp/systems.c
===================================================================
--- trunk/usr.sbin/ppp/systems.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/systems.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/systems.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/systems.h
===================================================================
--- trunk/usr.sbin/ppp/systems.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/systems.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1996 - 2001 Brian Somers <brian at Awfulhak.org>
* based on work by Toshiharu OHNO <tony-o at iij.ad.jp>
@@ -25,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/systems.h 85991 2001-11-03 21:45:32Z brian $
*/
struct prompt;
Modified: trunk/usr.sbin/ppp/tcp.c
===================================================================
--- trunk/usr.sbin/ppp/tcp.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/tcp.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/tcp.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/types.h>
Modified: trunk/usr.sbin/ppp/tcp.h
===================================================================
--- trunk/usr.sbin/ppp/tcp.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/tcp.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1999 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/tcp.h 52942 1999-11-06 22:50:59Z brian $
*/
struct physical;
Modified: trunk/usr.sbin/ppp/tcpmss.c
===================================================================
--- trunk/usr.sbin/ppp/tcpmss.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/tcpmss.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Ruslan Ermilov and Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/tcpmss.c 134789 2004-09-05 01:46:52Z brian $
*/
#include <sys/param.h>
Modified: trunk/usr.sbin/ppp/tcpmss.h
===================================================================
--- trunk/usr.sbin/ppp/tcpmss.h 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/tcpmss.h 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2000 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/tcpmss.h 69303 2000-11-28 13:18:35Z brian $
*/
extern struct layer tcpmsslayer;
Modified: trunk/usr.sbin/ppp/throughput.c
===================================================================
--- trunk/usr.sbin/ppp/throughput.c 2018-06-03 23:03:18 UTC (rev 10361)
+++ trunk/usr.sbin/ppp/throughput.c 2018-06-03 23:05:05 UTC (rev 10362)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997 Brian Somers <brian at Awfulhak.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/ppp/throughput.c 235822 2012-05-23 06:49:50Z delphij $
*/
#include <sys/types.h>
@@ -115,14 +116,14 @@
prompt_Printf(prompt, "%llu packets in, %llu packets out\n",
t->PacketsIn, t->PacketsOut);
if (t->rolling) {
- prompt_Printf(prompt, " overall %6qu bytes/sec\n",
+ prompt_Printf(prompt, " overall %6llu bytes/sec\n",
(t->OctetsIn + t->OctetsOut) / divisor);
- prompt_Printf(prompt, " %s %6qu bytes/sec in, %6qu bytes/sec out "
+ prompt_Printf(prompt, " %s %6llu bytes/sec in, %6llu bytes/sec out "
"(over the last %d secs)\n",
t->downtime ? "average " : "currently",
t->in.OctetsPerSecond, t->out.OctetsPerSecond,
secs_up > t->SamplePeriod ? t->SamplePeriod : secs_up);
- prompt_Printf(prompt, " peak %6qu bytes/sec on %s",
+ prompt_Printf(prompt, " peak %6llu bytes/sec on %s",
t->BestOctetsPerSecond, ctime(&t->BestOctetsPerSecondTime));
} else
prompt_Printf(prompt, "Overall %llu bytes/sec\n",
@@ -266,7 +267,7 @@
if ((divisor = throughput_uptime(t)) == 0)
divisor = 1;
- prompt_Printf(prompt, "overall cleared (was %6qu bytes/sec)\n",
+ prompt_Printf(prompt, "overall cleared (was %6llu bytes/sec)\n",
(t->OctetsIn + t->OctetsOut) / divisor);
t->OctetsIn = t->OctetsOut = t->PacketsIn = t->PacketsOut = 0;
t->downtime = 0;
@@ -274,8 +275,8 @@
}
if (clear_type & THROUGHPUT_CURRENT) {
- prompt_Printf(prompt, "current cleared (was %6qu bytes/sec in,"
- " %6qu bytes/sec out)\n",
+ prompt_Printf(prompt, "current cleared (was %6llu bytes/sec in,"
+ " %6llu bytes/sec out)\n",
t->in.OctetsPerSecond, t->out.OctetsPerSecond);
t->in.OctetsPerSecond = t->out.OctetsPerSecond = 0;
}
@@ -287,7 +288,7 @@
last = time_buf + strlen(time_buf);
if (last > time_buf && *--last == '\n')
*last = '\0';
- prompt_Printf(prompt, "peak cleared (was %6qu bytes/sec on %s)\n",
+ prompt_Printf(prompt, "peak cleared (was %6llu bytes/sec on %s)\n",
t->BestOctetsPerSecond, time_buf);
t->BestOctetsPerSecond = 0;
time(&t->BestOctetsPerSecondTime);
More information about the Midnightbsd-cvs
mailing list