[WIRE136] Network redesign

extras/net/lwipopts.h

@@ -95,7 +95,7 @@
  * ATTENTION: This is required when using lwIP from more than one context! If
  * you disable this, you must be sure what you are doing!
  */
-#if !defined SYS_LIGHTWEIGHT_PROT
+#ifndef SYS_LIGHTWEIGHT_PROT
 #define SYS_LIGHTWEIGHT_PROT            0
 #endif
 
@@ -129,7 +129,7 @@
  *    2 byte alignment -> #define MEM_ALIGNMENT 2
  */
 #ifndef MEM_ALIGNMENT
-#define MEM_ALIGNMENT                   4
+#define MEM_ALIGNMENT                   32
 #endif
 
 /**
@@ -277,7 +277,7 @@
  * (requires the LWIP_RAW option)
  */
 #ifndef MEMP_NUM_RAW_PCB
-#define MEMP_NUM_RAW_PCB                0
+#define MEMP_NUM_RAW_PCB                4
 #endif
 
 /**
@@ -318,7 +318,7 @@
  * reassembly (whole packets, not fragments!)
  */
 #ifndef MEMP_NUM_REASSDATA
-#define MEMP_NUM_REASSDATA              0
+#define MEMP_NUM_REASSDATA              5
 #endif
 
 /**
@@ -329,7 +329,7 @@
  * where the packet is not yet sent when netif->output returns.
  */
 #ifndef MEMP_NUM_FRAG_PBUF
-#define MEMP_NUM_FRAG_PBUF              0
+#define MEMP_NUM_FRAG_PBUF              15
 #endif
 
 /**
@@ -353,11 +353,18 @@
 #endif
 
 /**
- * MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
- * (requires NO_SYS==0)
+ * The number of sys timeouts used by the core stack (not apps)
+ * The default number of timeouts is calculated here for all enabled modules.
+ */
+#define LWIP_NUM_SYS_TIMEOUT_INTERNAL   (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_ACD + LWIP_IGMP + LWIP_DNS + PPP_NUM_TIMEOUTS + (LWIP_IPV6 * (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD + LWIP_IPV6_DHCP6)))
+
+/**
+ * MEMP_NUM_SYS_TIMEOUT: the number of simultaneously active timeouts.
+ * The default number of timeouts is calculated here for all enabled modules.
+ * The formula expects settings to be either '0' or '1'.
  */
 #ifndef MEMP_NUM_SYS_TIMEOUT
-#define MEMP_NUM_SYS_TIMEOUT            6
+#define MEMP_NUM_SYS_TIMEOUT            LWIP_NUM_SYS_TIMEOUT_INTERNAL
 #endif
 
 /**
@@ -416,7 +423,11 @@
  * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
  */
 #ifndef PBUF_POOL_SIZE
-#define PBUF_POOL_SIZE                  4
+#define PBUF_POOL_SIZE                  16
+#endif
+
+#ifndef LWIP_SUPPORT_CUSTOM_PBUF
+#define LWIP_SUPPORT_CUSTOM_PBUF        1
 #endif
 
 /**
@@ -549,16 +560,27 @@
  * an upper limit on the MSS advertised by the remote host.
  */
 #ifndef TCP_MSS
-#define TCP_MSS                        536
+#define TCP_MSS                        1420
 #endif
 
+/**
+ * TCP_CALCULATE_EFF_SEND_MSS: "The maximum size of a segment that TCP really
+ * sends, the 'effective send MSS,' MUST be the smaller of the send MSS (which
+ * reflects the available reassembly buffer size at the remote host) and the
+ * largest size permitted by the IP layer" (RFC 1122)
+ * Setting this to 1 enables code that checks TCP_MSS against the MTU of the
+ * netif used for a connection and limits the MSS if it would be too big otherwise.
+ */
+#ifndef TCP_CALCULATE_EFF_SEND_MSS
+#define TCP_CALCULATE_EFF_SEND_MSS      1
+#endif
 
 /**
  * TCP_SND_BUF: TCP sender buffer space (bytes).
  * To achieve good performance, this should be at least 2 * TCP_MSS.
  */
 #ifndef TCP_SND_BUF
-#define TCP_SND_BUF                     1500
+#define TCP_SND_BUF                     (4 * TCP_MSS)
 #endif
 
 /**
@@ -596,7 +618,7 @@
  * Define to 0 if your device is low on memory.
  */
 #ifndef TCP_QUEUE_OOSEQ
-#define TCP_QUEUE_OOSEQ                 0
+#define TCP_QUEUE_OOSEQ                 (LWIP_TCP)
 #endif
 
 /**
@@ -738,13 +760,45 @@
 /**
  * LWIP_DEBUG==1: Enable Debug.
  */
+
+#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_ALL
+
 #define LWIP_DEBUG                      0
+
+#define ETHARP_DEBUG                    LWIP_DBG_OFF
 #define NETIF_DEBUG                     LWIP_DBG_OFF
