o Support callback types NONE, E.164, AUTH and CBCP.

  (see the new ``set callback'' and ``set cbcp'' commands)
o Add a ``cbcp'' log level and mbuf type.
o Don't dump core when \T is given in ``set login'' or
  ``set hangup''.
o Allow ``*'' and blanks as placeholders in ppp.secret and
  allow a fifth field for specifying auth/cbcp dialback
  parameters.
o Remove a few extraneous #includes
o Define the default number of REQs (restart counter) in defs.h
  rather than hardcoding ``5'' all over the place.
o Fix a few man page inconsistencies.

1 files changed, 11 insertions, 3 deletions

diff --git a/usr.sbin/ppp/datalink.h b/usr.sbin/ppp/datalink.h
index 6803503..4080199 100644
--- a/usr.sbin/ppp/datalink.h
+++ b/usr.sbin/ppp/datalink.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: datalink.h,v 1.3 1998/05/28 23:15:35 brian Exp $
+ *	$Id: datalink.h,v 1.4 1998/06/15 19:05:19 brian Exp $
  */
 
 #define DATALINK_CLOSED  (0)
@@ -34,7 +34,8 @@
 #define DATALINK_READY   (5)
 #define DATALINK_LCP     (6)
 #define DATALINK_AUTH    (7)
-#define DATALINK_OPEN    (8)
+#define DATALINK_CBCP    (8)
+#define DATALINK_OPEN    (9)
 
 #define DATALINK_MAXNAME (20)   /* Maximum datalink::name length */
 
@@ -61,7 +62,7 @@ struct datalink {
     unsigned packetmode : 1;	/* Go into packet mode after login ? */
   } script;
 
-  struct pppTimer dial_timer;	/* For timing between opens & scripts */
+  struct pppTimer dial_timer;	/* For timing between close & open */
 
   struct {
     struct {
@@ -81,6 +82,8 @@ struct datalink {
       int max;			/* initially try again this number of times */
       int timeout;		/* Timeout before reconnect on carrier loss */
     } reconnect;
+    struct callback callback;	/* Direction depends on physical type */
+    struct cbcpcfg cbcp;	/* Direction depends on phys type & callback */
   } cfg;			/* All our config data is in here */
 
   struct {
@@ -90,6 +93,8 @@ struct datalink {
     const char *chosen;		/* Chosen phone number after DIAL */
   } phone;
 
+  struct cbcp cbcp;
+
   int dial_tries;		/* currently try again this number of times */
   unsigned reconnect_tries;	/* currently try again this number of times */
 
@@ -126,6 +131,9 @@ extern void datalink_StayDown(struct datalink *);
 extern void datalink_DontHangup(struct datalink *);
 extern void datalink_AuthOk(struct datalink *);
 extern void datalink_AuthNotOk(struct datalink *);
+extern void datalink_NCPUp(struct datalink *);
+extern void datalink_CBCPComplete(struct datalink *);
+extern void datalink_CBCPFailed(struct datalink *);
 extern int datalink_Show(struct cmdargs const *);
 extern int datalink_SetRedial(struct cmdargs const *);
 extern int datalink_SetReconnect(struct cmdargs const *);