Увеличили число NETCONN c 4 до 8 (lwip/opt.h)

modules/Ethernet/lwipopts.h

@@ -144,8 +144,9 @@ a lot of data that needs to be copied, this should be set high. */
 #define LWIP_SO_RCVTIMEO        1 // Эта опция необходима для netconn_set_recvtimeout в модуле udp_netsetting.c
 
 /* ---------- Statistics options ---------- */
-#define LWIP_STATS 0
-#define LWIP_PROVIDE_ERRNO 1
+#define LWIP_STATS                      0
+#define LWIP_STATS_DISPLAY              0
+#define LWIP_PROVIDE_ERRNO              1
 
 #define LWIP_NETIF_LINK_CALLBACK        0
 
@@ -231,8 +232,8 @@ The STM32F4x7 allows computing and verifying the IP, UDP, TCP and ICMP checksums
 #define TCPIP_DEBUG                     LWIP_DBG_OFF
 #define DHCP_DEBUG                      LWIP_DBG_OFF
 #define UDP_DEBUG                       LWIP_DBG_OFF
-#define SOCKETS_DEBUG                   LWIP_DBG_ON
-#define MEMP_DEBUG                      LWIP_DBG_ON
+#define SOCKETS_DEBUG                   LWIP_DBG_OFF
+#define MEMP_DEBUG                      LWIP_DBG_OFF
 #define PING_DEBUG                      LWIP_DBG_OFF
 #define SNMP_MSG_DEBUG                  LWIP_DBG_OFF
 #define SNMP_MIB_DEBUG                  LWIP_DBG_OFF

modules/HTTP_Server/http_server.c

@@ -19,7 +19,7 @@
 #include "log.h"
 #include "hal.h"
 #include "radius_user.h"
-#include "sntp_api.h"
+#include "sntp.h"
 
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
@@ -1742,20 +1742,20 @@ void ssl_server(void *pvParameters)
     ret = x509parse_crt(&srvcert, (unsigned char *) test_srv_crt, strlen(test_srv_crt));
     if(ret != 0)
     {
-        printf(" failed\n  !  x509parse_crt returned %d\n\r", ret);
+        //printf(" failed\n  !  x509parse_crt returned %d\n\r", ret);
         goto exit;
     }
     ret = x509parse_crt(&srvcert, (unsigned char *) test_ca_crt, strlen(test_ca_crt));
     if(ret != 0)
     {
-        printf(" failed\n  !  x509parse_crt returned %d\n\r", ret);
+        //printf(" failed\n  !  x509parse_crt returned %d\n\r", ret);
         goto exit;
     }
     rsa_init( &rsa, RSA_PKCS_V15, 0 );
     ret =  x509parse_key(&rsa, (unsigned char *) test_srv_key, strlen(test_srv_key), NULL, 0);
     if( ret != 0 )
     {
-        printf(" failed\n  !  x509parse_key returned %d\n\r", ret);
+        //printf(" failed\n  !  x509parse_key returned %d\n\r", ret);
         goto exit;
     }
     
@@ -1766,7 +1766,7 @@ void ssl_server(void *pvParameters)
     ret = net_bind(&listen_fd, NULL, 443); 
     if(ret != 0)
     {
-        printf(" failed\n  ! net_bind returned %d\n\r", ret);
+        //printf(" failed\n  ! net_bind returned %d\n\r", ret);
         goto exit;
     }
     //printf(" ok\n\r");
@@ -1778,7 +1778,7 @@ void ssl_server(void *pvParameters)
         ret = net_accept(listen_fd, &client_fd, NULL);
         if(ret != 0)
         {
-            printf(" failed\n  ! net_accept returned %d\n\n", ret);
+            //printf(" failed\n  ! net_accept returned %d\n\n", ret);
             //goto exit;
             goto accept;
         }
@@ -1791,7 +1791,7 @@ void ssl_server(void *pvParameters)
         ret = ssl_init(&ssl);
         if(ret != 0)
         {
-            printf(" failed\n  ! ssl_init returned %d\n\n", ret);
+            //printf(" failed\n  ! ssl_init returned %d\n\n", ret);
             goto accept;
         }
         //printf(" ok\n");
@@ -1838,6 +1838,8 @@ void ssl_server(void *pvParameters)
         //printf("\n\r <= Read from client :");
         if(ssl_server_read() <= 0)
         	goto accept;
+        
+        //ssl_server_read();
     // -------------------------------------------------------------------------
         
         //receivedBufLen = p->tot_len;
@@ -2472,7 +2474,7 @@ exit:
 
 accept:
     // Wait 200s until next retry 
-    vTaskDelay(200); 
+    //vTaskDelay(200); 
 
     // Close and free the SSL context 
     net_close(client_fd);

thirdparty/lwip/src/include/lwip/arch.h

@@ -76,7 +76,7 @@
  * systems, this should be defined to something less resource-consuming.
  */
 #ifndef LWIP_PLATFORM_DIAG
-#define LWIP_PLATFORM_DIAG(x) do {printf x; printf("\r\n");} while(0)
+#define LWIP_PLATFORM_DIAG(x) do {printf x; printf("\r");} while(0)
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
 #endif

thirdparty/lwip/src/include/lwip/opt.h

@@ -451,7 +451,7 @@
  * (only needed if you use the sequential API, like api_lib.c)
  */
 #if !defined MEMP_NUM_NETCONN || defined __DOXYGEN__
-#define MEMP_NUM_NETCONN                4
+#define MEMP_NUM_NETCONN                8
 #endif
 
 /**

user/init_task.c

@@ -34,7 +34,7 @@
 #include "ups_monitor.h"
 //#include "ups_params.h"
 //#include "ups_monitor.h"
-//#include <lwip/stats.h>
+#include "lwip/stats.h"
 #include "radius_user.h"
 
 #ifdef PRINTF_STDLIB
@@ -153,11 +153,10 @@ void InitTask(void *params)
 	   xTaskCreate(ssl_server, "SSL", 10*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
 #endif
 	   // UDP for net settings 
-	  	  UDP_netsetting_init();
+	   UDP_netsetting_init();
 //  }
 
 
-/*  
 #ifdef SNMP_ENABLE
 
   SNMP_Init();
@@ -169,7 +168,7 @@ void InitTask(void *params)
               NULL, tskIDLE_PRIORITY, NULL);
    
 #endif	
-*/    
+ 
 #endif  
 // -----------------------------------------------------------------------------      
 	 /* SNTP */
@@ -218,12 +217,12 @@ void InitTask(void *params)
 
 static void vTaskDebug(void *pvParameters) 
 {
-  char msg[700];
+  //char msg[700];
   for(;;)
   {
-	vTaskList(msg);
-	DBG printf(msg);
-	DBG printf("\n\r\r\n");
+	//vTaskList(msg);
+	//DBG printf(msg);
+	//DBG printf("\n\r\r\n");
 #if LWIP_STATS
 	stats_display();
 	DBG printf("\r\n\r\n");