Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / pppd / ccp.h

diff --git a/pppd/ccp.h b/pppd/ccp.h
index 9bcac4a99757ea95804b46246952dc4f6e88c82e..2fcba915758b9282ef22c17ff5ed7fea0eaf3f8d 100644 (file)
--- a/pppd/ccp.h
+++ b/pppd/ccp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ccp.h,v 1.6 1995/12/18 03:44:41 paulus Exp $
+ * $Id: ccp.h,v 1.8 1998/03/25 01:25:03 paulus Exp $
  */
 
 typedef struct ccp_options {
@@ -32,8 +32,11 @@ typedef struct ccp_options {
     u_int deflate: 1;          /* do Deflate? */
     u_int predictor_1: 1;      /* do Predictor-1? */
     u_int predictor_2: 1;      /* do Predictor-2? */
+    u_int deflate_correct: 1;  /* use correct code for deflate? */
+    u_int deflate_draft: 1;    /* use draft RFC code for deflate? */
     u_short bsd_bits;          /* # bits/code for BSD Compress */
     u_short deflate_size;      /* lg(window size) for Deflate */
+    short method;              /* code for chosen compression method */
 } ccp_options;
 
 extern fsm ccp_fsm[];
@@ -42,16 +45,4 @@ extern ccp_options ccp_gotoptions[];
 extern ccp_options ccp_allowoptions[];
 extern ccp_options ccp_hisoptions[];
 
-void ccp_init __P((int unit));
-void ccp_open __P((int unit));
-void ccp_close __P((int unit, char *));
-void ccp_lowerup __P((int unit));
-void ccp_lowerdown __P((int));
-void ccp_input __P((int unit, u_char *pkt, int len));
-void ccp_protrej __P((int unit));
-int  ccp_printpkt __P((u_char *pkt, int len,
-                         void (*printer) __P((void *, char *, ...)),
-                         void *arg));
-void ccp_datainput __P((int unit, u_char *pkt, int len));
-
 extern struct protent ccp_protent;