From dcde1c2a8fe0ab7a76de809e3913e1f42fe5a5a0 Mon Sep 17 00:00:00 2001
From: Sylvain Rochet <gradator@gradator.net>
Date: Fri, 27 Mar 2015 00:10:20 +0100
Subject: [PATCH] PPP, CCP, added missing defines from linux/ppp-comp.h to
 ccp.h

---
 src/include/netif/ppp/ccp.h | 78 +++++++++++++++++++++++++++++++++++++
 src/netif/ppp/ccp.c         |  1 -
 src/netif/ppp/chap_ms.c     |  1 -
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/src/include/netif/ppp/ccp.h b/src/include/netif/ppp/ccp.h
index 02157994..ad48129c 100644
--- a/src/include/netif/ppp/ccp.h
+++ b/src/include/netif/ppp/ccp.h
@@ -36,6 +36,84 @@
 #ifndef CCP_H
 #define CCP_H
 
+/*
+ * CCP codes.
+ */
+
+#define CCP_CONFREQ	1
+#define CCP_CONFACK	2
+#define CCP_TERMREQ	5
+#define CCP_TERMACK	6
+#define CCP_RESETREQ	14
+#define CCP_RESETACK	15
+
+/*
+ * Max # bytes for a CCP option
+ */
+
+#define CCP_MAX_OPTION_LENGTH	32
+
+/*
+ * Parts of a CCP packet.
+ */
+
+#define CCP_CODE(dp)		((dp)[0])
+#define CCP_ID(dp)		((dp)[1])
+#define CCP_LENGTH(dp)		(((dp)[2] << 8) + (dp)[3])
+#define CCP_HDRLEN		4
+
+#define CCP_OPT_CODE(dp)	((dp)[0])
+#define CCP_OPT_LENGTH(dp)	((dp)[1])
+#define CCP_OPT_MINLEN		2
+
+/*
+ * Definitions for BSD-Compress.
+ */
+
+#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
+#define CILEN_BSD_COMPRESS	3	/* length of config. option */
+
+/* Macros for handling the 3rd byte of the BSD-Compress config option. */
+#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
+#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
+#define BSD_CURRENT_VERSION	1		/* current version number */
+#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
+
+#define BSD_MIN_BITS		9	/* smallest code size supported */
+#define BSD_MAX_BITS		15	/* largest code size supported */
+
+/*
+ * Definitions for Deflate.
+ */
+
+#define CI_DEFLATE		26	/* config option for Deflate */
+#define CI_DEFLATE_DRAFT	24	/* value used in original draft RFC */
+#define CILEN_DEFLATE		4	/* length of its config option */
+
+#define DEFLATE_MIN_SIZE	9
+#define DEFLATE_MAX_SIZE	15
+#define DEFLATE_METHOD_VAL	8
+#define DEFLATE_SIZE(x)		(((x) >> 4) + 8)
+#define DEFLATE_METHOD(x)	((x) & 0x0F)
+#define DEFLATE_MAKE_OPT(w)	((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
+#define DEFLATE_CHK_SEQUENCE	0
+
+/*
+ * Definitions for MPPE.
+ */
+
+#define CI_MPPE                18      /* config option for MPPE */
+#define CILEN_MPPE              6      /* length of config option */
+
+/*
+ * Definitions for other, as yet unsupported, compression methods.
+ */
+
+#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
+#define CILEN_PREDICTOR_1	2	/* length of its config option */
+#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
+#define CILEN_PREDICTOR_2	2	/* length of its config option */
+
 typedef struct ccp_options {
     unsigned int deflate          :1; /* do Deflate? */
     unsigned int deflate_correct  :1; /* use correct code for deflate? */
diff --git a/src/netif/ppp/ccp.c b/src/netif/ppp/ccp.c
index fe015d71..fb3ba1f0 100644
--- a/src/netif/ppp/ccp.c
+++ b/src/netif/ppp/ccp.c
@@ -38,7 +38,6 @@
 
 #include "netif/ppp/fsm.h"
 #include "netif/ppp/ccp.h"
-#include <net/ppp-comp.h>
 
 #if MPPE_SUPPORT
 #include "netif/ppp/chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
diff --git a/src/netif/ppp/chap_ms.c b/src/netif/ppp/chap_ms.c
index 46a186a5..95f1eae4 100644
--- a/src/netif/ppp/chap_ms.c
+++ b/src/netif/ppp/chap_ms.c
@@ -152,7 +152,6 @@ static char *mschap2_peer_challenge = NULL;
 
 #include "netif/ppp/fsm.h"		/* Need to poke MPPE options */
 #include "netif/ppp/ccp.h"
-#include <net/ppp-comp.h>
 #endif /* MPPE_SUPPORT */
 
 #if PPP_OPTIONS