From owner-freebsd-net Wed Aug 11 8: 2:16 1999 Delivered-To: freebsd-net@freebsd.org Received: from sol.microgate.com (www.microgate.com [216.30.46.105]) by hub.freebsd.org (Postfix) with ESMTP id 87B9E15027; Wed, 11 Aug 1999 08:02:06 -0700 (PDT) (envelope-from paulkf@microgate.com) Received: from diemos (diemos.microgate.com [192.168.0.12]) by sol.microgate.com (8.8.7/8.8.7) with SMTP id KAA19225; Wed, 11 Aug 1999 10:03:49 -0500 Message-ID: <000e01bee40a$7bebcf10$0c00a8c0@microgate.com> From: "Paul Fulghum" To: "Kris Kennaway" Cc: References: Subject: Re: Kernel ppp (pppd) newer than ver 2.3.5 in -STABLE Date: Wed, 11 Aug 1999 10:02:09 -0500 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_000B_01BEE3E0.9302B440" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.00.2014.211 X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2014.211 Sender: owner-freebsd-net@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org This is a multi-part message in MIME format. ------=_NextPart_000_000B_01BEE3E0.9302B440 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit From: Kris Kennaway > On Tue, 10 Aug 1999, Kenneth W Cochran wrote: > > > What is the "status" of pppd more recent than 2.3.5 (2.3.8, for > > example) making it into -STABLE (RELENG_3)? I've also noticed a > > 2.3.9 rev now in beta. > > I have it integrated in my local source tree, although I haven't yet had > time to test it. My computer is still in Australia as I speak; I'm in LA, > and it'll be a few weeks before I can get it shipped over. > > Note that the FreeBSD 3.x patches in the distribution are partially b0rked > - they seem to try and provide support for synchronous devices using > nonexistent ioctls. I haven't yet contacted the patch author about this. > > From memory, I think the only changes between 2.3.8 and the 2.3.9 > prerelease were non-freebsd specific. > > Kris Kris: I am the author of the kernel patches for 3.0/3.1. The changes to add sync support work with a driver for our sync adapter. The driver install included a patch that added the new IOCTL call. This should have been included with the ppp kernel patches. I created, tested and attached a patch against ppp-2.3.8 that adds the IOCTL patch (ttycom.h) to the ppp-2.3.8 kernel install. I will also forward this patch to Paul Mackerras for inclusion with the ppp package. The original intent was to add these patches and our driver to freebsd, such that the kernel install would not be necessary for 3.2+, but all of my submissions and queries have been pretty much ignored. (Poul-Henning Kamp said he would look into it, but that was some time ago). So until there is some way to submit drivers for inclusion with FreeBSD, the patches remain the only alternative. Paul Fulghum paulkf@microgate.com Microgate Corporation www.microgate.com 9501 Capital of Texas Hwy Austin, Texas 78759 (512)-345-7791 ------=_NextPart_000_000B_01BEE3E0.9302B440 Content-Type: application/octet-stream; name="patch.ppp-2.3.8-mg1" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="patch.ppp-2.3.8-mg1" diff -u -r -N ppp-2.3.8/freebsd-3.0/kinstall.sh = ppp-2.3.8-new/freebsd-3.0/kinstall.sh=0A= --- ppp-2.3.8/freebsd-3.0/kinstall.sh Wed May 12 05:05:47 1999=0A= +++ ppp-2.3.8-new/freebsd-3.0/kinstall.sh Wed Aug 11 09:30:52 1999=0A= @@ -7,7 +7,10 @@=0A= # Most of the kernel files are already part of the kernel source=0A= # but, this updates them for synchronous HDLC operation=0A= #=0A= -# Paul Fulghum 19-Apr-99=0A= +# Paul Fulghum paulkf@microgate.com August 11, 1999=0A= +#=0A= +# 990911 - Added patch for ttycom.h that defines new IOCTL for sync = support.=0A= +# =0A= =0A= KPATH=3D$(uname -v | sed 's/.*://')=0A= CONF=3D$(echo $KPATH | sed 's;.*compile/;;')=0A= @@ -42,8 +45,56 @@=0A= fi=0A= done=0A= =0A= +# Patch files in /usr/src/sys/sys=0A= +=0A= +for f in ttycom.h ; do=0A= + dest=3D$SYS/sys/$f=0A= + patch=3D$SRC/patch.$f=0A= + if [ -f $dest ]; then=0A= + echo -n "Patching $dest..."=0A= + if patch -s -C -N $dest < $patch 2> /dev/null; then=0A= + patch -s -N $dest < $patch=0A= + echo "successful."=0A= + DOMAKE=3Dyes=0A= + else=0A= + if patch -s -C -R $dest < $patch 2> /dev/null; then=0A= + echo "already applied."=0A= + else=0A= + echo "failed (incorrect version or already applied)."=0A= + fi=0A= + fi=0A= + else=0A= + echo "Warning, file $dest not found"=0A= + fi=0A= +done=0A= +=0A= +# Patch files in /usr/include/net=0A= +=0A= for f in if_ppp.h ; do=0A= dest=3D/usr/include/net/$f=0A= + patch=3D$SRC/patch.$f=0A= + if [ -f $dest ]; then=0A= + echo -n "Patching $dest..."=0A= + if patch -s -C -N $dest < $patch 2> /dev/null; then=0A= + patch -s -N $dest < $patch=0A= + echo "successful."=0A= + DOMAKE=3Dyes=0A= + else=0A= + if patch -s -C -R $dest < $patch 2> /dev/null; then=0A= + echo "already applied."=0A= + else=0A= + echo "failed (incorrect version or already applied)."=0A= + fi=0A= + fi=0A= + else=0A= + echo "Warning, file $dest not found"=0A= + fi=0A= +done=0A= +=0A= +# Patch files in /usr/include/sys=0A= +=0A= +for f in ttycom.h ; do=0A= + dest=3D/usr/include/sys/$f=0A= patch=3D$SRC/patch.$f=0A= if [ -f $dest ]; then=0A= echo -n "Patching $dest..."=0A= diff -u -r -N ppp-2.3.8/freebsd-3.0/patch.ttycom.h = ppp-2.3.8-new/freebsd-3.0/patch.ttycom.h=0A= --- ppp-2.3.8/freebsd-3.0/patch.ttycom.h Wed Dec 31 18:00:00 1969=0A= +++ ppp-2.3.8-new/freebsd-3.0/patch.ttycom.h Wed Aug 11 09:07:37 1999=0A= @@ -0,0 +1,16 @@=0A= +--- ttycom.h Mon Jun 17 08:08:09 1996=0A= ++++ ttycom.h.new Fri Apr 9 08:22:06 1999=0A= +@@ -133,9 +133,13 @@=0A= + #define TIOCDSIMICROCODE _IO('t', 85) /* download microcode to=0A= + * DSI Softmodem */=0A= + =0A= ++#define TIOCRCVFRAME _IOW('t', 69, struct mbuf *) /* data frame = received */=0A= ++#define TIOCXMTFRAME _IOW('t', 68, struct mbuf *) /* data frame = transmit */=0A= ++=0A= + #define TTYDISC 0 /* termios tty line discipline */=0A= + #define TABLDISC 3 /* tablet discipline */=0A= + #define SLIPDISC 4 /* serial IP discipline */=0A= + #define PPPDISC 5 /* PPP discipline */=0A= ++#define HDLCDISC 6 /* HDLC discipline */=0A= + =0A= + #endif /* !_SYS_TTYCOM_H_ */=0A= ------=_NextPart_000_000B_01BEE3E0.9302B440-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-net" in the body of the message