-#define DHCP_DEBUG                      LWIP_DBG_OFF
-#define UDP_DEBUG                       LWIP_DBG_OFF
-#define MEMP_DEBUG                      LWIP_DBG_OFF
-#define MEM_DEBUG                       LWIP_DBG_OFF
+#define PBUF_DEBUG                      LWIP_DBG_OFF
+#define API_LIB_DEBUG                   LWIP_DBG_OFF
+#define API_MSG_DEBUG                   LWIP_DBG_OFF
+#define SOCKETS_DEBUG                   LWIP_DBG_OFF
 #define ICMP_DEBUG                      LWIP_DBG_OFF
+#define IGMP_DEBUG                      LWIP_DBG_OFF
+#define INET_DEBUG                      LWIP_DBG_OFF
+#define IP_DEBUG                        LWIP_DBG_OFF
+#define IP_REASS_DEBUG                  LWIP_DBG_OFF
+#define RAW_DEBUG                       LWIP_DBG_OFF
+#define MEM_DEBUG                       LWIP_DBG_OFF
+#define MEMP_DEBUG                      LWIP_DBG_OFF
+#define SYS_DEBUG                       LWIP_DBG_OFF
+#define TIMERS_DEBUG                    LWIP_DBG_OFF
+#define TCP_DEBUG                       LWIP_DBG_OFF
+#define TCP_INPUT_DEBUG                 LWIP_DBG_OFF
+#define TCP_FR_DEBUG                    LWIP_DBG_OFF
+#define TCP_RTO_DEBUG                   LWIP_DBG_OFF
+#define TCP_CWND_DEBUG                  LWIP_DBG_OFF
+#define TCP_WND_DEBUG                   LWIP_DBG_OFF
+#define TCP_OUTPUT_DEBUG                LWIP_DBG_OFF
+#define TCP_RST_DEBUG                   LWIP_DBG_OFF
+#define TCP_QLEN_DEBUG                  LWIP_DBG_OFF
+#define UDP_DEBUG                       LWIP_DBG_OFF
+#define TCPIP_DEBUG                     LWIP_DBG_OFF
+#define SLIP_DEBUG                      LWIP_DBG_OFF
+#define DHCP_DEBUG                      LWIP_DBG_OFF
+#define AUTOIP_DEBUG                    LWIP_DBG_OFF
+#define ACD_DEBUG                       LWIP_DBG_OFF
+#define DNS_DEBUG                       LWIP_DBG_OFF
+#define IP6_DEBUG                       LWIP_DBG_OFF
+#define DHCP6_DEBUG                     LWIP_DBG_OFF
 #endif
 
 //#define LWIP_USE_EXTERNAL_MBEDTLS       1

libraries/ESPhost/src/CEspCbks.h

@@ -32,13 +32,14 @@
 
 
 #include "CCtrlWrapper.h"
+#include <functional>
 
 #define RESPONSE_TABLE_DIM                  (CTRL_RESP_MAX - CTRL_RESP_BASE) 
 #define EVENT_TABLE_DIM                     (CTRL_EVENT_MAX - CTRL_EVENT_BASE) 
 #define TOTAL_TABLE_DIM                     RESPONSE_TABLE_DIM + EVENT_TABLE_DIM
 
 
-using EspCallback_f    = int (*)(CCtrlMsgWrapper *resp);
+using EspCallback_f    = std::function<int(CCtrlMsgWrapper *resp)>;
 
 
 

libraries/Ethernet/src/Ethernet.cpp

@@ -1,208 +1 @@
 #include <EthernetC33.h>
