Moved PPP headers into include/netif/ppp/, fixing bug #37040.

src/api/tcpip.c

@@ -47,7 +47,7 @@
 #include "lwip/tcpip.h"
 #include "lwip/init.h"
 #include "netif/etharp.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 
 /* global variables */
 static tcpip_init_done_fn tcpip_init_done;

src/core/init.c

@@ -60,7 +60,7 @@
 #include "lwip/nd6.h"
 #include "lwip/mld6.h"
 #include "lwip/api.h"
-#include "ppp.h"
+#include "netif/ppp/ppp.h"
 
 /* Compile-time sanity checks for configuration errors.
  * These can be done independently of LWIP_DEBUG, without penalty.

src/core/memp.c

@@ -57,8 +57,9 @@
 #include "lwip/snmp_structs.h"
 #include "lwip/snmp_msg.h"
 #include "lwip/dns.h"
-#include "netif/ppp_oe.h"
-#include "netif/pppol2tp.h"
+#include "netif/ppp/ppp.h"
+#include "netif/ppp/pppoe.h"
+#include "netif/ppp/pppol2tp.h"
 #include "lwip/nd6.h"
 #include "lwip/ip6_frag.h"
 #include "lwip/mld6.h"

src/include/lwip/pppapi.h

@@ -33,7 +33,7 @@
 #if LWIP_PPP_API /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/sys.h"
-#include "ppp.h"
+#include "netif/ppp/ppp.h"
 
 #ifdef __cplusplus
 extern "C" {

src/include/netif/ppp/ppp.h

@@ -145,10 +145,10 @@ typedef struct ppp_pcb_s ppp_pcb;
 #endif /* EAP_SUPPORT */
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 #if PPPOL2TP_SUPPORT
-#include "netif/pppol2tp.h"
+#include "netif/ppp/pppol2tp.h"
 #endif /* PPPOL2TP_SUPPORT */
 
 /*

src/include/netif/ppp/pppoe.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* ppp_oe.h - PPP Over Ethernet implementation for lwIP.
+* pppoe.h - PPP Over Ethernet implementation for lwIP.
 *
 * Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
 *

src/netif/etharp.c

@@ -58,7 +58,7 @@
 #include "lwip/ip6.h"
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 
 #include <string.h>

src/netif/ethernetif.c

@@ -54,7 +54,7 @@
 #include "lwip/snmp.h"
 #include "lwip/ethip6.h"
 #include "netif/etharp.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 
 /* Define those to better describe your network interface. */
 #define IFNAME0 'e'

src/netif/ppp/auth.c

@@ -103,28 +103,28 @@
 #include <time.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 #if CCP_SUPPORT
-#include "ccp.h"
+#include "netif/ppp/ccp.h"
 #endif /* CCP_SUPPORT */
 #if ECP_SUPPORT
-#include "ecp.h"
+#include "netif/ppp/ecp.h"
 #endif /* ECP_SUPPORT */
-#include "ipcp.h"
+#include "netif/ppp/ipcp.h"
 #if PAP_SUPPORT
-#include "upap.h"
+#include "netif/ppp/upap.h"
 #endif /* PAP_SUPPORT */
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
 #if EAP_SUPPORT
-#include "eap.h"
+#include "netif/ppp/eap.h"
 #endif /* EAP_SUPPORT */
 #if CBCP_SUPPORT
-#include "cbcp.h"
+#include "netif/ppp/cbcp.h"
 #endif
 
 #if 0 /* UNUSED */

src/netif/ppp/ccp.c

@@ -34,15 +34,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ccp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ccp.h"
 #include <net/ppp-comp.h>
 
 #ifdef MPPE
-#include "chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
-#include "lcp.h"	/* lcp_close(), lcp_fsm */
+#include "netif/ppp/chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
+#include "netif/ppp/lcp.h"	/* lcp_close(), lcp_fsm */
 #endif
 
 /*

src/netif/ppp/chap-md5.c

@@ -36,14 +36,14 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "chap-new.h"
-#include "chap-md5.h"
-#include "magic.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap-md5.h"
+#include "netif/ppp/magic.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif

src/netif/ppp/chap-new.c

@@ -36,16 +36,16 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
 #if 0 /* UNUSED */
 #include "session.h"
 #endif /* UNUSED */
 
