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, 10 insertions, 1 deletions

diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 5a2152b..d03c9f3 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: hdlc.c,v 1.34 1998/06/27 23:48:44 brian Exp $
+ * $Id: hdlc.c,v 1.35 1998/08/01 01:02:12 brian Exp $
  *
  *	TODO:
  */
@@ -58,6 +58,7 @@
 #include "prompt.h"
 #include "chat.h"
 #include "mp.h"
+#include "cbcp.h"
 #include "datalink.h"
 #include "filter.h"
 #include "bundle.h"
@@ -395,6 +396,14 @@ hdlc_DecodePacket(struct bundle *bundle, u_short proto, struct mbuf * bp,
       mbuf_Free(bp);
     }
     break;
+  case PROTO_CBCP:
+    if (p)
+      cbcp_Input(p, bp);
+    else {
+      log_Printf(LogERROR, "DecodePacket: CBCP: Not a physical link !\n");
+      mbuf_Free(bp);
+    }
+    break;
   case PROTO_LQR:
     if (p) {
       p->hdlc.lqm.lqr.SaveInLQRs++;