d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ec25fc174f
freebsd-skq/sys/net/if_spppsubr.c

4225 lines
104 KiB
C
Raw Normal View History

Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
* Synchronous PPP/Cisco link level subroutines.
* Keepalive protocol implemented in both Cisco and PPP modes.
*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* Copyright (C) 1994-1996 Cronyx Engineering Ltd.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Author: Serge Vakulenko, <vak@cronyx.ru>
*
* Heavily revamped to conform to RFC 1661.
* Copyright (C) 1997, Joerg Wunsch.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*
* This software is distributed with NO WARRANTIES, not even the implied
* warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* Authors grant any other persons or organisations permission to use
* or modify this software as long as this message is kept with the software,
* all derivative works or modified versions.
*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
Add $Id$
1996-06-10 23:17:45 +00:00
*
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
* $Id: if_spppsubr.c,v 1.52 1998/12/27 21:30:44 phk Exp $
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#include <sys/param.h>
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Make INET a proper option. This will not make any of object files that LINT create change; there might be differences with INET disabled, but hardly anything compiled before without INET anyway. Now the 'obvious' things will give a proper error if compiled without inet - ipx_ip, ipfw, tcp_debug. The only thing that _should_ work (but can't be made to compile reasonably easily) is sppp :-( This commit move struct arpcom from <netinet/if_ether.h> to <net/if_arp.h>.
1998-01-08 23:42:31 +00:00
#include "opt_inet.h"
Throw options IPX, IPXIP and IPTUNNEL into opt_ipx.h. The #ifdef IPXIP in netipx/ipx_if.h is OK (used from ipx_usrreq.c and ifconfig.c only). I also fixed a typo IPXTUNNEL -> IPTUNNEL (and #ifdef'ed out the code inside, as it never could have compiled - doh.)
1997-12-15 20:31:25 +00:00
#include "opt_ipx.h"
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
#ifdef NetBSD1_3
# if NetBSD1_3 > 6
# include "opt_inet.h"
# include "opt_iso.h"
# endif
#endif
Throw options IPX, IPXIP and IPTUNNEL into opt_ipx.h. The #ifdef IPXIP in netipx/ipx_if.h is OK (used from ipx_usrreq.c and ifconfig.c only). I also fixed a typo IPXTUNNEL -> IPTUNNEL (and #ifdef'ed out the code inside, as it never could have compiled - doh.)
1997-12-15 20:31:25 +00:00
Fix bogus include paths: <systm.h> is <sys/systm.h>. <kernel.h> is <sys/kernel.h>.
1994-12-04 08:52:51 +00:00
#include <sys/systm.h>
#include <sys/kernel.h>
Don't include <sys/ioctl.h> in the kernel. Stage 2: include <sys/sockio.h> instead of <sys/ioctl.h> in network files.
1997-03-24 11:33:46 +00:00
#include <sys/sockio.h>
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#include <sys/socket.h>
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
#include <sys/syslog.h>
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
#include <machine/random.h>
#endif
Added used #include - don't depend on <sys/mbuf.h> including <sys/malloc.h> (unless we only use the bogusly shared M*WAIT flags).
1997-09-02 01:19:47 +00:00
#include <sys/malloc.h>
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#include <sys/mbuf.h>
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#if defined (__OpenBSD__)
#include <sys/md5k.h>
#else
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
#include <sys/md5.h>
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#include <net/if.h>
#include <net/netisr.h>
#include <net/if_types.h>
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#include <net/route.h>
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Use random() for seq numbers and read_random for CHAP challenge.
1998-04-06 11:40:17 +00:00
#include <machine/random.h>
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
#if defined (__NetBSD__) || defined (__OpenBSD__)
#include <machine/cpu.h> /* XXX for softnet */
#endif
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#include <machine/stdarg.h>
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
# if defined (__FreeBSD__) || defined (__OpenBSD__)
# include <netinet/if_ether.h>
# else
# include <net/ethertypes.h>
# endif
Make INET a proper option. This will not make any of object files that LINT create change; there might be differences with INET disabled, but hardly anything compiled before without INET anyway. Now the 'obvious' things will give a proper error if compiled without inet - ipx_ip, ipfw, tcp_debug. The only thing that _should_ work (but can't be made to compile reasonably easily) is sppp :-( This commit move struct arpcom from <netinet/if_ether.h> to <net/if_arp.h>.
1998-01-08 23:42:31 +00:00
#else
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
# error Huh? sppp without INET?
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#endif
Reviewed by: julian and jhay@mikom.csir.co.za Submitted by: Mike Mitchell, supervisor@alb.asctmd.com This is a bulk mport of Mike's IPX/SPX protocol stacks and all the related gunf that goes with it.. it is not guaranteed to work 100% correctly at this time but as we had several people trying to work on it I figured it would be better to get it checked in so they could all get teh same thing to work on.. Mikes been using it for a year or so but on 2.0 more changes and stuff will be merged in from other developers now that this is in. Mike Mitchell, Network Engineer AMTECH Systems Corporation, Technology and Manufacturing 8600 Jefferson Street, Albuquerque, New Mexico 87113 (505) 856-8000 supervisor@alb.asctmd.com
1995-10-26 20:31:59 +00:00
#ifdef IPX
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>
#endif
#ifdef ISO
#include <netiso/argo_debug.h>
#include <netiso/iso.h>
#include <netiso/iso_var.h>
#include <netiso/iso_snpac.h>
#endif
#include <net/if_sppp.h>
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
# define UNTIMEOUT(fun, arg, handle) untimeout(fun, arg, handle)
# define TIMEOUT(fun, arg1, arg2, handle) handle = timeout(fun, arg1, arg2)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
# define IOCTL_CMD_T u_long
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
# define UNTIMEOUT(fun, arg, handle) untimeout(fun, arg)
# define TIMEOUT(fun, arg1, arg2, handle) timeout(fun, arg1, arg2)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
# define IOCTL_CMD_T int
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#define MAXALIVECNT 3 /* max. alive packets */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Interface flags that can be set in an ifconfig command.
*
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
* Setting link0 will make the link passive, i.e. it will be marked
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* as being administrative openable, but won't be opened to begin
* with. Incoming calls will be answered, or subsequent calls with
* -link1 will cause the administrative open of the LCP layer.
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
*
* Setting link1 will cause the link to auto-dial only as packets
* arrive to be sent.
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
*
* Setting IFF_DEBUG will syslog the option negotiation and state
* transitions at level kern.debug. Note: all logs consistently look
* like
*
* <if-name><unit>: <proto-name> <additional info...>
*
* with <if-name><unit> being something like "bppp0", and <proto-name>
* being one of "lcp", "ipcp", "cisco", "chap", "pap", etc.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
#define IFF_PASSIVE IFF_LINK0 /* wait passively for connection */
#define IFF_AUTO IFF_LINK1 /* auto-dial on output */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
#define PPP_ALLSTATIONS 0xff /* All-Stations broadcast address */
#define PPP_UI 0x03 /* Unnumbered Information */
#define PPP_IP 0x0021 /* Internet Protocol */
#define PPP_ISO 0x0023 /* ISO OSI Protocol */
#define PPP_XNS 0x0025 /* Xerox NS Protocol */
#define PPP_IPX 0x002b /* Novell IPX Protocol */
#define PPP_LCP 0xc021 /* Link Control Protocol */
#define PPP_PAP 0xc023 /* Password Authentication Protocol */
#define PPP_CHAP 0xc223 /* Challenge-Handshake Auth Protocol */
#define PPP_IPCP 0x8021 /* Internet Protocol Control Protocol */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
#define CONF_REQ 1 /* PPP configure request */
#define CONF_ACK 2 /* PPP configure acknowledge */
#define CONF_NAK 3 /* PPP configure negative ack */
#define CONF_REJ 4 /* PPP configure reject */
#define TERM_REQ 5 /* PPP terminate request */
#define TERM_ACK 6 /* PPP terminate acknowledge */
#define CODE_REJ 7 /* PPP code reject */
#define PROTO_REJ 8 /* PPP protocol reject */
#define ECHO_REQ 9 /* PPP echo request */
#define ECHO_REPLY 10 /* PPP echo reply */
#define DISC_REQ 11 /* PPP discard request */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
#define LCP_OPT_MRU 1 /* maximum receive unit */
#define LCP_OPT_ASYNC_MAP 2 /* async control character map */
#define LCP_OPT_AUTH_PROTO 3 /* authentication protocol */
#define LCP_OPT_QUAL_PROTO 4 /* quality protocol */
#define LCP_OPT_MAGIC 5 /* magic number */
#define LCP_OPT_RESERVED 6 /* reserved */
#define LCP_OPT_PROTO_COMP 7 /* protocol field compression */
#define LCP_OPT_ADDR_COMP 8 /* address/control field compression */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
#define IPCP_OPT_ADDRESSES 1 /* both IP addresses; deprecated */
#define IPCP_OPT_COMPRESSION 2 /* IP compression protocol (VJ) */
#define IPCP_OPT_ADDRESS 3 /* local IP address */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
#define PAP_REQ 1 /* PAP name/password request */
#define PAP_ACK 2 /* PAP acknowledge */
#define PAP_NAK 3 /* PAP fail */
#define CHAP_CHALLENGE 1 /* CHAP challenge request */
#define CHAP_RESPONSE 2 /* CHAP challenge response */
#define CHAP_SUCCESS 3 /* CHAP response ok */
#define CHAP_FAILURE 4 /* CHAP response failed */
#define CHAP_MD5 5 /* hash algorithm - MD5 */
#define CISCO_MULTICAST 0x8f /* Cisco multicast address */
#define CISCO_UNICAST 0x0f /* Cisco unicast address */
#define CISCO_KEEPALIVE 0x8035 /* Cisco keepalive protocol */
#define CISCO_ADDR_REQ 0 /* Cisco address request */
#define CISCO_ADDR_REPLY 1 /* Cisco address reply */
#define CISCO_KEEPALIVE_REQ 2 /* Cisco keepalive request */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* states are named and numbered according to RFC 1661 */
#define STATE_INITIAL 0
#define STATE_STARTING 1
#define STATE_CLOSED 2
#define STATE_STOPPED 3
#define STATE_CLOSING 4
#define STATE_STOPPING 5
#define STATE_REQ_SENT 6
#define STATE_ACK_RCVD 7
#define STATE_ACK_SENT 8
#define STATE_OPENED 9
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
struct ppp_header {
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
u_char address;
u_char control;
u_short protocol;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
};
#define PPP_HEADER_LEN sizeof (struct ppp_header)
struct lcp_header {
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
u_char type;
u_char ident;
u_short len;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
};
#define LCP_HEADER_LEN sizeof (struct lcp_header)
struct cisco_packet {
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
u_long type;
u_long par1;
u_long par2;
u_short rel;
u_short time0;
u_short time1;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
};
#define CISCO_PACKET_LEN 18
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* We follow the spelling and capitalization of RFC 1661 here, to make
* it easier comparing with the standard. Please refer to this RFC in
* case you can't make sense out of these abbreviation; it will also
* explain the semantics related to the various events and actions.
*/
struct cp {
u_short proto; /* PPP control protocol number */
u_char protoidx; /* index into state table in struct sppp */
u_char flags;
#define CP_LCP 0x01 /* this is the LCP */
#define CP_AUTH 0x02 /* this is an authentication protocol */
#define CP_NCP 0x04 /* this is a NCP */
#define CP_QUAL 0x08 /* this is a quality reporting protocol */
const char *name; /* name of this control protocol */
/* event handlers */
void (*Up)(struct sppp *sp);
void (*Down)(struct sppp *sp);
void (*Open)(struct sppp *sp);
void (*Close)(struct sppp *sp);
void (*TO)(void *sp);
int (*RCR)(struct sppp *sp, struct lcp_header *h, int len);
void (*RCN_rej)(struct sppp *sp, struct lcp_header *h, int len);
void (*RCN_nak)(struct sppp *sp, struct lcp_header *h, int len);
/* actions */
void (*tlu)(struct sppp *sp);
void (*tld)(struct sppp *sp);
void (*tls)(struct sppp *sp);
void (*tlf)(struct sppp *sp);
void (*scr)(struct sppp *sp);
};
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static struct sppp *spppq;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static struct callout_handle keepalive_ch;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#define SPP_FMT "%s%d: "
#define SPP_ARGS(ifp) (ifp)->if_name, (ifp)->if_unit
#else
#define SPP_FMT "%s: "
#define SPP_ARGS(ifp) (ifp)->if_xname
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
* The following disgusting hack gets around the problem that IP TOS
* can't be set yet. We want to put "interactive" traffic on a high
* priority queue. To decide if traffic is interactive, we check that
* a) it is TCP and b) one of its ports is telnet, rlogin or ftp control.
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
*
* XXX is this really still necessary? - joerg -
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
static u_short interactive_ports[8] = {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
0, 513, 0, 0,
0, 21, 0, 23,
};
#define INTERACTIVE(p) (interactive_ports[(p) & 7] == (p))
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* almost every function needs these */
#define STDDCL \
struct ifnet *ifp = &sp->pp_if; \
int debug = ifp->if_flags & IFF_DEBUG
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static int sppp_output(struct ifnet *ifp, struct mbuf *m,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
struct sockaddr *dst, struct rtentry *rt);
static void sppp_cisco_send(struct sppp *sp, int type, long par1, long par2);
static void sppp_cisco_input(struct sppp *sp, struct mbuf *m);
static void sppp_cp_input(const struct cp *cp, struct sppp *sp,
struct mbuf *m);
static void sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
u_char ident, u_short len, void *data);
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/* static void sppp_cp_timeout(void *arg); */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_cp_change_state(const struct cp *cp, struct sppp *sp,
int newstate);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void sppp_auth_send(const struct cp *cp,
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
struct sppp *sp, unsigned int type, unsigned int id,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
...);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_up_event(const struct cp *cp, struct sppp *sp);
static void sppp_down_event(const struct cp *cp, struct sppp *sp);
static void sppp_open_event(const struct cp *cp, struct sppp *sp);
static void sppp_close_event(const struct cp *cp, struct sppp *sp);
static void sppp_to_event(const struct cp *cp, struct sppp *sp);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void sppp_null(struct sppp *sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_lcp_init(struct sppp *sp);
static void sppp_lcp_up(struct sppp *sp);
static void sppp_lcp_down(struct sppp *sp);
static void sppp_lcp_open(struct sppp *sp);
static void sppp_lcp_close(struct sppp *sp);
static void sppp_lcp_TO(void *sp);
static int sppp_lcp_RCR(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_lcp_RCN_rej(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_lcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_lcp_tlu(struct sppp *sp);
static void sppp_lcp_tld(struct sppp *sp);
static void sppp_lcp_tls(struct sppp *sp);
static void sppp_lcp_tlf(struct sppp *sp);
static void sppp_lcp_scr(struct sppp *sp);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void sppp_lcp_check_and_close(struct sppp *sp);
static int sppp_ncp_check(struct sppp *sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_ipcp_init(struct sppp *sp);
static void sppp_ipcp_up(struct sppp *sp);
static void sppp_ipcp_down(struct sppp *sp);
static void sppp_ipcp_open(struct sppp *sp);
static void sppp_ipcp_close(struct sppp *sp);
static void sppp_ipcp_TO(void *sp);
static int sppp_ipcp_RCR(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_ipcp_RCN_rej(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_ipcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len);
static void sppp_ipcp_tlu(struct sppp *sp);
static void sppp_ipcp_tld(struct sppp *sp);
static void sppp_ipcp_tls(struct sppp *sp);
static void sppp_ipcp_tlf(struct sppp *sp);
static void sppp_ipcp_scr(struct sppp *sp);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void sppp_pap_input(struct sppp *sp, struct mbuf *m);
static void sppp_pap_init(struct sppp *sp);
static void sppp_pap_open(struct sppp *sp);
static void sppp_pap_close(struct sppp *sp);
static void sppp_pap_TO(void *sp);
static void sppp_pap_my_TO(void *sp);
static void sppp_pap_tlu(struct sppp *sp);
static void sppp_pap_tld(struct sppp *sp);
static void sppp_pap_scr(struct sppp *sp);
static void sppp_chap_input(struct sppp *sp, struct mbuf *m);
static void sppp_chap_init(struct sppp *sp);
static void sppp_chap_open(struct sppp *sp);
static void sppp_chap_close(struct sppp *sp);
static void sppp_chap_TO(void *sp);
static void sppp_chap_tlu(struct sppp *sp);
static void sppp_chap_tld(struct sppp *sp);
static void sppp_chap_scr(struct sppp *sp);
static const char *sppp_auth_type_name(u_short proto, u_char type);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static const char *sppp_cp_type_name(u_char type);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static const char *sppp_dotted_quad(u_long addr);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static const char *sppp_ipcp_opt_name(u_char opt);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static const char *sppp_lcp_opt_name(u_char opt);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static const char *sppp_phase_name(enum ppp_phase phase);
static const char *sppp_proto_name(u_short proto);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static const char *sppp_state_name(int state);
Fixed yet more ioctl breakage due to the type of the `cmd' arg changing from int to u_long but not changing here.
1998-08-15 21:58:09 +00:00
static int sppp_params(struct sppp *sp, u_long cmd, void *data);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static int sppp_strnlen(u_char *p, int max);
static void sppp_get_ip_addrs(struct sppp *sp, u_long *src, u_long *dst,
u_long *srcmask);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_keepalive(void *dummy);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void sppp_phase_network(struct sppp *sp);
static void sppp_print_bytes(const u_char *p, u_short len);
static void sppp_print_string(const char *p, u_short len);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void sppp_qflush(struct ifqueue *ifq);
static void sppp_set_ip_addr(struct sppp *sp, u_long src);
/* our control protocol descriptors */
Staticize.
1998-02-09 06:11:36 +00:00
static const struct cp lcp = {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
PPP_LCP, IDX_LCP, CP_LCP, "lcp",
sppp_lcp_up, sppp_lcp_down, sppp_lcp_open, sppp_lcp_close,
sppp_lcp_TO, sppp_lcp_RCR, sppp_lcp_RCN_rej, sppp_lcp_RCN_nak,
sppp_lcp_tlu, sppp_lcp_tld, sppp_lcp_tls, sppp_lcp_tlf,
sppp_lcp_scr
};
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Staticize.
1998-02-09 06:11:36 +00:00
static const struct cp ipcp = {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
PPP_IPCP, IDX_IPCP, CP_NCP, "ipcp",
sppp_ipcp_up, sppp_ipcp_down, sppp_ipcp_open, sppp_ipcp_close,
sppp_ipcp_TO, sppp_ipcp_RCR, sppp_ipcp_RCN_rej, sppp_ipcp_RCN_nak,
sppp_ipcp_tlu, sppp_ipcp_tld, sppp_ipcp_tls, sppp_ipcp_tlf,
sppp_ipcp_scr
};
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Staticize.
1998-02-09 06:11:36 +00:00
static const struct cp pap = {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
PPP_PAP, IDX_PAP, CP_AUTH, "pap",
sppp_null, sppp_null, sppp_pap_open, sppp_pap_close,
sppp_pap_TO, 0, 0, 0,
sppp_pap_tlu, sppp_pap_tld, sppp_null, sppp_null,
sppp_pap_scr
};
Staticize.
1998-02-09 06:11:36 +00:00
static const struct cp chap = {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
PPP_CHAP, IDX_CHAP, CP_AUTH, "chap",
sppp_null, sppp_null, sppp_chap_open, sppp_chap_close,
sppp_chap_TO, 0, 0, 0,
sppp_chap_tlu, sppp_chap_tld, sppp_null, sppp_null,
sppp_chap_scr
};
Staticize.
1998-02-09 06:11:36 +00:00
static const struct cp *cps[IDX_COUNT] = {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
&lcp, /* IDX_LCP */
&ipcp, /* IDX_IPCP */
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
&pap, /* IDX_PAP */
&chap, /* IDX_CHAP */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
};
/*
* Exported functions, comprising our interface to the lower layer.
*/
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
* Process the received packet.
*/
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
void
sppp_input(struct ifnet *ifp, struct mbuf *m)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct ppp_header *h;
struct ifqueue *inq = 0;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
int s;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
struct sppp *sp = (struct sppp *)ifp;
int debug = ifp->if_flags & IFF_DEBUG;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
if (ifp->if_flags & IFF_UP)
/* Count received bytes, add FCS and one flag */
ifp->if_ibytes += m->m_pkthdr.len + 3;
if (m->m_pkthdr.len <= PPP_HEADER_LEN) {
/* Too small packet, drop it. */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "input packet is too small, %d bytes\n",
SPP_ARGS(ifp), m->m_pkthdr.len);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
drop:
++ifp->if_ierrors;
++ifp->if_iqdrops;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
m_freem (m);
return;
}
/* Get PPP header. */
h = mtod (m, struct ppp_header*);
m_adj (m, PPP_HEADER_LEN);
switch (h->address) {
case PPP_ALLSTATIONS:
if (h->control != PPP_UI)
goto invalid;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
if (sp->pp_flags & PP_CISCO) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "PPP packet in Cisco mode "
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
"<addr=0x%x ctrl=0x%x proto=0x%x>\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
h->address, h->control, ntohs(h->protocol));
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
goto drop;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
switch (ntohs (h->protocol)) {
default:
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
SPP_FMT "rejecting protocol "
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
"<addr=0x%x ctrl=0x%x proto=0x%x>\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
h->address, h->control, ntohs(h->protocol));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
if (sp->state[IDX_LCP] == STATE_OPENED)
sppp_cp_send (sp, PPP_LCP, PROTO_REJ,
++sp->pp_seq, m->m_pkthdr.len + 2,
&h->protocol);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
++ifp->if_noproto;
goto drop;
case PPP_LCP:
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_cp_input(&lcp, sp, m);
m_freem (m);
return;
case PPP_PAP:
if (sp->pp_phase >= PHASE_AUTHENTICATE)
sppp_pap_input(sp, m);
m_freem (m);
return;
case PPP_CHAP:
if (sp->pp_phase >= PHASE_AUTHENTICATE)
sppp_chap_input(sp, m);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
m_freem (m);
return;
#ifdef INET
case PPP_IPCP:
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->pp_phase == PHASE_NETWORK)
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_cp_input(&ipcp, sp, m);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
m_freem (m);
return;
case PPP_IP:
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->state[IDX_IPCP] == STATE_OPENED) {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
schednetisr (NETISR_IP);
inq = &ipintrq;
}
break;
#endif
Implement some rudimentry IPX support...
1995-11-28 01:59:19 +00:00
#ifdef IPX
case PPP_IPX:
/* IPX IPXCP not implemented yet */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->pp_phase == PHASE_NETWORK) {
Implement some rudimentry IPX support...
1995-11-28 01:59:19 +00:00
schednetisr (NETISR_IPX);
inq = &ipxintrq;
}
break;
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#ifdef NS
case PPP_XNS:
/* XNS IDPCP not implemented yet */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->pp_phase == PHASE_NETWORK) {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
schednetisr (NETISR_NS);
inq = &nsintrq;
}
break;
#endif
#ifdef ISO
case PPP_ISO:
/* OSI NLCP not implemented yet */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->pp_phase == PHASE_NETWORK) {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
schednetisr (NETISR_ISO);
inq = &clnlintrq;
}
break;
#endif
}
break;
case CISCO_MULTICAST:
case CISCO_UNICAST:
/* Don't check the control field here (RFC 1547). */
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
if (! (sp->pp_flags & PP_CISCO)) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "Cisco packet in PPP mode "
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
"<addr=0x%x ctrl=0x%x proto=0x%x>\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
h->address, h->control, ntohs(h->protocol));
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
goto drop;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
switch (ntohs (h->protocol)) {
default:
++ifp->if_noproto;
goto invalid;
case CISCO_KEEPALIVE:
sppp_cisco_input ((struct sppp*) ifp, m);
m_freem (m);
return;
#ifdef INET
case ETHERTYPE_IP:
schednetisr (NETISR_IP);
inq = &ipintrq;
break;
#endif
Implement some rudimentry IPX support...
1995-11-28 01:59:19 +00:00
#ifdef IPX
case ETHERTYPE_IPX:
schednetisr (NETISR_IPX);
inq = &ipxintrq;
break;
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#ifdef NS
case ETHERTYPE_NS:
schednetisr (NETISR_NS);
inq = &nsintrq;
break;
#endif
}
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
default: /* Invalid PPP packet. */
invalid:
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "invalid input packet "
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
"<addr=0x%x ctrl=0x%x proto=0x%x>\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
h->address, h->control, ntohs(h->protocol));
goto drop;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
if (! (ifp->if_flags & IFF_UP) || ! inq)
goto drop;
/* Check queue. */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
s = splimp();
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
if (IF_QFULL (inq)) {
/* Queue overflow. */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
IF_DROP(inq);
splx(s);
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "protocol queue overflow\n",
SPP_ARGS(ifp));
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
goto drop;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
IF_ENQUEUE(inq, m);
splx(s);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
/*
* Enqueue transmit packet.
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static int
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
sppp_output(struct ifnet *ifp, struct mbuf *m,
struct sockaddr *dst, struct rtentry *rt)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct sppp *sp = (struct sppp*) ifp;
struct ppp_header *h;
struct ifqueue *ifq;
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
int s, rv = 0;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
int debug = ifp->if_flags & IFF_DEBUG;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
s = splimp();
if ((ifp->if_flags & IFF_UP) == 0 ||
(ifp->if_flags & (IFF_RUNNING | IFF_AUTO)) == 0) {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
m_freem (m);
splx (s);
return (ENETDOWN);
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if ((ifp->if_flags & (IFF_RUNNING | IFF_AUTO)) == IFF_AUTO) {
/*
* Interface is not yet running, but auto-dial. Need
* to start LCP for it.
*/
ifp->if_flags |= IFF_RUNNING;
splx(s);
lcp.Open(sp);
s = splimp();
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
ifq = &ifp->if_snd;
#ifdef INET
If a lcp configure request is received in the lcp opened state and it is acknowledged, it should go to the lcp ack sent state. Don't reply on lcp echo requests when not in the lcp opened state. If the interface is set to CISCO mode, it should still be marked running when ifconfiged. Fixed a few indentations that had gone wrong somewhere. Submitted-by: John.Hay@csir.co.za
1995-11-21 01:23:13 +00:00
if (dst->sa_family == AF_INET) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
/* XXX Check mbuf length here? */
If a lcp configure request is received in the lcp opened state and it is acknowledged, it should go to the lcp ack sent state. Don't reply on lcp echo requests when not in the lcp opened state. If the interface is set to CISCO mode, it should still be marked running when ifconfiged. Fixed a few indentations that had gone wrong somewhere. Submitted-by: John.Hay@csir.co.za
1995-11-21 01:23:13 +00:00
struct ip *ip = mtod (m, struct ip*);
struct tcphdr *tcp = (struct tcphdr*) ((long*)ip + ip->ip_hl);
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/*
* When using dynamic local IP address assignment by using
* 0.0.0.0 as a local address, the first TCP session will
* not connect because the local TCP checksum is computed
* using 0.0.0.0 which will later become our real IP address
* so the TCP checksum computed at the remote end will
* become invalid. So we
* - don't let packets with src ip addr 0 thru
* - we flag TCP packets with src ip 0 as an error
*/
if(ip->ip_src.s_addr == INADDR_ANY) /* -hm */
{
m_freem(m);
splx(s);
if(ip->ip_p == IPPROTO_TCP)
return(EADDRNOTAVAIL);
else
return(0);
}
/*
* Put low delay, telnet, rlogin and ftp control packets
* in front of the queue.
*/
*** empty log message ***
1998-12-11 21:40:13 +00:00
if (IF_QFULL (&sp->pp_fastq))
;
else if (ip->ip_tos & IPTOS_LOWDELAY)
ifq = &sp->pp_fastq;
else if (m->m_len < sizeof *ip + sizeof *tcp)
;
else if (ip->ip_p != IPPROTO_TCP)
;
else if (INTERACTIVE (ntohs (tcp->th_sport)))
ifq = &sp->pp_fastq;
else if (INTERACTIVE (ntohs (tcp->th_dport)))
If a lcp configure request is received in the lcp opened state and it is acknowledged, it should go to the lcp ack sent state. Don't reply on lcp echo requests when not in the lcp opened state. If the interface is set to CISCO mode, it should still be marked running when ifconfiged. Fixed a few indentations that had gone wrong somewhere. Submitted-by: John.Hay@csir.co.za
1995-11-21 01:23:13 +00:00
ifq = &sp->pp_fastq;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
#endif
/*
* Prepend general data packet PPP header. For now, IP only.
*/
M_PREPEND (m, PPP_HEADER_LEN, M_DONTWAIT);
if (! m) {
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "no memory for transmit header\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
++ifp->if_oerrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
splx (s);
return (ENOBUFS);
}
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
/*
* May want to check size of packet
* (albeit due to the implementation it's always enough)
*/
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
h = mtod (m, struct ppp_header*);
if (sp->pp_flags & PP_CISCO) {
Fix a traceroute problem in the CISCO HDLC mode. (cisco routers not returning ICMP_TIMXCEED) use CISCO_UNICAST instead of CISCO_MULTICAST to send normal packets. this is needed for packets to get processed by a cisco router, but doesn't matter if a packet is just forwarded. Reviewed by:itojun@itojun.org
1997-08-12 05:22:54 +00:00
h->address = CISCO_UNICAST; /* unicast address */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
h->control = 0;
} else {
h->address = PPP_ALLSTATIONS; /* broadcast address */
h->control = PPP_UI; /* Unnumbered Info */
}
switch (dst->sa_family) {
#ifdef INET
case AF_INET: /* Internet Protocol */
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
if (sp->pp_flags & PP_CISCO)
h->protocol = htons (ETHERTYPE_IP);
else {
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
/*
* Don't choke with an ENETDOWN early. It's
* possible that we just started dialing out,
* so don't drop the packet immediately. If
* we notice that we run out of buffer space
* below, we will however remember that we are
* not ready to carry IP packets, and return
* ENETDOWN, as opposed to ENOBUFS.
*/
h->protocol = htons(PPP_IP);
if (sp->state[IDX_IPCP] != STATE_OPENED)
rv = ENETDOWN;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
#endif
#ifdef NS
case AF_NS: /* Xerox NS Protocol */
h->protocol = htons ((sp->pp_flags & PP_CISCO) ?
ETHERTYPE_NS : PPP_XNS);
break;
#endif
Reviewed by: julian and jhay@mikom.csir.co.za Submitted by: Mike Mitchell, supervisor@alb.asctmd.com This is a bulk mport of Mike's IPX/SPX protocol stacks and all the related gunf that goes with it.. it is not guaranteed to work 100% correctly at this time but as we had several people trying to work on it I figured it would be better to get it checked in so they could all get teh same thing to work on.. Mikes been using it for a year or so but on 2.0 more changes and stuff will be merged in from other developers now that this is in. Mike Mitchell, Network Engineer AMTECH Systems Corporation, Technology and Manufacturing 8600 Jefferson Street, Albuquerque, New Mexico 87113 (505) 856-8000 supervisor@alb.asctmd.com
1995-10-26 20:31:59 +00:00
#ifdef IPX
Implement some rudimentry IPX support...
1995-11-28 01:59:19 +00:00
case AF_IPX: /* Novell IPX Protocol */
Reviewed by: julian and jhay@mikom.csir.co.za Submitted by: Mike Mitchell, supervisor@alb.asctmd.com This is a bulk mport of Mike's IPX/SPX protocol stacks and all the related gunf that goes with it.. it is not guaranteed to work 100% correctly at this time but as we had several people trying to work on it I figured it would be better to get it checked in so they could all get teh same thing to work on.. Mikes been using it for a year or so but on 2.0 more changes and stuff will be merged in from other developers now that this is in. Mike Mitchell, Network Engineer AMTECH Systems Corporation, Technology and Manufacturing 8600 Jefferson Street, Albuquerque, New Mexico 87113 (505) 856-8000 supervisor@alb.asctmd.com
1995-10-26 20:31:59 +00:00
h->protocol = htons ((sp->pp_flags & PP_CISCO) ?
Implement some rudimentry IPX support...
1995-11-28 01:59:19 +00:00
ETHERTYPE_IPX : PPP_IPX);
Reviewed by: julian and jhay@mikom.csir.co.za Submitted by: Mike Mitchell, supervisor@alb.asctmd.com This is a bulk mport of Mike's IPX/SPX protocol stacks and all the related gunf that goes with it.. it is not guaranteed to work 100% correctly at this time but as we had several people trying to work on it I figured it would be better to get it checked in so they could all get teh same thing to work on.. Mikes been using it for a year or so but on 2.0 more changes and stuff will be merged in from other developers now that this is in. Mike Mitchell, Network Engineer AMTECH Systems Corporation, Technology and Manufacturing 8600 Jefferson Street, Albuquerque, New Mexico 87113 (505) 856-8000 supervisor@alb.asctmd.com
1995-10-26 20:31:59 +00:00
break;
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
#ifdef ISO
case AF_ISO: /* ISO OSI Protocol */
if (sp->pp_flags & PP_CISCO)
goto nosupport;
h->protocol = htons (PPP_ISO);
break;
Add support for two separate cloning flags, one set by the lower layers, and one set by the protocol family. Also add another parameter to rtalloc1() to allow for any interface flags to be ignored; currently this is only useful for RTF_PRCLONING. Get rid of rt_prflags and re-unite with rt_flags. Add T/TCP ``route metrics''. NB: YOU MUST RECOMPILE `route' AND OTHER RELATED PROGRAMS AS A RESULT OF THIS CHANGE. This also adds a new interface parameter, `ifi_physical', which will eventually replace IFF_ALTPHYS as the mechanism for specifying the particular physical connection desired on a multiple-connection card. NB: YOU MUST RECOMPILE `ifconfig' AND OTHER RELATED PROGRAMS AS A RESULT OF THIS CHANGE.
1994-12-13 22:31:49 +00:00
nosupport:
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
default:
m_freem (m);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
++ifp->if_oerrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
splx (s);
return (EAFNOSUPPORT);
}
/*
* Queue message on interface, and start output if interface
* not yet active.
*/
if (IF_QFULL (ifq)) {
IF_DROP (&ifp->if_snd);
m_freem (m);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
++ifp->if_oerrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
splx (s);
Major nit: i've confused link0 and link1 in my brain and/or in either the man page or the source file. Fix this. Minor problem: don't choke with ENETDOWN early. As long as our output queue has space, put the IP packets there even if IPCP ain't up yet. We will eventually be able delivering them once the PPP state machine came up.
1997-05-20 22:54:04 +00:00
return (rv? rv: ENOBUFS);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
IF_ENQUEUE (ifq, m);
if (! (ifp->if_flags & IFF_OACTIVE))
(*ifp->if_start) (ifp);
/*
* Count output packets and bytes.
* The packet length includes header, FCS and 1 flag,
* according to RFC 1333.
*/
ifp->if_obytes += m->m_pkthdr.len + 3;
splx (s);
return (0);
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
void
sppp_attach(struct ifnet *ifp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct sppp *sp = (struct sppp*) ifp;
/* Initialize keepalive handler. */
if (! spppq)
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(sppp_keepalive, 0, hz * 10, keepalive_ch);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/* Insert new entry into the keepalive list. */
sp->pp_next = spppq;
spppq = sp;
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
sp->pp_if.if_mtu = PP_MTU;
sp->pp_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
sp->pp_if.if_type = IFT_PPP;
sp->pp_if.if_output = sppp_output;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#if 0
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
sp->pp_flags = PP_KEEPALIVE;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
sp->pp_fastq.ifq_maxlen = 32;
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
sp->pp_cpq.ifq_maxlen = 20;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
sp->pp_loopcnt = 0;
sp->pp_alivecnt = 0;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
sp->pp_seq = 0;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
sp->pp_rseq = 0;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_phase = PHASE_DEAD;
sp->pp_up = lcp.Up;
sp->pp_down = lcp.Down;
sppp_lcp_init(sp);
sppp_ipcp_init(sp);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_pap_init(sp);
sppp_chap_init(sp);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
void
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
sppp_detach(struct ifnet *ifp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct sppp **q, *p, *sp = (struct sppp*) ifp;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int i;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/* Remove the entry from the keepalive list. */
for (q = &spppq; (p = *q); q = &p->pp_next)
if (p == sp) {
*q = p->pp_next;
break;
}
/* Stop keepalive handler. */
if (! spppq)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
UNTIMEOUT(sppp_keepalive, 0, keepalive_ch);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
for (i = 0; i < IDX_COUNT; i++)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
UNTIMEOUT((cps[i])->TO, (void *)sp, sp->ch[i]);
UNTIMEOUT(sppp_pap_my_TO, (void *)sp, sp->pap_my_to_ch);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
/*
* Flush the interface output queue.
*/
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
void
sppp_flush(struct ifnet *ifp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct sppp *sp = (struct sppp*) ifp;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_qflush (&sp->pp_if.if_snd);
sppp_qflush (&sp->pp_fastq);
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
sppp_qflush (&sp->pp_cpq);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
/*
* Check if the output queue is empty.
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
int
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
sppp_isempty(struct ifnet *ifp)
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
{
struct sppp *sp = (struct sppp*) ifp;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int empty, s;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
s = splimp();
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
empty = !sp->pp_fastq.ifq_head && !sp->pp_cpq.ifq_head &&
!sp->pp_if.if_snd.ifq_head;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
splx(s);
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
return (empty);
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
* Get next packet to send.
*/
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
struct mbuf *
sppp_dequeue(struct ifnet *ifp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
struct sppp *sp = (struct sppp*) ifp;
struct mbuf *m;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int s;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
s = splimp();
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* Process only the control protocol queue until we have at
* least one NCP open.
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
*
* Do always serve all three queues in Cisco mode.
*/
IF_DEQUEUE(&sp->pp_cpq, m);
if (m == NULL &&
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
(sppp_ncp_check(sp) || (sp->pp_flags & PP_CISCO) != 0)) {
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
IF_DEQUEUE(&sp->pp_fastq, m);
if (m == NULL)
IF_DEQUEUE (&sp->pp_if.if_snd, m);
}
splx(s);
return m;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/*
* Pick the next packet, do not remove it from the queue.
*/
struct mbuf *
sppp_pick(struct ifnet *ifp)
{
struct sppp *sp = (struct sppp*)ifp;
struct mbuf *m;
int s;
s= splimp ();
m = sp->pp_cpq.ifq_head;
if (m == NULL &&
(sp->pp_phase == PHASE_NETWORK ||
(sp->pp_flags & PP_CISCO) != 0))
if ((m = sp->pp_fastq.ifq_head) == NULL)
m = sp->pp_if.if_snd.ifq_head;
splx (s);
return (m);
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Process an ioctl request. Called on low priority level.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sppp_ioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, void *data)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
struct ifreq *ifr = (struct ifreq*) data;
struct sppp *sp = (struct sppp*) ifp;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
int s, rv, going_up, going_down, newmode;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
s = splimp();
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
rv = 0;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (cmd) {
case SIOCAIFADDR:
case SIOCSIFDSTADDR:
break;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case SIOCSIFADDR:
if_up(ifp);
/* fall through... */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case SIOCSIFFLAGS:
going_up = ifp->if_flags & IFF_UP &&
(ifp->if_flags & IFF_RUNNING) == 0;
going_down = (ifp->if_flags & IFF_UP) == 0 &&
ifp->if_flags & IFF_RUNNING;
newmode = ifp->if_flags & (IFF_AUTO | IFF_PASSIVE);
if (newmode == (IFF_AUTO | IFF_PASSIVE)) {
/* sanity */
newmode = IFF_PASSIVE;
ifp->if_flags &= ~IFF_AUTO;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (going_up || going_down)
lcp.Close(sp);
if (going_up && newmode == 0) {
/* neither auto-dial nor passive */
ifp->if_flags |= IFF_RUNNING;
if (!(sp->pp_flags & PP_CISCO))
lcp.Open(sp);
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
} else if (going_down) {
sppp_flush(ifp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
ifp->if_flags &= ~IFF_RUNNING;
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
#ifdef SIOCSIFMTU
#ifndef ifr_mtu
#define ifr_mtu ifr_metric
#endif
case SIOCSIFMTU:
if (ifr->ifr_mtu < 128 || ifr->ifr_mtu > sp->lcp.their_mru)
return (EINVAL);
ifp->if_mtu = ifr->ifr_mtu;
break;
#endif
#ifdef SLIOCSETMTU
case SLIOCSETMTU:
if (*(short*)data < 128 || *(short*)data > sp->lcp.their_mru)
return (EINVAL);
ifp->if_mtu = *(short*)data;
break;
#endif
#ifdef SIOCGIFMTU
case SIOCGIFMTU:
ifr->ifr_mtu = ifp->if_mtu;
break;
#endif
#ifdef SLIOCGETMTU
case SLIOCGETMTU:
*(short*)data = ifp->if_mtu;
break;
#endif
case SIOCADDMULTI:
case SIOCDELMULTI:
break;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case SIOCGIFGENERIC:
case SIOCSIFGENERIC:
rv = sppp_params(sp, cmd, data);
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
default:
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
rv = ENOTTY;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
splx(s);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return rv;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Cisco framing implementation.
*/
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Handle incoming Cisco keepalive protocol packets.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cisco_input(struct sppp *sp, struct mbuf *m)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
STDDCL;
struct cisco_packet *h;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
u_long me, mymask;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
PR: kern/4117 Reviewed by: ishii@csl.sony.co.jp, kjc@csl.sony.co.jp checked with FreeBSD+Riscom - cisco4500 configuration.
1997-08-06 01:43:09 +00:00
if (m->m_pkthdr.len < CISCO_PACKET_LEN) {
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "cisco invalid packet length: %d bytes\n",
SPP_ARGS(ifp), m->m_pkthdr.len);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
return;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
h = mtod (m, struct cisco_packet*);
if (debug)
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "cisco input: %d bytes "
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
"<0x%lx 0x%lx 0x%lx 0x%x 0x%x-0x%x>\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp), m->m_pkthdr.len,
(u_long)ntohl (h->type), (u_long)h->par1, (u_long)h->par2, (u_int)h->rel,
(u_int)h->time0, (u_int)h->time1);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (ntohl (h->type)) {
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
default:
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "cisco unknown packet type: 0x%lx\n",
SPP_ARGS(ifp), (u_long)ntohl (h->type));
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case CISCO_ADDR_REPLY:
/* Reply on address request, ignore */
break;
case CISCO_KEEPALIVE_REQ:
sp->pp_alivecnt = 0;
sp->pp_rseq = ntohl (h->par1);
if (sp->pp_seq == sp->pp_rseq) {
/* Local and remote sequence numbers are equal.
* Probably, the line is in loopback mode. */
if (sp->pp_loopcnt >= MAXALIVECNT) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf (SPP_FMT "loopback\n",
SPP_ARGS(ifp));
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
sp->pp_loopcnt = 0;
if (ifp->if_flags & IFF_UP) {
if_down (ifp);
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
sppp_qflush (&sp->pp_cpq);
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
}
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
++sp->pp_loopcnt;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Generate new local sequence number */
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Use random() for seq numbers and read_random for CHAP challenge.
1998-04-06 11:40:17 +00:00
sp->pp_seq = random();
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
sp->pp_seq ^= time.tv_sec ^ time.tv_usec;
#endif
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
break;
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->pp_loopcnt = 0;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
if (! (ifp->if_flags & IFF_UP) &&
(ifp->if_flags & IFF_RUNNING)) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if_up(ifp);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf (SPP_FMT "up\n", SPP_ARGS(ifp));
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
}
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case CISCO_ADDR_REQ:
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_get_ip_addrs(sp, &me, 0, &mymask);
if (me != 0L)
sppp_cisco_send(sp, CISCO_ADDR_REPLY, me, mymask);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
}
}
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Send Cisco keepalive packet.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void
sppp_cisco_send(struct sppp *sp, int type, long par1, long par2)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
STDDCL;
struct ppp_header *h;
struct cisco_packet *ch;
struct mbuf *m;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Time changes mark 2: * Figure out UTC relative to boottime. Four new functions provide time relative to boottime. * move "runtime" into struct proc. This helps fix the calcru() problem in SMP. * kill mono_time. * add timespec{add|sub|cmp} macros to time.h. (XXX: These may change!) * nanosleep, select & poll takes long sleeps one day at a time Reviewed by: bde Tested by: ache and others
1998-04-04 13:26:20 +00:00
struct timeval tv;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
u_long t = (time.tv_sec - boottime.tv_sec) * 1000;
#endif
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
s/nanoruntime/nanouptime/g s/microruntime/microuptime/g Reviewed by: bde
1998-05-17 11:53:46 +00:00
getmicrouptime(&tv);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Time changes mark 2: * Figure out UTC relative to boottime. Four new functions provide time relative to boottime. * move "runtime" into struct proc. This helps fix the calcru() problem in SMP. * kill mono_time. * add timespec{add|sub|cmp} macros to time.h. (XXX: These may change!) * nanosleep, select & poll takes long sleeps one day at a time Reviewed by: bde Tested by: ache and others
1998-04-04 13:26:20 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
MGETHDR (m, M_DONTWAIT, MT_DATA);
if (! m)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
return;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + CISCO_PACKET_LEN;
m->m_pkthdr.rcvif = 0;
h = mtod (m, struct ppp_header*);
h->address = CISCO_MULTICAST;
h->control = 0;
h->protocol = htons (CISCO_KEEPALIVE);
ch = (struct cisco_packet*) (h + 1);
ch->type = htonl (type);
ch->par1 = htonl (par1);
ch->par2 = htonl (par2);
ch->rel = -1;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Time changes mark 2: * Figure out UTC relative to boottime. Four new functions provide time relative to boottime. * move "runtime" into struct proc. This helps fix the calcru() problem in SMP. * kill mono_time. * add timespec{add|sub|cmp} macros to time.h. (XXX: These may change!) * nanosleep, select & poll takes long sleeps one day at a time Reviewed by: bde Tested by: ache and others
1998-04-04 13:26:20 +00:00
ch->time0 = htons ((u_short) (tv.tv_sec >> 16));
ch->time1 = htons ((u_short) tv.tv_sec);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
ch->time0 = htons ((u_short) (t >> 16));
ch->time1 = htons ((u_short) t);
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "cisco output: <0x%lx 0x%lx 0x%lx 0x%x 0x%x-0x%x>\n",
SPP_ARGS(ifp), (u_long)ntohl (ch->type), (u_long)ch->par1,
(u_long)ch->par2, (u_int)ch->rel, (u_int)ch->time0, (u_int)ch->time1);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
if (IF_QFULL (&sp->pp_cpq)) {
IF_DROP (&sp->pp_fastq);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
IF_DROP (&ifp->if_snd);
m_freem (m);
} else
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
IF_ENQUEUE (&sp->pp_cpq, m);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (! (ifp->if_flags & IFF_OACTIVE))
(*ifp->if_start) (ifp);
ifp->if_obytes += m->m_pkthdr.len + 3;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* PPP protocol implementation.
*/
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Send PPP control protocol packet.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
sppp_cp_send(struct sppp *sp, u_short proto, u_char type,
u_char ident, u_short len, void *data)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
STDDCL;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
struct ppp_header *h;
struct lcp_header *lh;
struct mbuf *m;
if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN)
len = MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN;
MGETHDR (m, M_DONTWAIT, MT_DATA);
if (! m)
return;
m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
m->m_pkthdr.rcvif = 0;
h = mtod (m, struct ppp_header*);
h->address = PPP_ALLSTATIONS; /* broadcast address */
h->control = PPP_UI; /* Unnumbered Info */
h->protocol = htons (proto); /* Link Control Protocol */
lh = (struct lcp_header*) (h + 1);
lh->type = type;
lh->ident = ident;
lh->len = htons (LCP_HEADER_LEN + len);
if (len)
bcopy (data, lh+1, len);
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s output <%s id=0x%x len=%d",
SPP_ARGS(ifp),
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_proto_name(proto),
sppp_cp_type_name (lh->type), lh->ident,
ntohs (lh->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes ((u_char*) (lh+1), len);
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
addlog(">\n");
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
if (IF_QFULL (&sp->pp_cpq)) {
IF_DROP (&sp->pp_fastq);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
IF_DROP (&ifp->if_snd);
m_freem (m);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
++ifp->if_oerrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
} else
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
IF_ENQUEUE (&sp->pp_cpq, m);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
if (! (ifp->if_flags & IFF_OACTIVE))
(*ifp->if_start) (ifp);
ifp->if_obytes += m->m_pkthdr.len + 3;
}
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Handle incoming PPP control protocol packets.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
STDDCL;
struct lcp_header *h;
int len = m->m_pkthdr.len;
int rv;
u_char *p;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (len < 4) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "%s invalid packet length: %d bytes\n",
SPP_ARGS(ifp), cp->name, len);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
return;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
h = mtod (m, struct lcp_header*);
if (debug) {
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "%s input(%s): <%s id=0x%x len=%d",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]),
sppp_cp_type_name (h->type), h->ident, ntohs (h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes ((u_char*) (h+1), len-4);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog(">\n");
}
if (len > ntohs (h->len))
len = ntohs (h->len);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
p = (u_char *)(h + 1);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (h->type) {
case CONF_REQ:
if (len < 4) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "%s invalid conf-req length %d\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
len);
++ifp->if_ierrors;
break;
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/* handle states where RCR doesn't get a SCA/SCN */
switch (sp->state[cp->protoidx]) {
case STATE_CLOSING:
case STATE_STOPPING:
return;
case STATE_CLOSED:
sppp_cp_send(sp, cp->proto, TERM_ACK, h->ident,
0, 0);
return;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
rv = (cp->RCR)(sp, h, len);
switch (sp->state[cp->protoidx]) {
case STATE_OPENED:
(cp->tld)(sp);
(cp->scr)(sp);
/* fall through... */
case STATE_ACK_SENT:
case STATE_REQ_SENT:
sppp_cp_change_state(cp, sp, rv?
STATE_ACK_SENT: STATE_REQ_SENT);
break;
case STATE_STOPPED:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
(cp->scr)(sp);
sppp_cp_change_state(cp, sp, rv?
STATE_ACK_SENT: STATE_REQ_SENT);
break;
case STATE_ACK_RCVD:
if (rv) {
sppp_cp_change_state(cp, sp, STATE_OPENED);
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s tlu\n",
SPP_ARGS(ifp),
Fix a couple of log()'s that came out with the wrong (default) log level, as opposed to LOG_DEBUG.
1997-05-23 20:40:15 +00:00
cp->name);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
(cp->tlu)(sp);
} else
sppp_cp_change_state(cp, sp, STATE_ACK_RCVD);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case CONF_ACK:
if (h->ident != sp->confid[cp->protoidx]) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "%s id mismatch 0x%x != 0x%x\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
h->ident, sp->confid[cp->protoidx]);
++ifp->if_ierrors;
break;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (sp->state[cp->protoidx]) {
case STATE_CLOSED:
case STATE_STOPPED:
sppp_cp_send(sp, cp->proto, TERM_ACK, h->ident, 0, 0);
break;
case STATE_CLOSING:
case STATE_STOPPING:
break;
case STATE_REQ_SENT:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
sppp_cp_change_state(cp, sp, STATE_ACK_RCVD);
break;
case STATE_OPENED:
(cp->tld)(sp);
/* fall through */
case STATE_ACK_RCVD:
(cp->scr)(sp);
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
case STATE_ACK_SENT:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
sppp_cp_change_state(cp, sp, STATE_OPENED);
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s tlu\n",
SPP_ARGS(ifp), cp->name);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
(cp->tlu)(sp);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case CONF_NAK:
case CONF_REJ:
if (h->ident != sp->confid[cp->protoidx]) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "%s id mismatch 0x%x != 0x%x\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
h->ident, sp->confid[cp->protoidx]);
++ifp->if_ierrors;
break;
}
if (h->type == CONF_NAK)
(cp->RCN_nak)(sp, h, len);
else /* CONF_REJ */
(cp->RCN_rej)(sp, h, len);
switch (sp->state[cp->protoidx]) {
case STATE_CLOSED:
case STATE_STOPPED:
sppp_cp_send(sp, cp->proto, TERM_ACK, h->ident, 0, 0);
break;
case STATE_REQ_SENT:
case STATE_ACK_SENT:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
(cp->scr)(sp);
break;
case STATE_OPENED:
(cp->tld)(sp);
/* fall through */
case STATE_ACK_RCVD:
sppp_cp_change_state(cp, sp, STATE_ACK_SENT);
(cp->scr)(sp);
break;
case STATE_CLOSING:
case STATE_STOPPING:
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case TERM_REQ:
switch (sp->state[cp->protoidx]) {
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
/* fall through */
case STATE_CLOSED:
case STATE_STOPPED:
case STATE_CLOSING:
case STATE_STOPPING:
case STATE_REQ_SENT:
sta:
/* Send Terminate-Ack packet. */
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s send terminate-ack\n",
SPP_ARGS(ifp), cp->name);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_send(sp, cp->proto, TERM_ACK, h->ident, 0, 0);
break;
case STATE_OPENED:
(cp->tld)(sp);
sp->rst_counter[cp->protoidx] = 0;
sppp_cp_change_state(cp, sp, STATE_STOPPING);
goto sta;
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case TERM_ACK:
switch (sp->state[cp->protoidx]) {
case STATE_CLOSED:
case STATE_STOPPED:
case STATE_REQ_SENT:
case STATE_ACK_SENT:
break;
case STATE_CLOSING:
sppp_cp_change_state(cp, sp, STATE_CLOSED);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_STOPPING:
sppp_cp_change_state(cp, sp, STATE_STOPPED);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_ACK_RCVD:
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
case STATE_OPENED:
(cp->tld)(sp);
(cp->scr)(sp);
sppp_cp_change_state(cp, sp, STATE_ACK_RCVD);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case CODE_REJ:
case PROTO_REJ:
/* XXX catastrophic rejects (RXJ-) aren't handled yet. */
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
log(LOG_INFO,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "%s: ignoring RXJ (%s) for proto 0x%x, "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"danger will robinson\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp), cp->name,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_cp_type_name(h->type), ntohs(*((u_short *)p)));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (sp->state[cp->protoidx]) {
case STATE_CLOSED:
case STATE_STOPPED:
case STATE_REQ_SENT:
case STATE_ACK_SENT:
case STATE_CLOSING:
case STATE_STOPPING:
case STATE_OPENED:
break;
case STATE_ACK_RCVD:
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal %s in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(h->type),
sppp_state_name(sp->state[cp->protoidx]));
++ifp->if_ierrors;
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case DISC_REQ:
if (cp->proto != PPP_LCP)
goto illegal;
/* Discard the packet. */
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case ECHO_REQ:
if (cp->proto != PPP_LCP)
goto illegal;
if (sp->state[cp->protoidx] != STATE_OPENED) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "lcp echo req but lcp closed\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
++ifp->if_ierrors;
break;
}
if (len < 8) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "invalid lcp echo request "
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
"packet length: %d bytes\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp), len);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
if ((sp->lcp.opts & (1 << LCP_OPT_MAGIC)) &&
ntohl (*(long*)(h+1)) == sp->lcp.magic) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Line loopback mode detected. */
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "loopback\n", SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if_down (ifp);
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
sppp_qflush (&sp->pp_cpq);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Shut down the PPP link. */
/* XXX */
lcp.Down(sp);
lcp.Up(sp);
break;
}
*(long*)(h+1) = htonl (sp->lcp.magic);
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "got lcp echo req, sending echo rep\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_send (sp, PPP_LCP, ECHO_REPLY, h->ident, len-4, h+1);
break;
case ECHO_REPLY:
if (cp->proto != PPP_LCP)
goto illegal;
if (h->ident != sp->lcp.echoid) {
++ifp->if_ierrors;
break;
}
if (len < 8) {
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "lcp invalid echo reply "
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
"packet length: %d bytes\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp), len);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
}
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "lcp got echo rep\n",
SPP_ARGS(ifp));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
if (!(sp->lcp.opts & (1 << LCP_OPT_MAGIC)) ||
ntohl (*(long*)(h+1)) != sp->lcp.magic)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_alivecnt = 0;
break;
default:
/* Unknown packet type -- send Code-Reject packet. */
illegal:
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog(SPP_FMT "%s send code-rej for 0x%x\n",
SPP_ARGS(ifp), cp->name, h->type);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_send(sp, cp->proto, CODE_REJ, ++sp->pp_seq,
m->m_pkthdr.len, h);
++ifp->if_ierrors;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* The generic part of all Up/Down/Open/Close/TO event handlers.
* Basically, the state transition handling in the automaton.
*/
static void
sppp_up_event(const struct cp *cp, struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s up(%s)\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
switch (sp->state[cp->protoidx]) {
case STATE_INITIAL:
sppp_cp_change_state(cp, sp, STATE_CLOSED);
break;
case STATE_STARTING:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
(cp->scr)(sp);
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal up in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
}
}
static void
sppp_down_event(const struct cp *cp, struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s down(%s)\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
switch (sp->state[cp->protoidx]) {
case STATE_CLOSED:
case STATE_CLOSING:
sppp_cp_change_state(cp, sp, STATE_INITIAL);
break;
case STATE_STOPPED:
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
sppp_cp_change_state(cp, sp, STATE_STARTING);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
(cp->tls)(sp);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
case STATE_STOPPING:
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
sppp_cp_change_state(cp, sp, STATE_STARTING);
break;
case STATE_OPENED:
(cp->tld)(sp);
sppp_cp_change_state(cp, sp, STATE_STARTING);
break;
default:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf(SPP_FMT "%s illegal down in state %s\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
}
}
static void
sppp_open_event(const struct cp *cp, struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s open(%s)\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
switch (sp->state[cp->protoidx]) {
case STATE_INITIAL:
sppp_cp_change_state(cp, sp, STATE_STARTING);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tls)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_STARTING:
break;
case STATE_CLOSED:
sp->rst_counter[cp->protoidx] = sp->lcp.max_configure;
(cp->scr)(sp);
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
case STATE_STOPPED:
case STATE_STOPPING:
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
case STATE_OPENED:
break;
case STATE_CLOSING:
sppp_cp_change_state(cp, sp, STATE_STOPPING);
break;
}
}
static void
sppp_close_event(const struct cp *cp, struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s close(%s)\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]));
switch (sp->state[cp->protoidx]) {
case STATE_INITIAL:
case STATE_CLOSED:
case STATE_CLOSING:
break;
case STATE_STARTING:
sppp_cp_change_state(cp, sp, STATE_INITIAL);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_STOPPED:
sppp_cp_change_state(cp, sp, STATE_CLOSED);
break;
case STATE_STOPPING:
sppp_cp_change_state(cp, sp, STATE_CLOSING);
break;
case STATE_OPENED:
(cp->tld)(sp);
/* fall through */
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
sp->rst_counter[cp->protoidx] = sp->lcp.max_terminate;
sppp_cp_send(sp, cp->proto, TERM_REQ, ++sp->pp_seq, 0, 0);
sppp_cp_change_state(cp, sp, STATE_CLOSING);
break;
}
}
static void
sppp_to_event(const struct cp *cp, struct sppp *sp)
{
STDDCL;
int s;
s = splimp();
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s TO(%s) rst_counter = %d\n",
SPP_ARGS(ifp), cp->name,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_state_name(sp->state[cp->protoidx]),
sp->rst_counter[cp->protoidx]);
if (--sp->rst_counter[cp->protoidx] < 0)
/* TO- event */
switch (sp->state[cp->protoidx]) {
case STATE_CLOSING:
sppp_cp_change_state(cp, sp, STATE_CLOSED);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_STOPPING:
sppp_cp_change_state(cp, sp, STATE_STOPPED);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
sppp_cp_change_state(cp, sp, STATE_STOPPED);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
(cp->tlf)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
}
else
/* TO+ event */
switch (sp->state[cp->protoidx]) {
case STATE_CLOSING:
case STATE_STOPPING:
sppp_cp_send(sp, cp->proto, TERM_REQ, ++sp->pp_seq,
0, 0);
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(cp->TO, (void *)sp, sp->lcp.timeout,
sp->ch[cp->protoidx]);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
(cp->scr)(sp);
/* sppp_cp_change_state() will restart the timer */
sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
break;
case STATE_ACK_SENT:
(cp->scr)(sp);
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(cp->TO, (void *)sp, sp->lcp.timeout,
sp->ch[cp->protoidx]);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
}
splx(s);
}
/*
* Change the state of a control protocol in the state automaton.
* Takes care of starting/stopping the restart timer.
*/
void
sppp_cp_change_state(const struct cp *cp, struct sppp *sp, int newstate)
{
sp->state[cp->protoidx] = newstate;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
UNTIMEOUT(cp->TO, (void *)sp, sp->ch[cp->protoidx]);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (newstate) {
case STATE_INITIAL:
case STATE_STARTING:
case STATE_CLOSED:
case STATE_STOPPED:
case STATE_OPENED:
break;
case STATE_CLOSING:
case STATE_STOPPING:
case STATE_REQ_SENT:
case STATE_ACK_RCVD:
case STATE_ACK_SENT:
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(cp->TO, (void *)sp, sp->lcp.timeout,
sp->ch[cp->protoidx]);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
break;
}
}
/*
*--------------------------------------------------------------------------*
* *
* The LCP implementation. *
* *
*--------------------------------------------------------------------------*
*/
static void
sppp_lcp_init(struct sppp *sp)
{
sp->lcp.opts = (1 << LCP_OPT_MAGIC);
sp->lcp.magic = 0;
sp->state[IDX_LCP] = STATE_INITIAL;
sp->fail_counter[IDX_LCP] = 0;
sp->lcp.protos = 0;
sp->lcp.mru = sp->lcp.their_mru = PP_MTU;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
/* Note that these values are relevant for all control protocols */
sp->lcp.timeout = 3 * hz;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->lcp.max_terminate = 2;
sp->lcp.max_configure = 10;
sp->lcp.max_failure = 10;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
callout_handle_init(&sp->ch[IDX_LCP]);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static void
sppp_lcp_up(struct sppp *sp)
{
STDDCL;
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* If this interface is passive or dial-on-demand, and we are
* still in Initial state, it means we've got an incoming
* call. Activate the interface.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
if ((ifp->if_flags & (IFF_AUTO | IFF_PASSIVE)) != 0) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "Up event", SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
ifp->if_flags |= IFF_RUNNING;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (sp->state[IDX_LCP] == STATE_INITIAL) {
if (debug)
addlog("(incoming call)\n");
sp->pp_flags |= PP_CALLIN;
lcp.Open(sp);
} else if (debug)
addlog("\n");
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
sppp_up_event(&lcp, sp);
}
static void
sppp_lcp_down(struct sppp *sp)
{
STDDCL;
sppp_down_event(&lcp, sp);
/*
* If this is neither a dial-on-demand nor a passive
* interface, simulate an ``ifconfig down'' action, so the
* administrator can force a redial by another ``ifconfig
* up''. XXX For leased line operation, should we immediately
* try to reopen the connection here?
*/
if ((ifp->if_flags & (IFF_AUTO | IFF_PASSIVE)) == 0) {
log(LOG_INFO,
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
SPP_FMT "Down event, taking interface down.\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if_down(ifp);
} else {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "Down event (carrier loss)\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->pp_flags &= ~PP_CALLIN;
if (sp->state[IDX_LCP] != STATE_INITIAL)
lcp.Close(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
ifp->if_flags &= ~IFF_RUNNING;
}
static void
sppp_lcp_open(struct sppp *sp)
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/*
* If we are authenticator, negotiate LCP_AUTH
*/
if (sp->hisauth.proto != 0)
sp->lcp.opts |= (1 << LCP_OPT_AUTH_PROTO);
else
sp->lcp.opts &= ~(1 << LCP_OPT_AUTH_PROTO);
sp->pp_flags &= ~PP_NEEDAUTH;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_open_event(&lcp, sp);
}
static void
sppp_lcp_close(struct sppp *sp)
{
sppp_close_event(&lcp, sp);
}
static void
sppp_lcp_TO(void *cookie)
{
sppp_to_event(&lcp, (struct sppp *)cookie);
}
/*
* Analyze a configure request. Return true if it was agreeable, and
* caused action sca, false if it has been rejected or nak'ed, and
* caused action scn. (The return value is used to make the state
* transition decision in the state automaton.)
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static int
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_lcp_RCR(struct sppp *sp, struct lcp_header *h, int len)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
STDDCL;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
u_char *buf, *r, *p;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int origlen, rlen;
u_long nmagic;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
u_short authproto;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
len -= 4;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
origlen = len;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
buf = r = malloc (len, M_TEMP, M_NOWAIT);
if (! buf)
return (0);
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "lcp parse opts: ",
SPP_ARGS(ifp));
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* pass 1: check for things that need to be rejected */
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
p = (void*) (h+1);
for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
addlog(" %s ", sppp_lcp_opt_name(*p));
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
switch (*p) {
case LCP_OPT_MAGIC:
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Magic number. */
/* fall through, both are same length */
case LCP_OPT_ASYNC_MAP:
/* Async control character map. */
if (len >= 6 || p[1] == 6)
continue;
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog("[invalid] ");
break;
case LCP_OPT_MRU:
/* Maximum receive unit. */
if (len >= 4 && p[1] == 4)
continue;
if (debug)
addlog("[invalid] ");
break;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case LCP_OPT_AUTH_PROTO:
if (len < 4) {
if (debug)
addlog("[invalid] ");
break;
}
authproto = (p[2] << 8) + p[3];
if (authproto == PPP_CHAP && p[1] != 5) {
if (debug)
addlog("[invalid chap len] ");
break;
}
if (sp->myauth.proto == 0) {
/* we are not configured to do auth */
if (debug)
addlog("[not configured] ");
break;
}
/*
* Remote want us to authenticate, remember this,
* so we stay in PHASE_AUTHENTICATE after LCP got
* up.
*/
sp->pp_flags |= PP_NEEDAUTH;
continue;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
default:
/* Others not supported. */
if (debug)
addlog("[rej] ");
break;
}
/* Add the option to rejected list. */
bcopy (p, r, p[1]);
r += p[1];
rlen += p[1];
}
if (rlen) {
if (debug)
addlog(" send conf-rej\n");
sppp_cp_send (sp, PPP_LCP, CONF_REJ, h->ident, rlen, buf);
return 0;
} else if (debug)
addlog("\n");
/*
* pass 2: check for option values that are unacceptable and
* thus require to be nak'ed.
*/
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "lcp parse opt values: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
len = origlen;
for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
if (debug)
addlog(" %s ", sppp_lcp_opt_name(*p));
switch (*p) {
case LCP_OPT_MAGIC:
/* Magic number -- extract. */
nmagic = (u_long)p[2] << 24 |
(u_long)p[3] << 16 | p[4] << 8 | p[5];
if (nmagic != sp->lcp.magic) {
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Fixed printf format errors. sppp_dotted_quad() was yet another private, broken, version of inet_ntoa(). It should go away.
1998-08-17 00:29:34 +00:00
addlog("0x%lx ", nmagic);
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
continue;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Local and remote magics equal -- loopback?
*/
if (sp->pp_loopcnt >= MAXALIVECNT*5) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf (SPP_FMT "loopback\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_loopcnt = 0;
if (ifp->if_flags & IFF_UP) {
if_down(ifp);
Introduce a third queue per interface, serving only PPP control protocol packets. This queue is the only one being enabled until network phase has been reached.
1997-05-22 22:15:39 +00:00
sppp_qflush(&sp->pp_cpq);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* XXX ? */
lcp.Down(sp);
lcp.Up(sp);
}
} else if (debug)
addlog("[glitch] ");
++sp->pp_loopcnt;
/*
* We negate our magic here, and NAK it. If
* we see it later in an NAK packet, we
* suggest a new one.
*/
nmagic = ~sp->lcp.magic;
/* Gonna NAK it. */
p[2] = nmagic >> 24;
p[3] = nmagic >> 16;
p[4] = nmagic >> 8;
p[5] = nmagic;
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
case LCP_OPT_ASYNC_MAP:
/* Async control character map -- check to be zero. */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (! p[2] && ! p[3] && ! p[4] && ! p[5]) {
if (debug)
addlog("[empty] ");
continue;
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog("[non-empty] ");
/* suggest a zero one */
p[2] = p[3] = p[4] = p[5] = 0;
break;
case LCP_OPT_MRU:
/*
* Maximum receive unit. Always agreeable,
* but ignored by now.
*/
sp->lcp.their_mru = p[2] * 256 + p[3];
if (debug)
Fixed printf format errors. sppp_dotted_quad() was yet another private, broken, version of inet_ntoa(). It should go away.
1998-08-17 00:29:34 +00:00
addlog("%lu ", sp->lcp.their_mru);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
continue;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case LCP_OPT_AUTH_PROTO:
authproto = (p[2] << 8) + p[3];
if (sp->myauth.proto != authproto) {
/* not agreed, nak */
if (debug)
addlog("[mine %s != his %s] ",
sppp_proto_name(sp->hisauth.proto),
sppp_proto_name(authproto));
p[2] = sp->myauth.proto >> 8;
p[3] = sp->myauth.proto;
break;
}
if (authproto == PPP_CHAP && p[4] != CHAP_MD5) {
if (debug)
addlog("[chap not MD5] ");
Fix a =/== confusion that caused the CHAP type renegotiation to completely fail. Obtained from: The isdn4bsd project (original author unknown right now)
1998-10-05 21:02:30 +00:00
p[4] = CHAP_MD5;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
break;
}
continue;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
/* Add the option to nak'ed list. */
bcopy (p, r, p[1]);
r += p[1];
rlen += p[1];
}
if (rlen) {
Implement the LCP fail_counter: if an option has been NAK'ed for more than max_failures attempts, we are going to REJ it, to prevent endless NAK loops. (This is actually part of a larger local set of modifications i'm running with, but the remainder (PAP & CHAP) ain't ready for prime- time yet.)
1997-08-10 14:28:16 +00:00
if (++sp->fail_counter[IDX_LCP] >= sp->lcp.max_failure) {
if (debug)
addlog(" max_failure (%d) exceeded, "
"send conf-rej\n",
sp->lcp.max_failure);
sppp_cp_send(sp, PPP_LCP, CONF_REJ, h->ident, rlen, buf);
} else {
if (debug)
addlog(" send conf-nak\n");
sppp_cp_send (sp, PPP_LCP, CONF_NAK, h->ident, rlen, buf);
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
return 0;
} else {
if (debug)
addlog(" send conf-ack\n");
Implement the LCP fail_counter: if an option has been NAK'ed for more than max_failures attempts, we are going to REJ it, to prevent endless NAK loops. (This is actually part of a larger local set of modifications i'm running with, but the remainder (PAP & CHAP) ain't ready for prime- time yet.)
1997-08-10 14:28:16 +00:00
sp->fail_counter[IDX_LCP] = 0;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_loopcnt = 0;
sppp_cp_send (sp, PPP_LCP, CONF_ACK,
h->ident, origlen, h+1);
}
free (buf, M_TEMP);
return (rlen == 0);
}
/*
* Analyze the LCP Configure-Reject option list, and adjust our
* negotiation.
*/
static void
sppp_lcp_RCN_rej(struct sppp *sp, struct lcp_header *h, int len)
{
STDDCL;
u_char *buf, *p;
len -= 4;
buf = malloc (len, M_TEMP, M_NOWAIT);
if (!buf)
return;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "lcp rej opts: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
if (debug)
addlog(" %s ", sppp_lcp_opt_name(*p));
switch (*p) {
case LCP_OPT_MAGIC:
/* Magic number -- can't use it, use 0 */
sp->lcp.opts &= ~(1 << LCP_OPT_MAGIC);
sp->lcp.magic = 0;
break;
case LCP_OPT_MRU:
/*
* Should not be rejected anyway, since we only
* negotiate a MRU if explicitly requested by
* peer.
*/
sp->lcp.opts &= ~(1 << LCP_OPT_MRU);
break;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case LCP_OPT_AUTH_PROTO:
/*
* Peer doesn't want to authenticate himself,
* deny unless this is a dialout call, and
* AUTHFLAG_NOCALLOUT is set.
*/
if ((sp->pp_flags & PP_CALLIN) == 0 &&
(sp->hisauth.flags & AUTHFLAG_NOCALLOUT) != 0) {
if (debug)
addlog("[don't insist on auth "
"for callout]");
sp->lcp.opts &= ~(1 << LCP_OPT_AUTH_PROTO);
break;
}
if (debug)
addlog("[access denied]\n");
lcp.Close(sp);
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
}
if (debug)
addlog("\n");
free (buf, M_TEMP);
return;
}
/*
* Analyze the LCP Configure-NAK option list, and adjust our
* negotiation.
*/
static void
sppp_lcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len)
{
STDDCL;
u_char *buf, *p;
u_long magic;
len -= 4;
buf = malloc (len, M_TEMP, M_NOWAIT);
if (!buf)
return;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "lcp nak opts: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
if (debug)
addlog(" %s ", sppp_lcp_opt_name(*p));
switch (*p) {
case LCP_OPT_MAGIC:
/* Magic number -- renegotiate */
if ((sp->lcp.opts & (1 << LCP_OPT_MAGIC)) &&
len >= 6 && p[1] == 6) {
magic = (u_long)p[2] << 24 |
(u_long)p[3] << 16 | p[4] << 8 | p[5];
/*
* If the remote magic is our negated one,
* this looks like a loopback problem.
* Suggest a new magic to make sure.
*/
if (magic == ~sp->lcp.magic) {
if (debug)
addlog("magic glitch ");
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Use random() for seq numbers and read_random for CHAP challenge.
1998-04-06 11:40:17 +00:00
sp->lcp.magic = random();
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
sp->lcp.magic = time.tv_sec + time.tv_usec;
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
} else {
sp->lcp.magic = magic;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
addlog("%lu ", magic);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
}
break;
case LCP_OPT_MRU:
/*
* Peer wants to advise us to negotiate an MRU.
* Agree on it if it's reasonable, or use
* default otherwise.
*/
if (len >= 4 && p[1] == 4) {
u_int mru = p[2] * 256 + p[3];
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog("%d ", mru);
if (mru < PP_MTU || mru > PP_MAX_MRU)
mru = PP_MTU;
sp->lcp.mru = mru;
sp->lcp.opts |= (1 << LCP_OPT_MRU);
}
break;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case LCP_OPT_AUTH_PROTO:
/*
* Peer doesn't like our authentication method,
* deny.
*/
if (debug)
addlog("[access denied]\n");
lcp.Close(sp);
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
}
if (debug)
addlog("\n");
free (buf, M_TEMP);
return;
}
static void
sppp_lcp_tlu(struct sppp *sp)
{
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
STDDCL;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int i;
u_long mask;
/* XXX ? */
if (! (ifp->if_flags & IFF_UP) &&
(ifp->if_flags & IFF_RUNNING)) {
/* Coming out of loopback mode. */
if_up(ifp);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf (SPP_FMT "up\n", SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
for (i = 0; i < IDX_COUNT; i++)
if ((cps[i])->flags & CP_QUAL)
(cps[i])->Open(sp);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if ((sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) != 0 ||
(sp->pp_flags & PP_NEEDAUTH) != 0)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_phase = PHASE_AUTHENTICATE;
else
sp->pp_phase = PHASE_NETWORK;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
log(LOG_DEBUG, SPP_FMT "phase %s\n", SPP_ARGS(ifp),
sppp_phase_name(sp->pp_phase));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/*
* Open all authentication protocols. This is even required
* if we already proceeded to network phase, since it might be
* that remote wants us to authenticate, so we might have to
* send a PAP request. Undesired authentication protocols
* don't do anything when they get an Open event.
*/
for (i = 0; i < IDX_COUNT; i++)
if ((cps[i])->flags & CP_AUTH)
(cps[i])->Open(sp);
if (sp->pp_phase == PHASE_NETWORK) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Notify all NCPs. */
for (i = 0; i < IDX_COUNT; i++)
if ((cps[i])->flags & CP_NCP)
(cps[i])->Open(sp);
}
/* Send Up events to all started protos. */
for (i = 0, mask = 1; i < IDX_COUNT; i++, mask <<= 1)
if (sp->lcp.protos & mask && ((cps[i])->flags & CP_LCP) == 0)
(cps[i])->Up(sp);
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/* notify low-level driver of state change */
if (sp->pp_chg)
sp->pp_chg(sp, (int)sp->pp_phase);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->pp_phase == PHASE_NETWORK)
/* if no NCP is starting, close down */
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_lcp_check_and_close(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static void
sppp_lcp_tld(struct sppp *sp)
{
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
STDDCL;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int i;
u_long mask;
sp->pp_phase = PHASE_TERMINATE;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
log(LOG_DEBUG, SPP_FMT "phase %s\n", SPP_ARGS(ifp),
sppp_phase_name(sp->pp_phase));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Take upper layers down. We send the Down event first and
* the Close second to prevent the upper layers from sending
* ``a flurry of terminate-request packets'', as the RFC
* describes it.
*/
for (i = 0, mask = 1; i < IDX_COUNT; i++, mask <<= 1)
if (sp->lcp.protos & mask && ((cps[i])->flags & CP_LCP) == 0) {
(cps[i])->Down(sp);
(cps[i])->Close(sp);
}
}
static void
sppp_lcp_tls(struct sppp *sp)
{
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
STDDCL;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_phase = PHASE_ESTABLISH;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
log(LOG_DEBUG, SPP_FMT "phase %s\n", SPP_ARGS(ifp),
sppp_phase_name(sp->pp_phase));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Notify lower layer if desired. */
if (sp->pp_tls)
(sp->pp_tls)(sp);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
else
(sp->pp_up)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static void
sppp_lcp_tlf(struct sppp *sp)
{
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
STDDCL;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->pp_phase = PHASE_DEAD;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
log(LOG_DEBUG, SPP_FMT "phase %s\n", SPP_ARGS(ifp),
sppp_phase_name(sp->pp_phase));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* Notify lower layer if desired. */
if (sp->pp_tlf)
(sp->pp_tlf)(sp);
Straigthen out the use of the tls and tlf callbacks. Not tested on the if_sr, if_cx and if_ar drivers, but expected to work just the same as it used to. Any users of these drivers (or even better: donors of hardware for them) please contact phk@freebsd.org so we can test the next batch of changes to if_sppp.
1998-12-16 18:42:38 +00:00
else
(sp->pp_down)(sp);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static void
sppp_lcp_scr(struct sppp *sp)
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
char opt[6 /* magicnum */ + 4 /* mru */ + 5 /* chap */];
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int i = 0;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
u_short authproto;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (sp->lcp.opts & (1 << LCP_OPT_MAGIC)) {
if (! sp->lcp.magic)
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Use random() for seq numbers and read_random for CHAP challenge.
1998-04-06 11:40:17 +00:00
sp->lcp.magic = random();
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
sp->lcp.magic = time.tv_sec + time.tv_usec;
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
opt[i++] = LCP_OPT_MAGIC;
opt[i++] = 6;
opt[i++] = sp->lcp.magic >> 24;
opt[i++] = sp->lcp.magic >> 16;
opt[i++] = sp->lcp.magic >> 8;
opt[i++] = sp->lcp.magic;
}
if (sp->lcp.opts & (1 << LCP_OPT_MRU)) {
opt[i++] = LCP_OPT_MRU;
opt[i++] = 4;
opt[i++] = sp->lcp.mru >> 8;
opt[i++] = sp->lcp.mru;
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) {
authproto = sp->hisauth.proto;
opt[i++] = LCP_OPT_AUTH_PROTO;
opt[i++] = authproto == PPP_CHAP? 5: 4;
opt[i++] = authproto >> 8;
opt[i++] = authproto;
if (authproto == PPP_CHAP)
opt[i++] = CHAP_MD5;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sp->confid[IDX_LCP] = ++sp->pp_seq;
sppp_cp_send (sp, PPP_LCP, CONF_REQ, sp->confid[IDX_LCP], i, &opt);
}
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* Check the open NCPs, return true if at least one NCP is open.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static int
sppp_ncp_check(struct sppp *sp)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
{
int i, mask;
for (i = 0, mask = 1; i < IDX_COUNT; i++, mask <<= 1)
if (sp->lcp.protos & mask && (cps[i])->flags & CP_NCP)
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return 1;
return 0;
}
/*
* Re-check the open NCPs and see if we should terminate the link.
* Called by the NCPs during their tlf action handling.
*/
static void
sppp_lcp_check_and_close(struct sppp *sp)
{
if (sp->pp_phase < PHASE_NETWORK)
/* don't bother, we are already going down */
return;
if (sppp_ncp_check(sp))
return;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
lcp.Close(sp);
}
/*
*--------------------------------------------------------------------------*
* *
* The IPCP implementation. *
* *
*--------------------------------------------------------------------------*
*/
static void
sppp_ipcp_init(struct sppp *sp)
{
sp->ipcp.opts = 0;
sp->ipcp.flags = 0;
sp->state[IDX_IPCP] = STATE_INITIAL;
sp->fail_counter[IDX_IPCP] = 0;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Update for new callout interface.
1997-09-21 22:02:25 +00:00
callout_handle_init(&sp->ch[IDX_IPCP]);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static void
sppp_ipcp_up(struct sppp *sp)
{
sppp_up_event(&ipcp, sp);
}
static void
sppp_ipcp_down(struct sppp *sp)
{
sppp_down_event(&ipcp, sp);
}
static void
sppp_ipcp_open(struct sppp *sp)
{
STDDCL;
u_long myaddr, hisaddr;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sp->ipcp.flags &= ~(IPCP_HISADDR_SEEN|IPCP_MYADDR_SEEN|IPCP_MYADDR_DYN);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_get_ip_addrs(sp, &myaddr, &hisaddr, 0);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* If we don't have his address, this probably means our
* interface doesn't want to talk IP at all. (This could
* be the case if somebody wants to speak only IPX, for
* example.) Don't open IPCP in this case.
*/
if (hisaddr == 0L) {
/* XXX this message should go away */
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "ipcp_open(): no IP interface\n",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
return;
}
if (myaddr == 0L) {
/*
* I don't have an assigned address, so i need to
* negotiate my address.
*/
sp->ipcp.flags |= IPCP_MYADDR_DYN;
sp->ipcp.opts |= (1 << IPCP_OPT_ADDRESS);
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
} else
sp->ipcp.flags |= IPCP_MYADDR_SEEN;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_open_event(&ipcp, sp);
}
static void
sppp_ipcp_close(struct sppp *sp)
{
sppp_close_event(&ipcp, sp);
if (sp->ipcp.flags & IPCP_MYADDR_DYN)
/*
* My address was dynamic, clear it again.
*/
sppp_set_ip_addr(sp, 0L);
}
static void
sppp_ipcp_TO(void *cookie)
{
sppp_to_event(&ipcp, (struct sppp *)cookie);
}
/*
* Analyze a configure request. Return true if it was agreeable, and
* caused action sca, false if it has been rejected or nak'ed, and
* caused action scn. (The return value is used to make the state
* transition decision in the state automaton.)
*/
static int
sppp_ipcp_RCR(struct sppp *sp, struct lcp_header *h, int len)
{
u_char *buf, *r, *p;
struct ifnet *ifp = &sp->pp_if;
int rlen, origlen, debug = ifp->if_flags & IFF_DEBUG;
u_long hisaddr, desiredaddr;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
int gotmyaddr = 0;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
len -= 4;
origlen = len;
/*
* Make sure to allocate a buf that can at least hold a
* conf-nak with an `address' option. We might need it below.
*/
buf = r = malloc ((len < 6? 6: len), M_TEMP, M_NOWAIT);
if (! buf)
return (0);
/* pass 1: see if we can recognize them */
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "ipcp parse opts: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
if (debug)
addlog(" %s ", sppp_ipcp_opt_name(*p));
switch (*p) {
case IPCP_OPT_ADDRESS:
if (len >= 6 && p[1] == 6) {
/* correctly formed address option */
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
continue;
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
}
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog("[invalid] ");
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
break;
default:
/* Others not supported. */
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog("[rej] ");
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
break;
}
/* Add the option to rejected list. */
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
bcopy (p, r, p[1]);
r += p[1];
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
rlen += p[1];
If a lcp configure request is received in the lcp opened state and it is acknowledged, it should go to the lcp ack sent state. Don't reply on lcp echo requests when not in the lcp opened state. If the interface is set to CISCO mode, it should still be marked running when ifconfiged. Fixed a few indentations that had gone wrong somewhere. Submitted-by: John.Hay@csir.co.za
1995-11-21 01:23:13 +00:00
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (rlen) {
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog(" send conf-rej\n");
sppp_cp_send (sp, PPP_IPCP, CONF_REJ, h->ident, rlen, buf);
return 0;
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
} else if (debug)
addlog("\n");
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* pass 2: parse option values */
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_get_ip_addrs(sp, 0, &hisaddr, 0);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "ipcp parse opt values: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
len = origlen;
for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
if (debug)
addlog(" %s ", sppp_ipcp_opt_name(*p));
switch (*p) {
case IPCP_OPT_ADDRESS:
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/* This is the address he wants in his end */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
desiredaddr = p[2] << 24 | p[3] << 16 |
p[4] << 8 | p[5];
Make it possible to indicate that we don't care about the remote sides IP address, as long as it isn't 0.0.0.0
1998-02-28 21:01:09 +00:00
if (desiredaddr == hisaddr ||
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
(hisaddr == 1 && desiredaddr != 0)) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Peer's address is same as our value,
Make it possible to indicate that we don't care about the remote sides IP address, as long as it isn't 0.0.0.0
1998-02-28 21:01:09 +00:00
* or we have set it to 0.0.0.1 to
* indicate that we do not really care,
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* this is agreeable. Gonna conf-ack
* it.
*/
if (debug)
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog("%s [ack] ",
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sppp_dotted_quad(hisaddr));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* record that we've seen it already */
sp->ipcp.flags |= IPCP_HISADDR_SEEN;
continue;
}
/*
* The address wasn't agreeable. This is either
* he sent us 0.0.0.0, asking to assign him an
* address, or he send us another address not
* matching our value. Either case, we gonna
* conf-nak it with our value.
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
* XXX: we should "rej" if hisaddr == 0
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
if (debug) {
if (desiredaddr == 0)
addlog("[addr requested] ");
else
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog("%s [not agreed] ",
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sppp_dotted_quad(desiredaddr));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p[2] = hisaddr >> 24;
p[3] = hisaddr >> 16;
p[4] = hisaddr >> 8;
p[5] = hisaddr;
}
break;
}
/* Add the option to nak'ed list. */
bcopy (p, r, p[1]);
r += p[1];
rlen += p[1];
}
/*
* If we are about to conf-ack the request, but haven't seen
* his address so far, gonna conf-nak it instead, with the
* `address' option present and our idea of his address being
* filled in there, to request negotiation of both addresses.
*
* XXX This can result in an endless req - nak loop if peer
* doesn't want to send us his address. Q: What should we do
* about it? XXX A: implement the max-failure counter.
*/
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
if (rlen == 0 && !(sp->ipcp.flags & IPCP_HISADDR_SEEN) && !gotmyaddr) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
buf[0] = IPCP_OPT_ADDRESS;
buf[1] = 6;
buf[2] = hisaddr >> 24;
buf[3] = hisaddr >> 16;
buf[4] = hisaddr >> 8;
buf[5] = hisaddr;
rlen = 6;
if (debug)
addlog("still need hisaddr ");
}
if (rlen) {
if (debug)
addlog(" send conf-nak\n");
sppp_cp_send (sp, PPP_IPCP, CONF_NAK, h->ident, rlen, buf);
} else {
if (debug)
addlog(" send conf-ack\n");
sppp_cp_send (sp, PPP_IPCP, CONF_ACK,
h->ident, origlen, h+1);
}
This upgrades the driver for Cronyx-Sigma multiplexor boards from version 1.2 to version 1.9. Submitted by: Serge Vakulenko, <vak@cronyx.ru>
1995-10-04 22:24:16 +00:00
free (buf, M_TEMP);
return (rlen == 0);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* Analyze the IPCP Configure-Reject option list, and adjust our
* negotiation.
*/
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_ipcp_RCN_rej(struct sppp *sp, struct lcp_header *h, int len)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
u_char *buf, *p;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
struct ifnet *ifp = &sp->pp_if;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
int debug = ifp->if_flags & IFF_DEBUG;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
len -= 4;
buf = malloc (len, M_TEMP, M_NOWAIT);
if (!buf)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
return;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "ipcp rej opts: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
if (debug)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
addlog(" %s ", sppp_ipcp_opt_name(*p));
switch (*p) {
case IPCP_OPT_ADDRESS:
/*
* Peer doesn't grok address option. This is
* bad. XXX Should we better give up here?
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
* XXX We could try old "addresses" option...
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
sp->ipcp.opts &= ~(1 << IPCP_OPT_ADDRESS);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
break;
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
if (debug)
addlog("\n");
free (buf, M_TEMP);
return;
}
/*
* Analyze the IPCP Configure-NAK option list, and adjust our
* negotiation.
*/
static void
sppp_ipcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len)
{
u_char *buf, *p;
struct ifnet *ifp = &sp->pp_if;
int debug = ifp->if_flags & IFF_DEBUG;
u_long wantaddr;
len -= 4;
buf = malloc (len, M_TEMP, M_NOWAIT);
if (!buf)
return;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "ipcp nak opts: ",
SPP_ARGS(ifp));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
p = (void*) (h+1);
for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
if (debug)
addlog(" %s ", sppp_ipcp_opt_name(*p));
switch (*p) {
case IPCP_OPT_ADDRESS:
/*
* Peer doesn't like our local IP address. See
* if we can do something for him. We'll drop
* him our address then.
*/
if (len >= 6 && p[1] == 6) {
wantaddr = p[2] << 24 | p[3] << 16 |
p[4] << 8 | p[5];
sp->ipcp.opts |= (1 << IPCP_OPT_ADDRESS);
if (debug)
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog("[wantaddr %s] ",
sppp_dotted_quad(wantaddr));
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
* When doing dynamic address assignment,
* we accept his offer. Otherwise, we
* ignore it and thus continue to negotiate
* our already existing value.
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
* XXX: Bogus, if he said no once, he'll
* just say no again, might as well die.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
if (sp->ipcp.flags & IPCP_MYADDR_DYN) {
sppp_set_ip_addr(sp, wantaddr);
if (debug)
addlog("[agree] ");
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sp->ipcp.flags |= IPCP_MYADDR_SEEN;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
}
break;
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (debug)
addlog("\n");
free (buf, M_TEMP);
return;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_ipcp_tlu(struct sppp *sp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/* we are up - notify isdn daemon */
if (sp->pp_con)
sp->pp_con(sp);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_ipcp_tld(struct sppp *sp)
{
}
static void
sppp_ipcp_tls(struct sppp *sp)
{
/* indicate to LCP that it must stay alive */
sp->lcp.protos |= (1 << IDX_IPCP);
}
static void
sppp_ipcp_tlf(struct sppp *sp)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/* we no longer need LCP */
sp->lcp.protos &= ~(1 << IDX_IPCP);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_lcp_check_and_close(sp);
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static void
sppp_ipcp_scr(struct sppp *sp)
{
char opt[6 /* compression */ + 6 /* address */];
u_long ouraddr;
int i = 0;
if (sp->ipcp.opts & (1 << IPCP_OPT_ADDRESS)) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_get_ip_addrs(sp, &ouraddr, 0, 0);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
opt[i++] = IPCP_OPT_ADDRESS;
opt[i++] = 6;
opt[i++] = ouraddr >> 24;
opt[i++] = ouraddr >> 16;
opt[i++] = ouraddr >> 8;
opt[i++] = ouraddr;
}
sp->confid[IDX_IPCP] = ++sp->pp_seq;
sppp_cp_send(sp, PPP_IPCP, CONF_REQ, sp->confid[IDX_IPCP], i, &opt);
}
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
*--------------------------------------------------------------------------*
* *
* The CHAP implementation. *
* *
*--------------------------------------------------------------------------*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* The authentication protocols don't employ a full-fledged state machine as
* the control protocols do, since they do have Open and Close events, but
* not Up and Down, nor are they explicitly terminated. Also, use of the
* authentication protocols may be different in both directions (this makes
* sense, think of a machine that never accepts incoming calls but only
* calls out, it doesn't require the called party to authenticate itself).
*
* Our state machine for the local authentication protocol (we are requesting
* the peer to authenticate) looks like:
*
* RCA-
* +--------------------------------------------+
* V scn,tld|
* +--------+ Close +---------+ RCA+
* | |<----------------------------------| |------+
* +--->| Closed | TO* | Opened | sca |
* | | |-----+ +-------| |<-----+
* | +--------+ irc | | +---------+
* | ^ | | ^
* | | | | |
* | | | | |
* | TO-| | | |
* | |tld TO+ V | |
* | | +------->+ | |
* | | | | | |
* | +--------+ V | |
* | | |<----+<--------------------+ |
* | | Req- | scr |
* | | Sent | |
* | | | |
* | +--------+ |
* | RCA- | | RCA+ |
* +------+ +------------------------------------------+
* scn,tld sca,irc,ict,tlu
*
*
* with:
*
* Open: LCP reached authentication phase
* Close: LCP reached terminate phase
*
* RCA+: received reply (pap-req, chap-response), acceptable
* RCN: received reply (pap-req, chap-response), not acceptable
* TO+: timeout with restart counter >= 0
* TO-: timeout with restart counter < 0
* TO*: reschedule timeout for CHAP
*
* scr: send request packet (none for PAP, chap-challenge)
* sca: send ack packet (pap-ack, chap-success)
* scn: send nak packet (pap-nak, chap-failure)
* ict: initialize re-challenge timer (CHAP only)
*
* tlu: this-layer-up, LCP reaches network phase
* tld: this-layer-down, LCP enters terminate phase
*
* Note that in CHAP mode, after sending a new challenge, while the state
* automaton falls back into Req-Sent state, it doesn't signal a tld
* event to LCP, so LCP remains in network phase. Only after not getting
* any response (or after getting an unacceptable response), CHAP closes,
* causing LCP to enter terminate phase.
*
* With PAP, there is no initial request that can be sent. The peer is
* expected to send one based on the successful negotiation of PAP as
* the authentication protocol during the LCP option negotiation.
*
* Incoming authentication protocol requests (remote requests
* authentication, we are peer) don't employ a state machine at all,
* they are simply answered. Some peers [Ascend P50 firmware rev
* 4.50] react allergically when sending IPCP requests while they are
* still in authentication phase (thereby violating the standard that
* demands that these NCP packets are to be discarded), so we keep
* track of the peer demanding us to authenticate, and only proceed to
* phase network once we've seen a positive acknowledge for the
* authentication.
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
*/
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
/*
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* Handle incoming CHAP packets.
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
*/
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
void
sppp_chap_input(struct sppp *sp, struct mbuf *m)
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
STDDCL;
struct lcp_header *h;
int len, x;
u_char *value, *name, digest[AUTHKEYLEN], dsize;
int value_len, name_len;
MD5_CTX ctx;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
len = m->m_pkthdr.len;
if (len < 4) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap invalid packet length: %d bytes\n",
SPP_ARGS(ifp), len);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return;
}
h = mtod (m, struct lcp_header*);
if (len > ntohs (h->len))
len = ntohs (h->len);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
switch (h->type) {
/* challenge, failure and success are his authproto */
case CHAP_CHALLENGE:
value = 1 + (u_char*)(h+1);
value_len = value[-1];
name = value + value_len;
name_len = len - value_len - 5;
if (name_len < 0) {
if (debug) {
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap corrupted challenge "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<%s id=0x%x len=%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_auth_type_name(PPP_CHAP, h->type),
h->ident, ntohs(h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*) (h+1), len-4);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
break;
}
if (debug) {
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap input <%s id=0x%x len=%d name=",
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_auth_type_name(PPP_CHAP, h->type), h->ident,
ntohs(h->len));
sppp_print_string((char*) name, name_len);
addlog(" value-size=%d value=", value_len);
sppp_print_bytes(value, value_len);
addlog(">\n");
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/* Compute reply value. */
MD5Init(&ctx);
MD5Update(&ctx, &h->ident, 1);
MD5Update(&ctx, sp->myauth.secret,
sppp_strnlen(sp->myauth.secret, AUTHKEYLEN));
MD5Update(&ctx, value, value_len);
MD5Final(digest, &ctx);
dsize = sizeof digest;
sppp_auth_send(&chap, sp, CHAP_RESPONSE, h->ident,
sizeof dsize, (const char *)&dsize,
sizeof digest, digest,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
(size_t)sppp_strnlen(sp->myauth.name, AUTHNAMELEN),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->myauth.name,
0);
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case CHAP_SUCCESS:
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "chap success",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (len > 4) {
addlog(": ");
sppp_print_string((char*)(h + 1), len - 4);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog("\n");
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
x = splimp();
sp->pp_flags &= ~PP_NEEDAUTH;
if (sp->myauth.proto == PPP_CHAP &&
Reviewed by: Joerg Wunsch In sppp_chap_input: 1) in the CHAP_CHALLENGE case don't output the peer's name if it is not what we expected (DEBUG) since it will be printed out in the course of events anyway. 2) in the CHAP_SUCCESS case test whether the peer is required to authenticate himself [(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO))], otherwise the state machine may never switch into the network state. I saw this case against 2 different ISPs; they never bothered to authenticate themselves to me. In sppp_pap_input: in the PAP_ACK case do the same as in 2) above for the same reason.
1998-01-01 21:27:18 +00:00
(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) &&
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
(sp->lcp.protos & (1 << IDX_CHAP)) == 0) {
/*
* We are authenticator for CHAP but didn't
* complete yet. Leave it to tlu to proceed
* to network phase.
*/
splx(x);
break;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
splx(x);
sppp_phase_network(sp);
break;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case CHAP_FAILURE:
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_INFO, SPP_FMT "chap failure",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (len > 4) {
addlog(": ");
sppp_print_string((char*)(h + 1), len - 4);
}
addlog("\n");
} else
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_INFO, SPP_FMT "chap failure\n",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/* await LCP shutdown by authenticator */
break;
/* response is my authproto */
case CHAP_RESPONSE:
value = 1 + (u_char*)(h+1);
value_len = value[-1];
name = value + value_len;
name_len = len - value_len - 5;
if (name_len < 0) {
if (debug) {
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap corrupted response "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<%s id=0x%x len=%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_auth_type_name(PPP_CHAP, h->type),
h->ident, ntohs(h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*)(h+1), len-4);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
break;
}
if (h->ident != sp->confid[IDX_CHAP]) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap dropping response for old ID "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"(got %d, expected %d)\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
h->ident, sp->confid[IDX_CHAP]);
break;
}
if (name_len != sppp_strnlen(sp->hisauth.name, AUTHNAMELEN)
|| bcmp(name, sp->hisauth.name, name_len) != 0) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_INFO, SPP_FMT "chap response, his name ",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_print_string(name, name_len);
addlog(" != expected ");
sppp_print_string(sp->hisauth.name,
sppp_strnlen(sp->hisauth.name, AUTHNAMELEN));
addlog("\n");
}
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "chap input(%s) "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<%s id=0x%x len=%d name=",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_state_name(sp->state[IDX_CHAP]),
sppp_auth_type_name(PPP_CHAP, h->type),
h->ident, ntohs (h->len));
sppp_print_string((char*)name, name_len);
addlog(" value-size=%d value=", value_len);
sppp_print_bytes(value, value_len);
addlog(">\n");
}
if (value_len != AUTHKEYLEN) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap bad hash value length: "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"%d bytes, should be %d\n",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp), value_len,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
AUTHKEYLEN);
break;
}
MD5Init(&ctx);
MD5Update(&ctx, &h->ident, 1);
MD5Update(&ctx, sp->hisauth.secret,
sppp_strnlen(sp->hisauth.secret, AUTHKEYLEN));
MD5Update(&ctx, sp->myauth.challenge, AUTHKEYLEN);
MD5Final(digest, &ctx);
#define FAILMSG "Failed..."
#define SUCCMSG "Welcome!"
if (value_len != sizeof digest ||
bcmp(digest, value, value_len) != 0) {
/* action scn, tld */
sppp_auth_send(&chap, sp, CHAP_FAILURE, h->ident,
sizeof(FAILMSG) - 1, (u_char *)FAILMSG,
0);
chap.tld(sp);
break;
}
/* action sca, perhaps tlu */
if (sp->state[IDX_CHAP] == STATE_REQ_SENT ||
sp->state[IDX_CHAP] == STATE_OPENED)
sppp_auth_send(&chap, sp, CHAP_SUCCESS, h->ident,
sizeof(SUCCMSG) - 1, (u_char *)SUCCMSG,
0);
if (sp->state[IDX_CHAP] == STATE_REQ_SENT) {
sppp_cp_change_state(&chap, sp, STATE_OPENED);
chap.tlu(sp);
}
break;
default:
/* Unknown CHAP packet type -- ignore. */
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "chap unknown input(%s) "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<0x%x id=0x%xh len=%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_state_name(sp->state[IDX_CHAP]),
h->type, h->ident, ntohs(h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*)(h+1), len-4);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
break;
}
}
static void
sppp_chap_init(struct sppp *sp)
{
/* Chap doesn't have STATE_INITIAL at all. */
sp->state[IDX_CHAP] = STATE_CLOSED;
sp->fail_counter[IDX_CHAP] = 0;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
callout_handle_init(&sp->ch[IDX_CHAP]);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
}
static void
sppp_chap_open(struct sppp *sp)
{
if (sp->myauth.proto == PPP_CHAP &&
(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) != 0) {
/* we are authenticator for CHAP, start it */
chap.scr(sp);
sp->rst_counter[IDX_CHAP] = sp->lcp.max_configure;
sppp_cp_change_state(&chap, sp, STATE_REQ_SENT);
}
/* nothing to be done if we are peer, await a challenge */
}
static void
sppp_chap_close(struct sppp *sp)
{
if (sp->state[IDX_CHAP] != STATE_CLOSED)
sppp_cp_change_state(&chap, sp, STATE_CLOSED);
}
static void
sppp_chap_TO(void *cookie)
{
struct sppp *sp = (struct sppp *)cookie;
STDDCL;
int s;
s = splimp();
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "chap TO(%s) rst_counter = %d\n",
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_state_name(sp->state[IDX_CHAP]),
sp->rst_counter[IDX_CHAP]);
if (--sp->rst_counter[IDX_CHAP] < 0)
/* TO- event */
switch (sp->state[IDX_CHAP]) {
case STATE_REQ_SENT:
chap.tld(sp);
sppp_cp_change_state(&chap, sp, STATE_CLOSED);
break;
}
else
/* TO+ (or TO*) event */
switch (sp->state[IDX_CHAP]) {
case STATE_OPENED:
/* TO* event */
sp->rst_counter[IDX_CHAP] = sp->lcp.max_configure;
/* fall through */
case STATE_REQ_SENT:
chap.scr(sp);
/* sppp_cp_change_state() will restart the timer */
sppp_cp_change_state(&chap, sp, STATE_REQ_SENT);
break;
}
splx(s);
}
static void
sppp_chap_tlu(struct sppp *sp)
{
STDDCL;
int i, x;
Minor cleanup: kill a couple of unused variables, and a couple of uninitialized variables. Obtained from: The isdn4bsd project (partially)
1998-10-06 21:12:45 +00:00
i = 0;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->rst_counter[IDX_CHAP] = sp->lcp.max_configure;
/*
* Some broken CHAP implementations (Conware CoNet, firmware
* 4.0.?) don't want to re-authenticate their CHAP once the
* initial challenge-response exchange has taken place.
* Provide for an option to avoid rechallenges.
*/
if ((sp->hisauth.flags & AUTHFLAG_NORECHALLENGE) == 0) {
/*
* Compute the re-challenge timeout. This will yield
* a number between 300 and 810 seconds.
*/
i = 300 + ((unsigned)(random() & 0xff00) >> 7);
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(chap.TO, (void *)sp, i * hz, sp->ch[IDX_CHAP]);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
}
if (debug) {
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "chap %s, ",
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->pp_phase == PHASE_NETWORK? "reconfirmed": "tlu");
if ((sp->hisauth.flags & AUTHFLAG_NORECHALLENGE) == 0)
addlog("next re-challenge in %d seconds\n", i);
else
addlog("re-challenging supressed\n");
}
x = splimp();
/* indicate to LCP that we need to be closed down */
sp->lcp.protos |= (1 << IDX_CHAP);
if (sp->pp_flags & PP_NEEDAUTH) {
/*
* Remote is authenticator, but his auth proto didn't
* complete yet. Defer the transition to network
* phase.
*/
splx(x);
return;
}
splx(x);
/*
* If we are already in phase network, we are done here. This
* is the case if this is a dummy tlu event after a re-challenge.
*/
if (sp->pp_phase != PHASE_NETWORK)
sppp_phase_network(sp);
}
static void
sppp_chap_tld(struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "chap tld\n", SPP_ARGS(ifp));
UNTIMEOUT(chap.TO, (void *)sp, sp->ch[IDX_CHAP]);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->lcp.protos &= ~(1 << IDX_CHAP);
lcp.Close(sp);
}
static void
sppp_chap_scr(struct sppp *sp)
{
u_long *ch, seed;
u_char clen;
/* Compute random challenge. */
ch = (u_long *)sp->myauth.challenge;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Use random() for seq numbers and read_random for CHAP challenge.
1998-04-06 11:40:17 +00:00
read_random(&seed, sizeof seed);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#else
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
{
struct timeval tv;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
microtime(&tv);
seed = tv.tv_sec ^ tv.tv_usec;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
}
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
ch[0] = seed ^ random();
ch[1] = seed ^ random();
ch[2] = seed ^ random();
ch[3] = seed ^ random();
clen = AUTHKEYLEN;
sp->confid[IDX_CHAP] = ++sp->pp_seq;
sppp_auth_send(&chap, sp, CHAP_CHALLENGE, sp->confid[IDX_CHAP],
sizeof clen, (const char *)&clen,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
(size_t)AUTHKEYLEN, sp->myauth.challenge,
(size_t)sppp_strnlen(sp->myauth.name, AUTHNAMELEN),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->myauth.name,
0);
}
/*
*--------------------------------------------------------------------------*
* *
* The PAP implementation. *
* *
*--------------------------------------------------------------------------*
*/
/*
* For PAP, we need to keep a little state also if we are the peer, not the
* authenticator. This is since we don't get a request to authenticate, but
* have to repeatedly authenticate ourself until we got a response (or the
* retry counter is expired).
*/
/*
* Handle incoming PAP packets. */
static void
sppp_pap_input(struct sppp *sp, struct mbuf *m)
{
STDDCL;
struct lcp_header *h;
int len, x;
u_char *name, *passwd, mlen;
int name_len, passwd_len;
len = m->m_pkthdr.len;
if (len < 5) {
if (debug)
log(LOG_DEBUG,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_FMT "pap invalid packet length: %d bytes\n",
SPP_ARGS(ifp), len);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return;
}
h = mtod (m, struct lcp_header*);
if (len > ntohs (h->len))
len = ntohs (h->len);
switch (h->type) {
/* PAP request is my authproto */
case PAP_REQ:
name = 1 + (u_char*)(h+1);
name_len = name[-1];
passwd = name + name_len + 1;
if (name_len > len - 6 ||
(passwd_len = passwd[-1]) > len - 6 - name_len) {
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap corrupted input "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<%s id=0x%x len=%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_auth_type_name(PPP_PAP, h->type),
h->ident, ntohs(h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*)(h+1), len-4);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
break;
}
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap input(%s) "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<%s id=0x%x len=%d name=",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_state_name(sp->state[IDX_PAP]),
sppp_auth_type_name(PPP_PAP, h->type),
h->ident, ntohs(h->len));
sppp_print_string((char*)name, name_len);
addlog(" passwd=");
sppp_print_string((char*)passwd, passwd_len);
addlog(">\n");
}
if (name_len > AUTHNAMELEN ||
passwd_len > AUTHKEYLEN ||
bcmp(name, sp->hisauth.name, name_len) != 0 ||
bcmp(passwd, sp->hisauth.secret, passwd_len) != 0) {
/* action scn, tld */
mlen = sizeof(FAILMSG) - 1;
sppp_auth_send(&pap, sp, PAP_NAK, h->ident,
sizeof mlen, (const char *)&mlen,
sizeof(FAILMSG) - 1, (u_char *)FAILMSG,
0);
pap.tld(sp);
break;
}
/* action sca, perhaps tlu */
if (sp->state[IDX_PAP] == STATE_REQ_SENT ||
sp->state[IDX_PAP] == STATE_OPENED) {
mlen = sizeof(SUCCMSG) - 1;
sppp_auth_send(&pap, sp, PAP_ACK, h->ident,
sizeof mlen, (const char *)&mlen,
sizeof(SUCCMSG) - 1, (u_char *)SUCCMSG,
0);
}
if (sp->state[IDX_PAP] == STATE_REQ_SENT) {
sppp_cp_change_state(&pap, sp, STATE_OPENED);
pap.tlu(sp);
}
break;
/* ack and nak are his authproto */
case PAP_ACK:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
UNTIMEOUT(sppp_pap_my_TO, (void *)sp, sp->pap_my_to_ch);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap success",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
name_len = *((char *)h);
if (len > 5 && name_len) {
addlog(": ");
sppp_print_string((char*)(h+1), name_len);
}
addlog("\n");
}
x = splimp();
sp->pp_flags &= ~PP_NEEDAUTH;
if (sp->myauth.proto == PPP_PAP &&
Reviewed by: Joerg Wunsch In sppp_chap_input: 1) in the CHAP_CHALLENGE case don't output the peer's name if it is not what we expected (DEBUG) since it will be printed out in the course of events anyway. 2) in the CHAP_SUCCESS case test whether the peer is required to authenticate himself [(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO))], otherwise the state machine may never switch into the network state. I saw this case against 2 different ISPs; they never bothered to authenticate themselves to me. In sppp_pap_input: in the PAP_ACK case do the same as in 2) above for the same reason.
1998-01-01 21:27:18 +00:00
(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) &&
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
(sp->lcp.protos & (1 << IDX_PAP)) == 0) {
/*
* We are authenticator for PAP but didn't
* complete yet. Leave it to tlu to proceed
* to network phase.
*/
splx(x);
break;
}
splx(x);
sppp_phase_network(sp);
break;
case PAP_NAK:
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
UNTIMEOUT(sppp_pap_my_TO, (void *)sp, sp->pap_my_to_ch);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_INFO, SPP_FMT "pap failure",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
name_len = *((char *)h);
if (len > 5 && name_len) {
addlog(": ");
sppp_print_string((char*)(h+1), name_len);
}
addlog("\n");
} else
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_INFO, SPP_FMT "pap failure\n",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/* await LCP shutdown by authenticator */
break;
default:
/* Unknown PAP packet type -- ignore. */
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap corrupted input "
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
"<0x%x id=0x%x len=%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
h->type, h->ident, ntohs(h->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*)(h+1), len-4);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
break;
}
}
static void
sppp_pap_init(struct sppp *sp)
{
/* PAP doesn't have STATE_INITIAL at all. */
sp->state[IDX_PAP] = STATE_CLOSED;
sp->fail_counter[IDX_PAP] = 0;
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
callout_handle_init(&sp->ch[IDX_PAP]);
callout_handle_init(&sp->pap_my_to_ch);
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
}
static void
sppp_pap_open(struct sppp *sp)
{
if (sp->hisauth.proto == PPP_PAP &&
(sp->lcp.opts & (1 << LCP_OPT_AUTH_PROTO)) != 0) {
/* we are authenticator for PAP, start our timer */
sp->rst_counter[IDX_PAP] = sp->lcp.max_configure;
sppp_cp_change_state(&pap, sp, STATE_REQ_SENT);
}
if (sp->myauth.proto == PPP_PAP) {
/* we are peer, send a request, and start a timer */
pap.scr(sp);
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(sppp_pap_my_TO, (void *)sp, sp->lcp.timeout,
sp->pap_my_to_ch);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
}
}
static void
sppp_pap_close(struct sppp *sp)
{
if (sp->state[IDX_PAP] != STATE_CLOSED)
sppp_cp_change_state(&pap, sp, STATE_CLOSED);
}
/*
* That's the timeout routine if we are authenticator. Since the
* authenticator is basically passive in PAP, we can't do much here.
*/
static void
sppp_pap_TO(void *cookie)
{
struct sppp *sp = (struct sppp *)cookie;
STDDCL;
int s;
s = splimp();
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap TO(%s) rst_counter = %d\n",
SPP_ARGS(ifp),
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_state_name(sp->state[IDX_PAP]),
sp->rst_counter[IDX_PAP]);
if (--sp->rst_counter[IDX_PAP] < 0)
/* TO- event */
switch (sp->state[IDX_PAP]) {
case STATE_REQ_SENT:
pap.tld(sp);
sppp_cp_change_state(&pap, sp, STATE_CLOSED);
break;
}
else
/* TO+ event, not very much we could do */
switch (sp->state[IDX_PAP]) {
case STATE_REQ_SENT:
/* sppp_cp_change_state() will restart the timer */
sppp_cp_change_state(&pap, sp, STATE_REQ_SENT);
break;
}
splx(s);
}
/*
* That's the timeout handler if we are peer. Since the peer is active,
* we need to retransmit our PAP request since it is apparently lost.
* XXX We should impose a max counter.
*/
static void
sppp_pap_my_TO(void *cookie)
{
struct sppp *sp = (struct sppp *)cookie;
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap peer TO\n",
SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
pap.scr(sp);
}
static void
sppp_pap_tlu(struct sppp *sp)
{
STDDCL;
int x;
sp->rst_counter[IDX_PAP] = sp->lcp.max_configure;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s tlu\n",
SPP_ARGS(ifp), pap.name);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
x = splimp();
/* indicate to LCP that we need to be closed down */
sp->lcp.protos |= (1 << IDX_PAP);
if (sp->pp_flags & PP_NEEDAUTH) {
/*
* Remote is authenticator, but his auth proto didn't
* complete yet. Defer the transition to network
* phase.
*/
splx(x);
return;
}
splx(x);
sppp_phase_network(sp);
}
static void
sppp_pap_tld(struct sppp *sp)
{
STDDCL;
if (debug)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "pap tld\n", SPP_ARGS(ifp));
UNTIMEOUT(pap.TO, (void *)sp, sp->ch[IDX_PAP]);
UNTIMEOUT(sppp_pap_my_TO, (void *)sp, sp->pap_my_to_ch);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sp->lcp.protos &= ~(1 << IDX_PAP);
lcp.Close(sp);
}
static void
sppp_pap_scr(struct sppp *sp)
{
u_char idlen, pwdlen;
sp->confid[IDX_PAP] = ++sp->pp_seq;
pwdlen = sppp_strnlen(sp->myauth.secret, AUTHKEYLEN);
idlen = sppp_strnlen(sp->myauth.name, AUTHNAMELEN);
sppp_auth_send(&pap, sp, PAP_REQ, sp->confid[IDX_PAP],
sizeof idlen, (const char *)&idlen,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
(size_t)idlen, sp->myauth.name,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sizeof pwdlen, (const char *)&pwdlen,
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
(size_t)pwdlen, sp->myauth.secret,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
0);
}
/*
* Random miscellaneous functions.
*/
/*
* Send a PAP or CHAP proto packet.
*
* Varadic function, each of the elements for the ellipsis is of type
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
* ``size_t mlen, const u_char *msg''. Processing will stop iff
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
* mlen == 0.
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
* NOTE: never declare variadic functions with types subject to type
* promotion (i.e. u_char). This is asking for big trouble depending
* on the architecture you are on...
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
*/
static void
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
sppp_auth_send(const struct cp *cp, struct sppp *sp,
unsigned int type, unsigned int id,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
...)
{
STDDCL;
struct ppp_header *h;
struct lcp_header *lh;
struct mbuf *m;
u_char *p;
int len;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
unsigned int mlen;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
const char *msg;
va_list ap;
MGETHDR (m, M_DONTWAIT, MT_DATA);
if (! m)
return;
m->m_pkthdr.rcvif = 0;
h = mtod (m, struct ppp_header*);
h->address = PPP_ALLSTATIONS; /* broadcast address */
h->control = PPP_UI; /* Unnumbered Info */
h->protocol = htons(cp->proto);
lh = (struct lcp_header*)(h + 1);
lh->type = type;
lh->ident = id;
p = (u_char*) (lh+1);
va_start(ap, id);
len = 0;
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
while ((mlen = (unsigned int)va_arg(ap, size_t)) != 0) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
msg = va_arg(ap, const char *);
len += mlen;
if (len > MHLEN - PPP_HEADER_LEN - LCP_HEADER_LEN) {
va_end(ap);
m_freem(m);
return;
}
bcopy(msg, p, mlen);
p += mlen;
}
va_end(ap);
m->m_pkthdr.len = m->m_len = PPP_HEADER_LEN + LCP_HEADER_LEN + len;
lh->len = htons (LCP_HEADER_LEN + len);
if (debug) {
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
log(LOG_DEBUG, SPP_FMT "%s output <%s id=0x%x len=%d",
SPP_ARGS(ifp), cp->name,
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_auth_type_name(cp->proto, lh->type),
lh->ident, ntohs(lh->len));
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
sppp_print_bytes((u_char*) (lh+1), len);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
addlog(">\n");
}
if (IF_QFULL (&sp->pp_cpq)) {
IF_DROP (&sp->pp_fastq);
IF_DROP (&ifp->if_snd);
m_freem (m);
++ifp->if_oerrors;
} else
IF_ENQUEUE (&sp->pp_cpq, m);
if (! (ifp->if_flags & IFF_OACTIVE))
(*ifp->if_start) (ifp);
ifp->if_obytes += m->m_pkthdr.len + 3;
}
/*
* Flush interface queue.
*/
static void
sppp_qflush(struct ifqueue *ifq)
{
struct mbuf *m, *n;
n = ifq->ifq_head;
while ((m = n)) {
n = m->m_act;
m_freem (m);
}
ifq->ifq_head = 0;
ifq->ifq_tail = 0;
ifq->ifq_len = 0;
}
/*
* Send keepalive packets, every 10 seconds.
*/
static void
sppp_keepalive(void *dummy)
{
struct sppp *sp;
int s;
s = splimp();
for (sp=spppq; sp; sp=sp->pp_next) {
struct ifnet *ifp = &sp->pp_if;
/* Keepalive mode disabled or channel down? */
if (! (sp->pp_flags & PP_KEEPALIVE) ||
! (ifp->if_flags & IFF_RUNNING))
continue;
/* No keepalive in PPP mode if LCP not opened yet. */
if (! (sp->pp_flags & PP_CISCO) &&
sp->pp_phase < PHASE_AUTHENTICATE)
continue;
if (sp->pp_alivecnt == MAXALIVECNT) {
/* No keepalive packets got. Stop the interface. */
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
printf (SPP_FMT "down\n", SPP_ARGS(ifp));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if_down (ifp);
sppp_qflush (&sp->pp_cpq);
if (! (sp->pp_flags & PP_CISCO)) {
/* XXX */
/* Shut down the PPP link. */
lcp.Down(sp);
/* Initiate negotiation. XXX */
lcp.Up(sp);
}
}
if (sp->pp_alivecnt <= MAXALIVECNT)
++sp->pp_alivecnt;
if (sp->pp_flags & PP_CISCO)
sppp_cisco_send (sp, CISCO_KEEPALIVE_REQ, ++sp->pp_seq,
sp->pp_rseq);
else if (sp->pp_phase >= PHASE_AUTHENTICATE) {
long nmagic = htonl (sp->lcp.magic);
sp->lcp.echoid = ++sp->pp_seq;
sppp_cp_send (sp, PPP_LCP, ECHO_REQ,
sp->lcp.echoid, 4, &nmagic);
}
}
splx(s);
clean up more timeout/untimeout portability stuff. make sure flags and stuff are set sensibly.
1998-12-26 12:14:31 +00:00
TIMEOUT(sppp_keepalive, 0, hz * 10, keepalive_ch);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
}
/*
* Get both IP addresses.
*/
static void
sppp_get_ip_addrs(struct sppp *sp, u_long *src, u_long *dst, u_long *srcmask)
{
struct ifnet *ifp = &sp->pp_if;
struct ifaddr *ifa;
struct sockaddr_in *si, *sm;
u_long ssrc, ddst;
Minor cleanup: kill a couple of unused variables, and a couple of uninitialized variables. Obtained from: The isdn4bsd project (partially)
1998-10-06 21:12:45 +00:00
sm = NULL;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
ssrc = ddst = 0L;
/*
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
* Pick the first AF_INET address from the list,
* aliases don't make any sense on a p2p link anyway.
*/
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
si = 0;
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#elif defined(__NetBSD__) || defined (__OpenBSD__)
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
for (ifa = ifp->if_addrlist.tqh_first;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
ifa;
ifa = ifa->ifa_list.tqe_next)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#else
for (ifa = ifp->if_addrlist;
ifa;
ifa = ifa->ifa_next)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (ifa->ifa_addr->sa_family == AF_INET) {
si = (struct sockaddr_in *)ifa->ifa_addr;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sm = (struct sockaddr_in *)ifa->ifa_netmask;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (si)
break;
}
if (ifa) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (si && si->sin_addr.s_addr) {
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
ssrc = si->sin_addr.s_addr;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
if (srcmask)
*srcmask = ntohl(sm->sin_addr.s_addr);
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
si = (struct sockaddr_in *)ifa->ifa_dstaddr;
if (si && si->sin_addr.s_addr)
ddst = si->sin_addr.s_addr;
}
if (dst) *dst = ntohl(ddst);
if (src) *src = ntohl(ssrc);
}
/*
* Set my IP address. Must be called at splimp.
*/
static void
sppp_set_ip_addr(struct sppp *sp, u_long src)
{
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
STDDCL;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
struct ifaddr *ifa;
struct sockaddr_in *si;
/*
* Pick the first AF_INET address from the list,
* aliases don't make any sense on a p2p link anyway.
*/
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
si = 0;
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#elif defined(__NetBSD__) || defined (__OpenBSD__)
Converge further on the isdn4bsd version of this file.
1998-12-26 12:43:26 +00:00
for (ifa = ifp->if_addrlist.tqh_first;
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
ifa;
ifa = ifa->ifa_list.tqe_next)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
#else
for (ifa = ifp->if_addrlist;
ifa;
ifa = ifa->ifa_next)
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
#endif
{
if (ifa->ifa_addr->sa_family == AF_INET)
{
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
si = (struct sockaddr_in *)ifa->ifa_addr;
if (si)
break;
}
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
if (ifa && si)
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
{
int error;
#if __NetBSD_Version__ >= 103080000
struct sockaddr_in new_sin = *si;
new_sin.sin_addr.s_addr = htonl(src);
error = in_ifinit(ifp, ifatoia(ifa), &new_sin, 1);
if(debug && error)
{
log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addr: in_ifinit "
" failed, error=%d\n", SPP_ARGS(ifp), error);
}
#else
/* delete old route */
error = rtinit(ifa, (int)RTM_DELETE, RTF_HOST);
if(debug && error)
{
log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addr: rtinit DEL failed, error=%d\n",
SPP_ARGS(ifp), error);
}
/* set new address */
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
si->sin_addr.s_addr = htonl(src);
Update sppp support to i4b level. This includes the new spppcontrol program to set PPP options like authentication with.
1998-12-27 21:30:44 +00:00
/* add new route */
error = rtinit(ifa, (int)RTM_ADD, RTF_HOST);
if (debug && error)
{
log(LOG_DEBUG, SPP_FMT "sppp_set_ip_addr: rtinit ADD failed, error=%d",
SPP_ARGS(ifp), error);
}
#endif
}
}
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static int
Fixed yet more ioctl breakage due to the type of the `cmd' arg changing from int to u_long but not changing here.
1998-08-15 21:58:09 +00:00
sppp_params(struct sppp *sp, u_long cmd, void *data)
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
{
Fixed yet more ioctl breakage due to the type of the `cmd' arg changing from int to u_long but not changing here.
1998-08-15 21:58:09 +00:00
u_long subcmd;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
struct ifreq *ifr = (struct ifreq *)data;
struct spppreq spr;
/*
* ifr->ifr_data is supposed to point to a struct spppreq.
* Check the cmd word first before attempting to fetch all the
* data.
*/
if ((subcmd = fuword(ifr->ifr_data)) == -1)
return EFAULT;
if (copyin((caddr_t)ifr->ifr_data, &spr, sizeof spr) != 0)
return EFAULT;
switch (subcmd) {
case SPPPIOGDEFS:
if (cmd != SIOCGIFGENERIC)
return EINVAL;
/*
* We copy over the entire current state, but clean
* out some of the stuff we don't wanna pass up.
* Remember, SIOCGIFGENERIC is unprotected, and can be
* called by any user. No need to ever get PAP or
* CHAP secrets back to userland anyway.
*/
bcopy(sp, &spr.defs, sizeof(struct sppp));
bzero(spr.defs.myauth.secret, AUTHKEYLEN);
bzero(spr.defs.myauth.challenge, AUTHKEYLEN);
bzero(spr.defs.hisauth.secret, AUTHKEYLEN);
bzero(spr.defs.hisauth.challenge, AUTHKEYLEN);
return copyout(&spr, (caddr_t)ifr->ifr_data, sizeof spr);
case SPPPIOSDEFS:
if (cmd != SIOCSIFGENERIC)
return EINVAL;
/*
* We have a very specific idea of which fields we allow
* being passed back from userland, so to not clobber our
* current state. For one, we only allow setting
* anything if LCP is in dead phase. Once the LCP
* negotiations started, the authentication settings must
* not be changed again. (The administrator can force an
* ifconfig down in order to get LCP back into dead
* phase.)
*
* Also, we only allow for authentication parameters to be
* specified.
*
* XXX Should allow to set or clear pp_flags.
*
* Finally, if the respective authentication protocol to
* be used is set differently than 0, but the secret is
* passed as all zeros, we don't trash the existing secret.
* This allows an administrator to change the system name
* only without clobbering the secret (which he didn't get
* back in a previous SPPPIOGDEFS call). However, the
* secrets are cleared if the authentication protocol is
* reset to 0.
*/
if (sp->pp_phase != PHASE_DEAD)
return EBUSY;
if ((spr.defs.myauth.proto != 0 && spr.defs.myauth.proto != PPP_PAP &&
spr.defs.myauth.proto != PPP_CHAP) ||
(spr.defs.hisauth.proto != 0 && spr.defs.hisauth.proto != PPP_PAP &&
spr.defs.hisauth.proto != PPP_CHAP))
return EINVAL;
if (spr.defs.myauth.proto == 0)
/* resetting myauth */
bzero(&sp->myauth, sizeof sp->myauth);
else {
/* setting/changing myauth */
sp->myauth.proto = spr.defs.myauth.proto;
bcopy(spr.defs.myauth.name, sp->myauth.name, AUTHNAMELEN);
if (spr.defs.myauth.secret[0] != '\0')
bcopy(spr.defs.myauth.secret, sp->myauth.secret,
AUTHKEYLEN);
}
if (spr.defs.hisauth.proto == 0)
/* resetting hisauth */
bzero(&sp->hisauth, sizeof sp->hisauth);
else {
/* setting/changing hisauth */
sp->hisauth.proto = spr.defs.hisauth.proto;
sp->hisauth.flags = spr.defs.hisauth.flags;
bcopy(spr.defs.hisauth.name, sp->hisauth.name, AUTHNAMELEN);
if (spr.defs.hisauth.secret[0] != '\0')
bcopy(spr.defs.hisauth.secret, sp->hisauth.secret,
AUTHKEYLEN);
}
break;
default:
return EINVAL;
}
return 0;
}
static void
sppp_phase_network(struct sppp *sp)
{
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
STDDCL;
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
int i;
u_long mask;
sp->pp_phase = PHASE_NETWORK;
More isdn4bsd convergence: cleanup log messages.
1998-12-26 13:14:45 +00:00
if (debug)
log(LOG_DEBUG, SPP_FMT "phase %s\n", SPP_ARGS(ifp),
sppp_phase_name(sp->pp_phase));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
/* Notify NCPs now. */
for (i = 0; i < IDX_COUNT; i++)
if ((cps[i])->flags & CP_NCP)
(cps[i])->Open(sp);
/* Send Up events to all NCPs. */
for (i = 0, mask = 1; i < IDX_COUNT; i++, mask <<= 1)
if (sp->lcp.protos & mask && ((cps[i])->flags & CP_NCP))
(cps[i])->Up(sp);
/* if no NCP is starting, all this was in vain, close down */
sppp_lcp_check_and_close(sp);
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
static const char *
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_cp_type_name(u_char type)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static char buf[12];
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
switch (type) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case CONF_REQ: return "conf-req";
case CONF_ACK: return "conf-ack";
case CONF_NAK: return "conf-nak";
case CONF_REJ: return "conf-rej";
case TERM_REQ: return "term-req";
case TERM_ACK: return "term-ack";
case CODE_REJ: return "code-rej";
case PROTO_REJ: return "proto-rej";
case ECHO_REQ: return "echo-req";
case ECHO_REPLY: return "echo-reply";
case DISC_REQ: return "discard-req";
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
snprintf (buf, sizeof(buf), "cp/0x%x", type);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return buf;
}
static const char *
sppp_auth_type_name(u_short proto, u_char type)
{
static char buf[12];
switch (proto) {
case PPP_CHAP:
switch (type) {
case CHAP_CHALLENGE: return "challenge";
case CHAP_RESPONSE: return "response";
case CHAP_SUCCESS: return "success";
case CHAP_FAILURE: return "failure";
}
case PPP_PAP:
switch (type) {
case PAP_REQ: return "req";
case PAP_ACK: return "ack";
case PAP_NAK: return "nak";
}
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
snprintf (buf, sizeof(buf), "auth/0x%x", type);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return buf;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Make sppp's logging human-readable. Also, use log(9), as opposed to printf(9), so the log output doesn't clutter the console. While i was at it, KNFified some function definitions. This file was very inconsistent in this respect.
1997-05-11 10:04:24 +00:00
static const char *
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
sppp_lcp_opt_name(u_char opt)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static char buf[12];
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (opt) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case LCP_OPT_MRU: return "mru";
case LCP_OPT_ASYNC_MAP: return "async-map";
case LCP_OPT_AUTH_PROTO: return "auth-proto";
case LCP_OPT_QUAL_PROTO: return "qual-proto";
case LCP_OPT_MAGIC: return "magic";
case LCP_OPT_PROTO_COMP: return "proto-comp";
case LCP_OPT_ADDR_COMP: return "addr-comp";
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
snprintf (buf, sizeof(buf), "lcp/0x%x", opt);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return buf;
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
static const char *
sppp_ipcp_opt_name(u_char opt)
{
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static char buf[12];
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
switch (opt) {
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case IPCP_OPT_ADDRESSES: return "addresses";
case IPCP_OPT_COMPRESSION: return "compression";
case IPCP_OPT_ADDRESS: return "address";
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
snprintf (buf, sizeof(buf), "ipcp/0x%x", opt);
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return buf;
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
static const char *
sppp_state_name(int state)
{
switch (state) {
case STATE_INITIAL: return "initial";
case STATE_STARTING: return "starting";
case STATE_CLOSED: return "closed";
case STATE_STOPPED: return "stopped";
case STATE_CLOSING: return "closing";
case STATE_STOPPING: return "stopping";
case STATE_REQ_SENT: return "req-sent";
case STATE_ACK_RCVD: return "ack-rcvd";
case STATE_ACK_SENT: return "ack-sent";
case STATE_OPENED: return "opened";
}
return "illegal";
}
static const char *
sppp_phase_name(enum ppp_phase phase)
{
switch (phase) {
case PHASE_DEAD: return "dead";
case PHASE_ESTABLISH: return "establish";
case PHASE_TERMINATE: return "terminate";
case PHASE_AUTHENTICATE: return "authenticate";
case PHASE_NETWORK: return "network";
}
return "illegal";
}
static const char *
sppp_proto_name(u_short proto)
{
static char buf[12];
switch (proto) {
case PPP_LCP: return "lcp";
case PPP_IPCP: return "ipcp";
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
case PPP_PAP: return "pap";
case PPP_CHAP: return "chap";
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
}
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
snprintf(buf, sizeof(buf), "proto/0x%x", (unsigned)proto);
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
return buf;
}
Another mega commit to staticize things.
1995-12-14 09:55:16 +00:00
static void
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
sppp_print_bytes(const u_char *p, u_short len)
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
{
Remove all the #ifdef notyet stuff, it is probably never going to happen in the first place. Use 3sec timeout as recommended. Reorder some debug messages. Label som of the 0x%x in debug messages Make sppp_print_bytes() use %*D and handle zero length. If we don't have MAGIC numbers, don't yell loopback if 0 == 0
1999-02-19 13:45:09 +00:00
if (len)
addlog(" %*D", len, p, "-");
Cronyx/Sigma sync/async serial driver with PPP support from Serge Vakulenko
1994-12-02 23:23:01 +00:00
}
Major overhaul of the SyncPPP layer. Basically, this comprises now a full implementation of the sate machine as described in RFC1661, and provides support for plugging in various control protocols. I needed this to provide PPP support for the BISDN project (right now). Unfortunatley, while the existing API was almost up to the point, i needed one minor API change in order to decouple the this-layer- started and this-layer-finished actions from the respective Up and Down events of the lower layer. This requires two additional lines in the attach routines of all existing lower layer interface drivers that are using syncPPP (shortcutting these actions and events). Apart from this, i believe i didn't change the API of all this, so everything should plug in without too many hassles. Please report if i broke something in the existing drivers. For a list of features (including new ones like dial-on-demand), and things still to be done, please refer to the man page i'll commit asap. Encouraged by: Serge Vakulenko <vak@cronyx.ru>
1997-05-19 22:03:09 +00:00
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
static void
sppp_print_string(const char *p, u_short len)
{
u_char c;
while (len-- > 0) {
c = *p++;
/*
* Print only ASCII chars directly. RFC 1994 recommends
* using only them, but we don't rely on it. */
if (c < ' ' || c > '~')
addlog("\\x%x", c);
else
addlog("%c", c);
}
}
static const char *
sppp_dotted_quad(u_long addr)
{
static char s[16];
sprintf(s, "%d.%d.%d.%d",
In an attempt to reduce the huge number of differences between the FreeBSD repository version of this file and the isdn4bsd version, adopt those changes from the i4b version that make this file BSD-version independent. I attempted to avoid uglifying this file too much, thus deviated a little from the i4b version (and hope they will adopt the changes, too). The diffs mostly concentrate on: . #include differences between the systems . different callout handling between FreeBSD vs. Net/OpenBSD . interface naming (Net/OpenBSD store the ASCII name including the unit # in struct ifnet, FreeBSD only the name) . use of random() in FreeBSD vs. time-based pseudo-randomization in Net/OpenBSD (for loopback detection ad CHAP challenges -- i assume at least OpenBSD could also benefit from random(), but that's the way i've got this file) . interface address list elements are named a little differently between FreeBSD and Net/OpenBSD I attempted to segregate those compat fixes from other code fixes and enhancements. Obtained from: The isdn4bsd project
1998-10-06 20:47:53 +00:00
(int)((addr >> 24) & 0xff),
(int)((addr >> 16) & 0xff),
(int)((addr >> 8) & 0xff),
Fixed printf format errors. sppp_dotted_quad() was yet another private, broken, version of inet_ntoa(). It should go away.
1998-08-17 00:29:34 +00:00
(int)(addr & 0xff));
Jumbo patch to implement PAP and CHAP for sppp(4). Partially based on Serge's (Cronyx's) code in the vendor branch. (FR support not yet merged.)
1997-10-11 11:25:28 +00:00
return s;
}
static int
sppp_strnlen(u_char *p, int max)
{
int len;
for (len = 0; len < max && *p; ++p)
++len;
return len;
}
/* a dummy, used to drop uninteresting events */
static void
sppp_null(struct sppp *unused)
{
/* do just nothing */
}
Reference in New Issue Copy Permalink