Work on task #13907 PPP cleanups: Move PPP options from opt.h to dedicated ppp_opts.h file

2026-09-25 02:03:39 +08:00 · 2016-04-21 22:28:14 +02:00
parent 749f7fae1a
commit 76d25befb4
60 changed files with 598 additions and 571 deletions
--- a/src/netif/ppp/auth.c
+++ b/src/netif/ppp/auth.c
@@ -68,7 +68,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/ccp.c
+++ b/src/netif/ppp/ccp.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && CCP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include <stdlib.h>
--- a/src/netif/ppp/chap-md5.c
+++ b/src/netif/ppp/chap-md5.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && CHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/chap-new.c
+++ b/src/netif/ppp/chap-new.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && CHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/chap_ms.c
+++ b/src/netif/ppp/chap_ms.c
@@ -74,7 +74,7 @@
 *
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && MSCHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/demand.c
+++ b/src/netif/ppp/demand.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && DEMAND_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include <stdio.h>
--- a/src/netif/ppp/eap.c
+++ b/src/netif/ppp/eap.c
@@ -43,7 +43,7 @@
 * Based on draft-ietf-pppext-eap-srp-03.txt.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && EAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include "netif/ppp/ppp_impl.h"
--- a/src/netif/ppp/ecp.c
+++ b/src/netif/ppp/ecp.c
@@ -57,7 +57,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && ECP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include <string.h>
--- a/src/netif/ppp/eui64.c
+++ b/src/netif/ppp/eui64.c
@@ -35,7 +35,7 @@
 * $Id: eui64.c,v 1.6 2002/12/04 23:03:32 paulus Exp $
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include "netif/ppp/ppp_impl.h"
--- a/src/netif/ppp/fsm.c
+++ b/src/netif/ppp/fsm.c
@@ -40,7 +40,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 /*
--- a/src/netif/ppp/ipcp.c
+++ b/src/netif/ppp/ipcp.c
@@ -40,7 +40,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPP_IPV4_SUPPORT /* don't build if not configured for use in lwipopts.h */

 /*
--- a/src/netif/ppp/ipv6cp.c
+++ b/src/netif/ppp/ipv6cp.c
@@ -147,7 +147,7 @@
 *   interface up / set address.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/lcp.c
+++ b/src/netif/ppp/lcp.c
@@ -40,7 +40,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 /*
--- a/src/netif/ppp/magic.c
+++ b/src/netif/ppp/magic.c
@@ -72,7 +72,7 @@
 *   Extracted from avos.
 *****************************************************************************/

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #include "netif/ppp/ppp_impl.h"
--- a/src/netif/ppp/mppe.c
+++ b/src/netif/ppp/mppe.c
@@ -23,7 +23,7 @@
 *                    deprecated in 2.6
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && MPPE_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 #include <string.h>
--- a/src/netif/ppp/multilink.c
+++ b/src/netif/ppp/multilink.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && defined(HAVE_MULTILINK) /* don't build if not configured for use in lwipopts.h */

 /* Multilink support
--- a/src/netif/ppp/polarssl/arc4.c
+++ b/src/netif/ppp/polarssl/arc4.c
@@ -38,7 +38,7 @@
 *  http://groups.google.com/group/sci.crypt/msg/10a300c9d21afca0
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_ARC4

 #include "netif/ppp/polarssl/arc4.h"
--- a/src/netif/ppp/polarssl/des.c
+++ b/src/netif/ppp/polarssl/des.c
@@ -39,7 +39,7 @@
 *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_DES

 #include "netif/ppp/polarssl/des.h"
--- a/src/netif/ppp/polarssl/md4.c
+++ b/src/netif/ppp/polarssl/md4.c
@@ -39,7 +39,7 @@
 *  http://www.ietf.org/rfc/rfc1320.txt
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD4

 #include "netif/ppp/polarssl/md4.h"
--- a/src/netif/ppp/polarssl/md5.c
+++ b/src/netif/ppp/polarssl/md5.c
@@ -38,7 +38,7 @@
 *  http://www.ietf.org/rfc/rfc1321.txt
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD5

 #include "netif/ppp/polarssl/md5.h"
--- a/src/netif/ppp/polarssl/sha1.c
+++ b/src/netif/ppp/polarssl/sha1.c
@@ -38,7 +38,7 @@
 *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_SHA1

 #include "netif/ppp/polarssl/sha1.h"
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -79,7 +79,7 @@
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #include "lwip/pbuf.h"
--- a/src/netif/ppp/pppapi.c
+++ b/src/netif/ppp/pppapi.c
@@ -31,7 +31,7 @@
 *
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"

 #if LWIP_PPP_API /* don't build if not configured for use in lwipopts.h */

--- a/src/netif/ppp/pppcrypt.c
+++ b/src/netif/ppp/pppcrypt.c
@@ -30,7 +30,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not necessary */

 #include "netif/ppp/ppp_impl.h"
--- a/src/netif/ppp/pppoe.c
+++ b/src/netif/ppp/pppoe.c
@@ -68,7 +68,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -50,7 +50,7 @@
 * - Hidden AVPs
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPPOL2TP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #include "lwip/err.h"
--- a/src/netif/ppp/pppos.c
+++ b/src/netif/ppp/pppos.c
@@ -31,7 +31,7 @@
 *
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PPPOS_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #include <string.h>
--- a/src/netif/ppp/upap.c
+++ b/src/netif/ppp/upap.c
@@ -40,7 +40,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && PAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */

 /*
--- a/src/netif/ppp/utils.c
+++ b/src/netif/ppp/utils.c
@@ -28,7 +28,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */

 #if 0 /* UNUSED */
--- a/src/netif/ppp/vj.c
+++ b/src/netif/ppp/vj.c
@@ -28,7 +28,7 @@
 * for a 16 bit processor.
 */

-#include "lwip/opt.h"
+#include "netif/ppp/ppp_opts.h"
 #if PPP_SUPPORT && VJ_SUPPORT && LWIP_TCP /* don't build if not configured for use in lwipopts.h */

 #include "netif/ppp/ppp_impl.h"