Przeglądaj źródła

Поиск багов с вебом

TelenkovDmitry 7 lat temu
rodzic
commit
4ab37bf732

+ 1 - 1
config/common_config.h

@@ -81,7 +81,7 @@
 /**
   * @brief  Отладочный порт USART и консоль
   */
-//#define USART_DEBUG_ENABLE
+#define USART_DEBUG_ENABLE
 
 #define SYSTEMTICK_PERIOD_MS  1
 

+ 2 - 2
modules/Ethernet/lwipopts.h

@@ -231,8 +231,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_OFF
-#define MEMP_DEBUG                      LWIP_DBG_OFF
+#define SOCKETS_DEBUG                   LWIP_DBG_ON
+#define MEMP_DEBUG                      LWIP_DBG_ON
 #define PING_DEBUG                      LWIP_DBG_OFF
 #define SNMP_MSG_DEBUG                  LWIP_DBG_OFF
 #define SNMP_MIB_DEBUG                  LWIP_DBG_OFF

+ 8 - 7
modules/HTTP_Server/http_server.c

@@ -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,8 +1778,9 @@ 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);
-            goto exit;
+            printf(" failed\n  ! net_accept returned %d\n\n", ret);
+            //goto exit;
+            goto accept;
         }
         //printf(" ok\n");
 
@@ -1790,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");

+ 6 - 4
user/init_task.c

@@ -139,23 +139,25 @@ void InitTask(void *params)
   LwIP_Init();
   
 #ifdef WEB_SERVER_ENABLE
+/*  
   if(strncmp(sSettings.sFlags.testState, "T2OK", 4)){
 
 	  HTTP_Init();
   	  xTaskCreate(vTaskTesting, "Testing", 2*configMINIMAL_STACK_SIZE,
                 NULL, tskIDLE_PRIORITY, NULL);
     }
-  else{
+*/  
+//  else{
 	   HTTPS_Init();
 #define SSL_TASK_PRIO   ( configMAX_PRIORITIES - 3 )
 	   xTaskCreate(ssl_server, "SSL", 10*configMINIMAL_STACK_SIZE, NULL, SSL_TASK_PRIO, NULL);
 #endif
 	   // UDP for net settings 
 	  	  UDP_netsetting_init();
-  }
+//  }
 
 
-  
+/*  
 #ifdef SNMP_ENABLE
 
   SNMP_Init();
@@ -167,7 +169,7 @@ void InitTask(void *params)
               NULL, tskIDLE_PRIORITY, NULL);
    
 #endif	
-    
+*/    
 #endif  
 // -----------------------------------------------------------------------------      
 	 /* SNTP */