-#include "chap-new.h"
-#include "chap-md5.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap-md5.h"
 #if MSCHAP_SUPPORT
-#include "chap_ms.h"
+#include "netif/ppp/chap_ms.h"
 #endif
 
 /* Hook for a plugin to validate CHAP challenge */

src/netif/ppp/chap_ms.c

@@ -87,27 +87,27 @@
 #include <unistd.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "chap-new.h"
-#include "chap_ms.h"
-#include "pppcrypt.h"
-#include "magic.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap_ms.h"
+#include "netif/ppp/pppcrypt.h"
+#include "netif/ppp/magic.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD4
-#include "polarssl/lwip_md4.h"
+#include "netif/ppp/polarssl/md4.h"
 #else
 #include "polarssl/md4.h"
 #endif
 
 #if LWIP_INCLUDED_POLARSSL_SHA1
-#include "polarssl/lwip_sha1.h"
+#include "netif/ppp/polarssl/sha1.h"
 #else
 #include "polarssl/sha1.h"
 #endif
 
 #if LWIP_INCLUDED_POLARSSL_DES
-#include "polarssl/lwip_des.h"
+#include "netif/ppp/polarssl/des.h"
 #else
 #include "polarssl/des.h"
 #endif
@@ -150,8 +150,8 @@ static char *mschap_challenge = NULL;
 static char *mschap2_peer_challenge = NULL;
 #endif
 
-#include "fsm.h"		/* Need to poke MPPE options */
-#include "ccp.h"
+#include "netif/ppp/fsm.h"		/* Need to poke MPPE options */
+#include "netif/ppp/ccp.h"
 #include <net/ppp-comp.h>
 #endif
 

src/netif/ppp/demand.c

@@ -52,11 +52,11 @@
 #include <pcap-bpf.h>
 #endif
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ipcp.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/lcp.h"
 
 char *frame;
 int framelen;

src/netif/ppp/eap.c

@@ -46,21 +46,21 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && EAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif
 
-#include "eap.h"
+#include "netif/ppp/eap.h"
 
 #ifdef USE_SRP
 #include <t_pwd.h>
 #include <t_server.h>
 #include <t_client.h>
-#include "pppcrypt.h"
+#include "netif/ppp/pppcrypt.h"
 #endif /* USE_SRP */
 
 #ifndef SHA_DIGESTSIZE

src/netif/ppp/ecp.c

