pppd.8: Document netmask option

[ppp.git] / pppd / ccp.h

diff --git a/pppd/ccp.h b/pppd/ccp.h
index a61d689ccbc7d4d3e0f432b5d829e71ddc9df801..0a56686750bc2558af257526158113d27574e439 100644 (file)
--- a/pppd/ccp.h
+++ b/pppd/ccp.h
@@ -10,19 +10,14 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name(s) of the authors of this software must not be used to
+ * 2. The name(s) of the authors of this software must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 4. Redistributions of any form whatsoever must retain the following
+ * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
+ *     <paulus@ozlabs.org>".
  *
  * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -32,8 +27,16 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ccp.h,v 1.11 2002/12/04 23:03:32 paulus Exp $
+ * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $
  */
+#ifndef PPP_CCP_H
+#define PPP_CCP_H
+
+#include "pppdconf.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 typedef struct ccp_options {
     bool bsd_compress;         /* do BSD Compress? */
@@ -42,9 +45,9 @@ typedef struct ccp_options {
     bool predictor_2;          /* do Predictor-2? */
     bool deflate_correct;      /* use correct code for deflate? */
     bool deflate_draft;                /* use draft RFC code for deflate? */
-    bool mppe;                 /* do MPPE? */
-    u_short bsd_bits;          /* # bits/code for BSD Compress */
-    u_short deflate_size;      /* lg(window size) for Deflate */
+    unsigned char mppe;                /* MPPE bitfield */
+    unsigned short bsd_bits;           /* # bits/code for BSD Compress */
+    unsigned short deflate_size;       /* lg(window size) for Deflate */
     short method;              /* code for chosen compression method */
 } ccp_options;
 
@@ -55,3 +58,9 @@ extern ccp_options ccp_allowoptions[];
 extern ccp_options ccp_hisoptions[];
 
 extern struct protent ccp_protent;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PPP_CCP_H