-
-/*
- * The old implementation of the begin set a default mac address:
- * this does not make any sense.
- * Default mac address is in the hardware, when lwip start that mac
- * address is passed to lwip
- * If mac address needs to be changed then call the appropriate function
- * of lwIpIf before to get the interface 
- */
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(unsigned long timeout, unsigned long responseTimeout) {
-/* -------------------------------------------------------------------------- */  
-  (void)responseTimeout;
-
-  int rv = 0;
-
-  ni = CLwipIf::getInstance().get(NI_ETHERNET);
-  if(ni != nullptr) {
-    ni->DhcpSetTimeout(timeout);
-    rv = (int)ni->DhcpStart();
-  }
-
-  return rv;
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip) {
-/* -------------------------------------------------------------------------- */
-  // Assume the DNS server will be the machine on the same network as the local IP
-  // but with last octet being '1'
-  IPAddress dns_server = local_ip;
-  dns_server[3] = 1;
-  return begin(local_ip, dns_server);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress dns_server) {
-/* -------------------------------------------------------------------------- */  
-  // Assume the gateway will be the machine on the same network as the local IP
-  // but with last octet being '1'
-  IPAddress gateway = local_ip;
-  gateway[3] = 1;
-  return begin(local_ip, dns_server, gateway);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway) {
-/* -------------------------------------------------------------------------- */  
-  IPAddress subnet(255, 255, 255, 0);
-  return begin(local_ip, dns_server, gateway, subnet);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet) {
-/* -------------------------------------------------------------------------- */  
-
-  ni = CLwipIf::getInstance().get(NI_ETHERNET,  local_ip, gateway, subnet);
-  if(ni == nullptr) {
-    return 0;
-  }
-
-  /* If there is a local DHCP informs it of our manual IP configuration to prevent IP conflict */
-  ni->DhcpNotUsed();
-  CLwipIf::getInstance().addDns(dns_server);
-  return 1;
-}
-
-/* -------------------------------------------------------------------------- */
-void CEthernet::setDNS(IPAddress dns_server) {
-/* -------------------------------------------------------------------------- */  
-  CLwipIf::getInstance().addDns(dns_server);
-} 
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(uint8_t *mac, unsigned long timeout, unsigned long responseTimeout) {
-/* -------------------------------------------------------------------------- */  
-  CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
-  return begin(timeout, responseTimeout);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(uint8_t *mac_address, IPAddress local_ip) {
-/* -------------------------------------------------------------------------- */
-  // Assume the DNS server will be the machine on the same network as the local IP
-  // but with last octet being '1'
-  IPAddress dns_server = local_ip;
-  dns_server[3] = 1;
-  return begin(mac_address, local_ip, dns_server);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server) {
-/* -------------------------------------------------------------------------- */  
-  // Assume the gateway will be the machine on the same network as the local IP
-  // but with last octet being '1'
-  IPAddress gateway = local_ip;
-  gateway[3] = 1;
-  return begin(mac_address, local_ip, dns_server, gateway);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway) {
-/* -------------------------------------------------------------------------- */  
-  IPAddress subnet(255, 255, 255, 0);
-  return begin(mac_address, local_ip, dns_server, gateway, subnet);
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet, unsigned long timeout, unsigned long responseTimeout) {
-/* -------------------------------------------------------------------------- */  
-  CLwipIf::getInstance().setMacAddress(NI_ETHERNET, mac);
-  return begin(local_ip, dns_server, gateway, subnet);
-}
-
-/* -------------------------------------------------------------------------- */
-EthernetLinkStatus CEthernet::linkStatus() {
-/* -------------------------------------------------------------------------- */  
-  if(ni != nullptr) {
-    return (!CLwipIf::getInstance().isEthInitialized()) ? Unknown : (ni->isLinkUp() ? LinkON : LinkOFF);
-  }
-  return Unknown;
-}
-
-/* -------------------------------------------------------------------------- */
-EthernetHardwareStatus CEthernet::hardwareStatus() {
-/* -------------------------------------------------------------------------- */
-  return EthernetLwip;
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::disconnect() {
-/* -------------------------------------------------------------------------- */
-  return 1;
-}
-
-/* -------------------------------------------------------------------------- */
-int CEthernet::maintain() {
-/* -------------------------------------------------------------------------- */  
-  int rc = DHCP_CHECK_NONE;
-
-  if (ni != NULL) {
-    //we have a pointer to dhcp, use it
-    rc = ni->checkLease();
-    switch (rc) {
-      case DHCP_CHECK_NONE:
-        //nothing done
-        break;
-      case DHCP_CHECK_RENEW_OK:
-      case DHCP_CHECK_REBIND_OK:
-	//_dnsServerAddress = _dhcp->getDnsServerIp();
-        break;
-      default:
-        //this is actually a error, it will retry though
-        break;
-    }
-  }
-  return rc;
-}
-
-/*
- * This function updates the LwIP stack and can be called to be sure to update
- * the stack (e.g. in case of a long loop).
- */
-void CEthernet::schedule(void) {
-  if (ni != NULL) {
-    ni->task();
-  }
-}
-
-
-
-uint8_t *CEthernet::MACAddress(void) {
-  CLwipIf::getInstance().getMacAddress(NI_ETHERNET, mac_address);
-  return mac_address;
-}
-
-void CEthernet::MACAddress(uint8_t *mac) {
-  CLwipIf::getInstance().getMacAddress(NI_ETHERNET, mac);
-}
-
-IPAddress CEthernet::localIP() {
-  if(ni != nullptr) {
-      return IPAddress(ni->getIpAdd());   
-   }
-   return IPAddress((uint32_t)0);
-}
-
-IPAddress CEthernet::subnetMask() {
-  if(ni != nullptr) {
-      return IPAddress(ni->getNmAdd());   
-   }
-   return IPAddress((uint32_t)0);
-}
-
-IPAddress CEthernet::gatewayIP() {
-  if(ni != nullptr) {
-      return IPAddress(ni->getGwAdd());   
-   }
-   return IPAddress((uint32_t)0);
-}
-
-IPAddress CEthernet::dnsServerIP() {
-  return CLwipIf::getInstance().getDns();
-}
-
-CEthernet Ethernet;