@@ -62,10 +62,10 @@
 
 #include <string.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ecp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ecp.h"
 
 #if PPP_OPTIONS
 static option_t ecp_option_list[] = {

src/netif/ppp/eui64.c

@@ -38,8 +38,8 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "eui64.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/eui64.h"
 
 /*
  * eui64_ntoa - Make an ascii representation of an interface identifier

src/netif/ppp/fsm.c

@@ -55,9 +55,9 @@
 #include <sys/types.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
+#include "netif/ppp/fsm.h"
 
 static void fsm_timeout (void *);
 static void fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len);

src/netif/ppp/ipcp.c

@@ -59,10 +59,10 @@
 #include <arpa/inet.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ipcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
 
 #if 0 /* UNUSED */
 /* global vars */

src/netif/ppp/ipv6cp.c

@@ -163,11 +163,11 @@
 #include <arpa/inet.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
-#include "fsm.h"
-#include "ipcp.h"
-#include "ipv6cp.h"
-#include "magic.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/ipv6cp.h"
+#include "netif/ppp/magic.h"
 
 /* global vars */
 #if 0 /* UNUSED */

src/netif/ppp/lcp.c

@@ -53,14 +53,14 @@
 #include <stdlib.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
-#include "magic.h"
+#include "netif/ppp/magic.h"
 
 /*
  * When the link comes up we want to be able to wait for a short while,

src/netif/ppp/magic.c

@@ -75,13 +75,13 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "magic.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/magic.h"
 
 #if PPP_MD5_RANDM /* Using MD5 for better randomness if enabled */
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif

src/netif/ppp/multilink.c

@@ -49,11 +49,11 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
-#include "tdb.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
+#include "netif/ppp/tdb.h"
 
 bool endpoint_specified;	/* user gave explicit endpoint discriminator */
 char *bundle_id;		/* identifier for our bundle */

src/netif/ppp/polarssl/des.c

@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_DES
 
-#include "lwip_des.h"
+#include "netif/ppp/polarssl/des.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)

src/netif/ppp/polarssl/md4.c

@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD4
 
-#include "lwip_md4.h"
+#include "netif/ppp/polarssl/md4.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)

src/netif/ppp/polarssl/md5.c

@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD5
 
-#include "lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)

src/netif/ppp/polarssl/sha1.c

@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_SHA1
 
-#include "lwip_sha1.h"
+#include "netif/ppp/polarssl/sha1.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)

src/netif/ppp/ppp.c

@@ -92,40 +92,40 @@
 #include "lwip/sys.h"
 #include "lwip/ip.h" /* for ip_input() */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
-#include "ipcp.h"
-#include "magic.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/magic.h"
 
 #if PAP_SUPPORT
-#include "upap.h"
+#include "netif/ppp/upap.h"
 #endif /* PAP_SUPPORT */
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
 #if EAP_SUPPORT
-#include "eap.h"
+#include "netif/ppp/eap.h"
 #endif /* EAP_SUPPORT */
 #if CCP_SUPPORT
-#include "ccp.h"
+#include "netif/ppp/ccp.h"
 #endif /* EAP_SUPPORT */
 #if ECP_SUPPORT
-#include "ecp.h"
+#include "netif/ppp/ecp.h"
 #endif /* EAP_SUPPORT */
 #if VJ_SUPPORT
-#include "vj.h"
+#include "netif/ppp/vj.h"
 #endif /* VJ_SUPPORT */
 #if PPP_IPV6_SUPPORT
-#include "ipv6cp.h"
+#include "netif/ppp/ipv6cp.h"
 #endif /* PPP_IPV6_SUPPORT */
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 #if PPPOL2TP_SUPPORT
-#include "netif/pppol2tp.h"
+#include "netif/ppp/pppol2tp.h"
 #endif /* PPPOL2TP_SUPPORT */
 
 /* Global variables */

src/netif/ppp/pppcrypt.c

@@ -33,9 +33,9 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not necessary */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "pppcrypt.h"
+#include "netif/ppp/pppcrypt.h"
 
 
 static u_char pppcrypt_get_7bits(u_char *input, int startBit) {

src/netif/ppp/pppoe.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
-* ppp_oe.c - PPP Over Ethernet implementation for lwIP.
+* pppoe.c - PPP Over Ethernet implementation for lwIP.
 *
 * Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
 *
@@ -80,8 +80,8 @@
 #include "lwip/memp.h"
 #include "lwip/stats.h"
 
-#include "ppp_impl.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppoe.h"
 
 /* Add a 16 bit unsigned value to a buffer pointed to by PTR */
 #define PPPOE_ADD_16(PTR, VAL) \

src/netif/ppp/pppol2tp.c

@@ -58,14 +58,14 @@
 #include "lwip/netif.h"
 #include "lwip/udp.h"
 
-#include "ppp_impl.h"
-#include "netif/pppol2tp.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppol2tp.h"
 
-#include "magic.h"
+#include "netif/ppp/magic.h"
 
 #if PPPOL2TP_AUTH_SUPPORT
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif

src/netif/ppp/upap.c

@@ -52,9 +52,9 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "upap.h"
+#include "netif/ppp/upap.h"
 
 #if PPP_OPTIONS
 /*

src/netif/ppp/utils.c

@@ -60,10 +60,10 @@
 
 #include <ctype.h>  /* isdigit() */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 
 #if defined(SUNOS4)
 extern char *strerror();

src/netif/ppp/vj.c

@@ -31,10 +31,10 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && VJ_SUPPORT /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "pppdebug.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppdebug.h"
 
-#include "vj.h"
+#include "netif/ppp/vj.h"
 
 #include <string.h>