X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fcbcp.c;h=c9ef0899ae9fb500fbfe692f0f1198cce44e1e91;hp=9405f7bfa266a179ceb0860f8a6639c6ce373561;hb=a25ab4af5d8ea4f1760b5db5f5ee5b65bbfcd53b;hpb=cbe589d089e6db8828f71e88688793ead5b30954

diff --git a/pppd/cbcp.c b/pppd/cbcp.c
index 9405f7b..c9ef089 100644
--- a/pppd/cbcp.c
+++ b/pppd/cbcp.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: cbcp.c,v 1.1 1996/10/08 04:35:41 paulus Exp $";
+static char rcsid[] = "$Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -68,11 +68,11 @@ cbcp_state cbcp[NUM_PPP];
 
 /* internal prototypes */
 
-void cbcp_recvreq(cbcp_state *us, char *pckt, int len);
-void cbcp_resp(cbcp_state *us);
-void cbcp_up(cbcp_state *us);
-void cbcp_recvack(cbcp_state *us, char *pckt, int len);
-void cbcp_send(cbcp_state *us, u_char code, u_char *buf, int len);
+static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len));
+static void cbcp_resp __P((cbcp_state *us));
+static void cbcp_up __P((cbcp_state *us));
+static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len));
+static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len));
 
 /* init state */
 static void
@@ -189,9 +189,7 @@ cbcp_printpkt(p, plen, printer, arg)
     void *arg;
 {
     int code, opt, id, len, olen, delay;
-    u_char *pstart, *optend;
-    u_short cishort;
-    u_long cilong;
+    u_char *pstart;
 
     if (plen < HEADERLEN)
 	return 0;
@@ -360,7 +358,7 @@ cbcp_resp(us)
 	PUTCHAR(len , bufp);
 	PUTCHAR(0, bufp);
 	cbcp_send(us, CBCP_RESP, buf, len);
-	ipcp_open(us->us_unit);
+	(*ipcp_protent.open)(us->us_unit);
 	return;
     }
 }
@@ -428,5 +426,5 @@ cbcp_up(us)
     cbcp_state *us;
 {
     persist = 0;
-    lcp_close(0);
+    lcp_close(0, "Call me back, please");
 }