Allow to add extra options to the default one

by adding a 'lwipopts_extra.h'


Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

README.md

@@ -22,7 +22,9 @@ The LwIP has several user defined options, which is specified from within the `l
 
 This library provides a default user defined options file named `lwipopts_default.h`.
 
-User can provide his own defined options at sketch level by adding his configuration in a file named `STM32lwipopts.h`.
+User can provide his own defined options at sketch level by adding his configuration in a file named `STM32lwipopts.h` or
+extend the default one by adding some extra configuration in a file named `lwipopts_extra.h`.
+
 
 
 ## New alternative init procedure **!!!**

src/lwipopts.h

@@ -11,6 +11,9 @@
 #if __has_include("STM32lwipopts.h")
 #include "STM32lwipopts.h"
 #else
+#if __has_include("lwipopts_extra.h")
+#include "lwipopts_extra.h"
+#endif
 #include "lwipopts_default.h"
 #endif
 

src/lwipopts_default.h

@@ -9,36 +9,10 @@
   * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics International N.V.
   * All rights reserved.</center></h2>
   *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted, provided that the following conditions are met:
-  *
-  * 1. Redistribution 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. Neither the name of STMicroelectronics nor the names of other
-  *    contributors to this software may be used to endorse or promote products
-  *    derived from this software without specific written permission.
-  * 4. This software, including modifications and/or derivative works of this
-  *    software, must execute solely and exclusively on microcontroller or
-  *    microprocessor devices manufactured by or for STMicroelectronics.
-  * 5. Redistribution and use of this software other than as permitted under
-  *    this license is void and will automatically terminate your rights under
-  *    this license.
-  *
-  * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-  * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
-  * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
-  * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-  * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
   *
   ******************************************************************************
   */
@@ -58,6 +32,8 @@
  */
 #define SYS_LIGHTWEIGHT_PROT    0
 
+#define LWIP_NOASSERT
+
 /* ---------- Memory options ---------- */
 /* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
    lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2
@@ -100,9 +76,13 @@ a lot of data that needs to be copied, this should be set high. */
 /* ---------- TCP options ---------- */
 #define LWIP_TCP                1
 #define TCP_TTL                 255
+#define LWIP_SO_RCVTIMEO                1
+#define LWIP_SO_RCVRCVTIMEO_NONSTANDARD 1   /* Pass an integer number of ms instead of a timeval struct. */
+#define LWIP_SO_SNDTIMEO                1
+#define LWIP_SO_SNDRCVTIMEO_NONSTANDARD 1   /* Pass an integer number of ms instead of a timeval struct. */
 
 /* Controls if TCP should queue segments that arrive out of
-   order. Define to 0 if your device is low on memory. */
+   order. Define to 0 if your device is low on memory and you are not scared by TCP congestion and latencies. */
 #define TCP_QUEUE_OOSEQ         0
 
 /* TCP Maximum segment size. */
@@ -117,19 +97,25 @@ a lot of data that needs to be copied, this should be set high. */
 #define TCP_SND_QUEUELEN        (2* TCP_SND_BUF/TCP_MSS)
 
 /* TCP receive window. */
-#define TCP_WND                 (2*TCP_MSS)
+#define TCP_WND                 (3*TCP_MSS)
+
+#define LWIP_TCP_KEEPALIVE                  1   /* Keep the TCP link active. Important for MQTT/TLS */
+#define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS  1   /* Prevent the same port to be used after reset.
+                                                   Otherwise, the remote host may be confused if the port was not explicitly closed before the reset. */
 
 
 /* ---------- ICMP options ---------- */
 #define LWIP_ICMP                       1
+#define LWIP_RAW                        1 /* PING changed to 1 */
+#define DEFAULT_RAW_RECVMBOX_SIZE       3 /* for ICMP PING */
 
 
 /* ---------- DHCP options ---------- */
+/* Define LWIP_DHCP to 1 if you want DHCP configuration of
+   interfaces. DHCP is not implemented in lwIP 0.5.1, however, so
+   turning this on does currently not work. */
 #define LWIP_DHCP               1
 
-/* ---------- DNS options ---------- */
-#define LWIP_DNS              1
-
 
 /* ---------- UDP options ---------- */
 #define LWIP_UDP                1
@@ -138,12 +124,17 @@ a lot of data that needs to be copied, this should be set high. */
 
 /* ---------- Statistics options ---------- */
 #define LWIP_STATS 0
+#define LWIP_PROVIDE_ERRNO
 
 /* ---------- link callback options ---------- */
 /* LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
  * whenever the link changes (i.e., link down)
  */
+// need for building net_ip.c
+#define LWIP_NETIF_HOSTNAME 1
+#define LWIP_NETIF_STATUS_CALLBACK  1
 #define LWIP_NETIF_LINK_CALLBACK        1
+#define LWIP_DHCP_CHECK_LINK_UP         1
 
 /*
    --------------------------------------
@@ -211,6 +202,7 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
  * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
  */
 #define LWIP_SOCKET                     0
+#define LWIP_DNS                        1
 
 /*
    ------------------------------------