Update Win32 lwipopts.h for better efficiency.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1607 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/WIN32-MSVC-lwIP/WIN32.suo b/Demo/WIN32-MSVC-lwIP/WIN32.suo
index 6245a44362d6b6907ea3cb279edb5eace3d5a53c..927b60a6315bd6dfbd133a3d02aa43fc40abbeeb 100644 (file)
Binary files a/Demo/WIN32-MSVC-lwIP/WIN32.suo and b/Demo/WIN32-MSVC-lwIP/WIN32.suo differ

diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/httpd.c b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/httpd.c
index 89676df88533e443f9c78f70080714855551c6ac..6f1132caf520705fe39a55cdd7f29dce1a88fa93 100644 (file)
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/httpd.c
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/httpd.c
@@ -2092,7 +2092,6 @@ http_accept(void *arg, struct tcp_pcb *pcb, err_t err)
 
   /* Tell TCP that this is the structure we wish to be passed for our
      callbacks. */
-  tcp_nagle_disable(pcb);//_RB_
   tcp_arg(pcb, hs);
 
   /* Set up the various callback functions */

diff --git a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
index 94720d4cb7057b5f0feb8bb2f62cd14f86e87f00..fb6adccfb0494bfb77cc258cb7db9d3cc6fb2543 100644 (file)
--- a/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
+++ b/Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
@@ -68,23 +68,23 @@ void vLwipAppsReleaseTxBuffer( void );
 #ifdef LWIP_DEBUG
 
 #define LWIP_DBG_MIN_LEVEL         0
-#define PPP_DEBUG                  LWIP_DBG_OFF
-#define MEM_DEBUG                  LWIP_DBG_OFF
-#define MEMP_DEBUG                 LWIP_DBG_OFF
-#define PBUF_DEBUG                 LWIP_DBG_OFF
+#define PPP_DEBUG                  LWIP_DBG_ON
+#define MEM_DEBUG                  LWIP_DBG_ON
+#define MEMP_DEBUG                 LWIP_DBG_ON
+#define PBUF_DEBUG                 LWIP_DBG_ON
 #define API_LIB_DEBUG              LWIP_DBG_ON
 #define API_MSG_DEBUG              LWIP_DBG_ON
 #define TCPIP_DEBUG                LWIP_DBG_ON
 #define NETIF_DEBUG                LWIP_DBG_ON
-#define SOCKETS_DEBUG              LWIP_DBG_OFF
-#define DNS_DEBUG                  LWIP_DBG_OFF
-#define AUTOIP_DEBUG               LWIP_DBG_OFF
-#define DHCP_DEBUG                 LWIP_DBG_OFF
-#define IP_DEBUG                   LWIP_DBG_O
+#define SOCKETS_DEBUG              LWIP_DBG_ON
+#define DNS_DEBUG                  LWIP_DBG_ON
+#define AUTOIP_DEBUG               LWIP_DBG_ON
+#define DHCP_DEBUG                 LWIP_DBG_ON
+#define IP_DEBUG                   LWIP_DBG_ON
 #define IP_REASS_DEBUG             LWIP_DBG_ON
-#define ICMP_DEBUG                 LWIP_DBG_OFF
-#define IGMP_DEBUG                 LWIP_DBG_OFF
-#define UDP_DEBUG                  LWIP_DBG_OFF
+#define ICMP_DEBUG                 LWIP_DBG_ON
+#define IGMP_DEBUG                 LWIP_DBG_ON
+#define UDP_DEBUG                  LWIP_DBG_ON
 #define TCP_DEBUG                  LWIP_DBG_ON
 #define TCP_INPUT_DEBUG            LWIP_DBG_ON
 #define TCP_OUTPUT_DEBUG           LWIP_DBG_ON
@@ -189,7 +189,7 @@ a lot of data that needs to be copied, this should be set high. */
 #define TCP_MSS                                        1460
 
 /* TCP sender buffer space (bytes). */
-#define TCP_SND_BUF                            2048
+#define TCP_SND_BUF                            ( TCP_MSS * 2 )
 
 /* TCP sender buffer space (pbufs). This must be at least = 2 *
    TCP_SND_BUF/TCP_MSS for things to work. */
@@ -201,7 +201,7 @@ a lot of data that needs to be copied, this should be set high. */
 #define TCP_SNDLOWAT                   (TCP_SND_BUF/2)
 
 /* TCP receive window. */
-#define TCP_WND                                        4048
+#define TCP_WND                                        ( PBUF_POOL_SIZE * PBUF_POOL_BUFSIZE )
 
 /* Maximum number of retransmissions of data segments. */
 #define TCP_MAXRTX                             12