From owner-FreeBSD-users-jp@jp.freebsd.org  Wed Aug 20 12:17:43 1997
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta6/8.7.3) id MAA22272
	Wed, 20 Aug 1997 12:17:43 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.7+2.7Wbeta6/8.7.3) with SMTP id MAA22267
	for <FreeBSD-users-jp@jp.freebsd.org>; Wed, 20 Aug 1997 12:17:41 +0900 (JST)
Received: (from uucp@localhost) by ns1.sharp.co.jp (8.6.12/3.4W-95091612) id MAA20055 for <FreeBSD-users-jp@jp.freebsd.org>; Wed, 20 Aug 1997 12:17:32 +0900
Received: from marinfw.sharp.co.jp(202.32.86.11) by ns1.sharp.co.jp via smap (V1.3mjr)
	id sma020020; Wed Aug 20 12:16:46 1997
Received: from messe.noc.mkhar.sharp.co.jp (root@messe.noc.mkhar.sharp.co.jp [133.159.103.18]) by ns.sharp.co.jp (8.8.5/3.5W-97031013) with ESMTP id MAA20090 for <FreeBSD-users-jp@jp.freebsd.org>; Wed, 20 Aug 1997 12:16:45 +0900 (JST)
Received: from shpptl.edag.ptdg.sharp.co.jp ([133.159.156.23]) by messe.noc.mkhar.sharp.co.jp (8.8.5/3.5Wpl7-97060717) with SMTP id MAA03124 for <FreeBSD-users-jp@jp.freebsd.org>; Wed, 20 Aug 1997 12:16:44 +0900 (JST)
Received: by shpptl.edag.ptdg.sharp.co.jp (4.1/6.4J.6-PTL/M3.3)
	id AA01422; Wed, 20 Aug 97 12:13:14 JST
Received: by helen.edag.ptdg.sharp.co.jp (SMI-8.6/6.4J.6-PTL/S1.1)
	id MAA01661; Wed, 20 Aug 1997 12:15:54 +0900
Message-Id: <199708200315.MAA01661@helen.edag.ptdg.sharp.co.jp>
To: FreeBSD-users-jp@jp.freebsd.org
Date: Wed, 20 Aug 1997 12:15:54 +0900
From: Akihisa YAMADA <yamada@edag.ptdg.sharp.co.jp>
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=20]
X-Sequence: FreeBSD-users-jp 17053
Subject: [FreeBSD-users-jp 17053] Unofficial patch for ppp-2.3.1 on FreeBSD 2.1.X
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$B%7%c!<%W$N;3ED$G$9!#(B

