New user Process PPP based on iij-ppp0.94beta2.

   o Supporting SYNC SIO device (But need a device driver)
     - add "set speed sync"
   o Fixing bug for Predictor-1 function.
   o Add new parameter that re-sent interval for set timeout commands.
   o Improving RTT (Round Trip Time) and reducing processor time.
     - Previous Timer service was using polling, and now using
       SIGALRM ;-)
     - A 0.94beta2 will not work correctly....

   -- Follows are additinal feature not including 0.94beta2
   o Support Proxy ARP
     - add "enable/disable proxy" commands
   o Marging common routine in CHAP/PAP.
   o Enhancing LCP/IPCP log information.
   o Support local Authfication connection on port 300x and tty.
     - You can set up pair of your "hostname -s" and
       password in ppp.secret. if either ppp.secret file nor
       your hostname line don't exist, It will notify a message
       and working as same as previous version.(Backword compatibility)
     - If you did set up them, It's allow connection but nothing to do
       except help and passwd command.
     - add "passwd yourpasswd" commands
   o Support afilter - keep Alive filter that a packet can send/receiving
     according to ifilter/ofilter but doesn't count it as preventing idle
     timer expires.
     - Same syntax of other filters.
   o Fixing bugs reported by current user for previous one. Thanks !!

Reviewed by: Atsushi Murai (amurai@spec.co.jp)

1 files changed, 15 insertions, 27 deletions

diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index fbb5fa2..50af6bc 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $	*/
+
 /*
  * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
  * Nottingham University 1987.
@@ -11,8 +13,7 @@
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
  * 
- * from: $Header: if_tnreg.h,v 1.1.2.1 1992/07/16 22:39:16 friedl Exp
- * $Id: if_tun.h,v 1.3 1993/12/13 14:27:01 deraadt Exp $
+ * : $Header: if_tnreg.h,v 1.1.2.1 1992/07/16 22:39:16 friedl Exp
  */
 
 #ifndef _NET_IF_TUN_H_
@@ -25,23 +26,16 @@ struct tun_softc {
 #define	TUN_RCOLL	0x0004
 #define	TUN_IASET	0x0008
 #define	TUN_DSTADDR	0x0010
-#ifdef notdef
-#define	TUN_READY	0x0020
-#else
-#define TUN_READY       (TUN_IASET|TUN_OPEN|TUN_DSTADDR)
-#endif
 #define	TUN_RWAIT	0x0040
 #define	TUN_ASYNC	0x0080
 #define	TUN_NBIO	0x0100
+
+#define	TUN_READY	(TUN_OPEN | TUN_INITED | TUN_IASET)
+
 	struct	ifnet tun_if;		/* the interface */
 	int	tun_pgrp;		/* the process group - if any */
-#if BSD < 199103
-	struct  proc    *tun_rsel;
-	struct  proc	*tun_wsel;
-#else
-	u_char		tun_pad;	/* explicit alignment */
-	struct selinfo  tun_sel;	/* bsd select info */
-#endif
+	struct	selinfo	tun_rsel;	/* read select */
+	struct	selinfo	tun_wsel;	/* write select (not used) */
 #if NBPFILTER > 0
 	caddr_t		tun_bpf;
 #endif
@@ -50,23 +44,17 @@ struct tun_softc {
 /* Maximum packet size */
 #define	TUNMTU		1500
 
+struct tuninfo {
+	int	baudrate;		/* linespeed */
+	short	mtu;			/* maximum transmission unit */
+	u_char	type;			/* ethernet, tokenring, etc. */
+	u_char	dummy;			/* place holder */
+};
+
 /* ioctl's for get/set debug */
-#ifdef __NetBSD__
 #define	TUNSDEBUG	_IOW('t', 90, int)
 #define	TUNGDEBUG	_IOR('t', 89, int)
 #define	TUNSIFINFO	_IOW('t', 91, struct tuninfo)
 #define	TUNGIFINFO	_IOR('t', 92, struct tuninfo)
-#else	/* Assume BSDI */
-#define	TUNSDEBUG	_IOW('T', 90, int)
-#define	TUNGDEBUG	_IOR('T', 89, int)
-#define	TUNSIFINFO	_IOW('T', 91, struct tuninfo)
-#define	TUNGIFINFO	_IOR('T', 92, struct tuninfo)
-#endif
 
-struct tuninfo {
-	int	tif_baudrate;		/* linespeed */
-	short	tif_mtu;		/* maximum transmission unit */
-	u_char	tif_type;		/* ethernet, tokenring, etc. */
-	u_char	tif_dummy;		/* place holder */
-};
 #endif /* !_NET_IF_TUN_H_ */