FreeBSD 2.1.X $B$K(B ppp-2.3.1$B$r%$%s%9%H!<%k$9$k$?$a$N%Q%C%A!\%3!<%k%P%C%/(B
$B$rMxMQ$9$k$?$a$N%Q%C%A$G$9!#(B

$B!t;DG0$J$,$i(B FreeBSD 2.2.X $B$K$O$3$N%Q%C%A$G$O%$%s%9%H!<%k$G$-$^$;$s!#(B

$B0J2<$N%Q%C%A$O!"%+!<%M%kMQ$N%=!<%9$X$N%Q%C%A$H%f!<%6%W%m%0%i%`(B pppd $B$N(B
$B%=!<%9$X$N%Q%C%A$H$+$i$J$C$F$$$^$9!#(B
$B%3!<%k%P%C%/$rMxMQ$7$J$$>l9g$O!"(Bpppd$B$N%=!<%9$X$N%Q%C%A$OI,MW$"$j$^$;$s(B
$B$,!"$"$F$F$bL532$G$9!J$H;W$$$^$9!K!#(B

$B$J$*(Bppp-2.3.1$B$G%5%]!<%H$5$l$F$$$k%3!<%k%P%C%/$O(BPPP$B%/%i%$%"%s%HMQ$N$b$N(B
$B$G$"$j!"%5!<%PMQ$N$b$N$G$"$j$^$;$s!#$3$N%Q%C%A$b(BPPP$B%/%i%$%"%s%H$H$7$F@5(B
$B$7$/F0$/$h$&$K$7$?$b$N$G$9!#(B

$BF0:n3NG'$O!"(B

PPP$B%5!<%P!'(BBUG NetEntrance2
PPP$B%/%i%$%"%s%H!'(BPC-9821V7C4K+FreeBSD(98) 2.1.7.1-RELEASE

$B$G$7$F$$$^$9!##17nDx;H$C$F$$$^$9$,!":#$N$H$3$mLdBj$O$"$j$^$;$s!#(B
$B%3!<%k%P%C%/$N@_Dj$O!"BgBt?J$5$s$N=q$+$l$?(B
http://www.win.or.jp/~susumu-o/ppp/$B$,J,$+$j$d$9$$$H;W$$$^$9!#(B
PPP$B%5!<%P$H$7$F(BBUG NetEntrance2$B$r;HMQ$5$l$k>l9g$O!"G'>ZJ}K!$r(BCHAP$B$K$7$J(B
$B$$$H$&$^$/$$$-$^$;$s!#(B

$B0J2<$N%Q%C%A$O!"(Bppp-2.3.1$B$rE83+$7$?%G%#%l%/%H%j$G$"$F$F$/$@$5$$!#(B
ppp-2.3.1$B$O(Bftp://cs.anu.edu.au/pub/software/ppp$B$K$"$j$^$9!#(B
---------------------------------------------------------------------
*** net/if_ppp.h.orig	Sun May 25 00:14:13 1997
--- net/if_ppp.h	Sun May 25 00:14:31 1997
***************
*** 23,28 ****
--- 23,35 ----
  #define _IF_PPP_H_
  
  /*
+  * Packet sizes
+  */
+ #define	PPP_MTU		1500	/* Default MTU (size of Info field) */
+ #define	PPP_MAXMRU	65000	/* Largest MRU we allow */
+ 
+ /*
+ 
   * Bit definitions for flags.
   */
  #define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
***************
*** 127,132 ****
--- 134,141 ----
  
  #if defined(_KERNEL) || defined(KERNEL)
  void pppattach __P((void));
+ int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
+                   struct rtentry *));
  void pppintr __P((void));
  #endif
  #endif /* _IF_PPP_H_ */
*** freebsd-2.0/if_ppp.c.orig	Wed Apr 30 14:42:07 1997
--- freebsd-2.0/if_ppp.c	Sun May 25 00:13:57 1997
***************
*** 131,138 ****
  #endif
  
  static int	pppsioctl __P((struct ifnet *, int, caddr_t));
! static int	pppoutput __P((struct ifnet *, struct mbuf *,
! 			       struct sockaddr *, struct rtentry *));
  static void	ppp_requeue __P((struct ppp_softc *));
  static void	ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));
  static void	ppp_ccp_closed __P((struct ppp_softc *));
--- 131,138 ----
  #endif
  
  static int	pppsioctl __P((struct ifnet *, int, caddr_t));
! /* static int	pppoutput __P((struct ifnet *, struct mbuf *,
! 			       struct sockaddr *, struct rtentry *)); */
  static void	ppp_requeue __P((struct ppp_softc *));
  static void	ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd));
  static void	ppp_ccp_closed __P((struct ppp_softc *));
*** pppd/lcp.c.orig	Wed Apr 30 14:52:59 1997
--- pppd/lcp.c	Sat May 24 19:39:13 1997
***************
*** 1399,1404 ****
--- 1399,1418 ----
  	    ho->neg_accompression = 1;
  	    break;
  
+ 	case CI_CALLBACK:
+ 	  LCPDEBUG((LOG_INFO, "lcp_reqci: rcvd CALLBACK"));
+ 	  if (!ao->neg_cbcp || cilen != CILEN_CHAR) {
+ 	      orc = CONFREJ;
+ 	      break;
+ 	  }
+ 	  GETCHAR(cichar, p); 
+ 	  if (cichar != CBCP_OPT) {
+ 	    orc = CONFREJ;
+ 	    break;
+ 	  }
+ 	  ho->neg_cbcp = 1;
+ 	  break;
+ 
  	default:
  	    LCPDEBUG((LOG_INFO, "lcp_reqci: rcvd unknown option %d",
  		      citype));
***************
*** 1649,1655 ****
  		if (olen >= CILEN_CHAR) {
  		    p += 2;
  		    printer(arg, "callback ");
! 		    GETSHORT(cishort, p);
  		    switch (cishort) {
  		    case CBCP_OPT:
  			printer(arg, "CBCP");
--- 1663,1669 ----
  		if (olen >= CILEN_CHAR) {
  		    p += 2;
  		    printer(arg, "callback ");
! 		    GETCHAR(cishort, p);
  		    switch (cishort) {
  		    case CBCP_OPT:
  			printer(arg, "CBCP");
*** pppd/Makefile.bsd.orig	Tue Oct  8 13:33:33 1996
--- pppd/Makefile.bsd	Sat May 24 18:49:06 1997
***************
*** 4,14 ****
  # -D_BITYPES is for FreeBSD, which doesn't define anything to
  # tell us that u_int32_t gets defined if <sys/types.h> is included.
  # Remove for older *BSD systems for which this isn't true.
! CFLAGS+= -g -I.. -DHAVE_PATHS_H -D_BITYPES
  
  PROG=	pppd
  SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
! 	demand.c auth.c options.c sys-bsd.c
  MAN=	pppd.cat8
  MAN8=	pppd.8
  BINMODE=4555
--- 4,14 ----
  # -D_BITYPES is for FreeBSD, which doesn't define anything to
  # tell us that u_int32_t gets defined if <sys/types.h> is included.
  # Remove for older *BSD systems for which this isn't true.
! CFLAGS+= -I.. -DHAVE_PATHS_H -D_BITYPES -DCBCP_SUPPORT
  
  PROG=	pppd
  SRCS=	main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \
! 	demand.c auth.c options.c sys-bsd.c cbcp.c
  MAN=	pppd.cat8
  MAN8=	pppd.8
  BINMODE=4555
*** pppd/options.c.org	Wed Apr 30 14:55:54 1997
--- pppd/options.c	Mon Jun  2 23:11:06 1997
***************
*** 159,165 ****
  static int setmru __P((char **));
  static int setmtu __P((char **));
  #ifdef CBCP_SUPPORT
! static int setcbcp __P((char *));
  #endif
  static int nomru __P((char **));
  static int nopcomp __P((char **));
--- 159,165 ----
  static int setmru __P((char **));
  static int setmtu __P((char **));
  #ifdef CBCP_SUPPORT
! static int setcbcp __P((char **));
  #endif
  static int nomru __P((char **));
  static int nopcomp __P((char **));
