Ver Fonte

add define CLI_ENABLE

balbekova há 5 anos atrás
pai
commit
71ee6b4520

+ 2 - 1
.vscode/settings.json

@@ -30,6 +30,7 @@
         "my_ssl_server.h": "c",
         "my_ssl_server.h": "c",
         "http_server.h": "c",
         "http_server.h": "c",
         "arch.h": "c",
         "arch.h": "c",
-        "urlcode.h": "c"
+        "urlcode.h": "c",
+        "sntp_api.h": "c"
     }
     }
 }
 }

+ 2 - 2
modules/HTTP_Server/web_params_api.c

@@ -482,14 +482,14 @@ void vTaskReboot(void *pvParameters)
         if (mode) {
         if (mode) {
             SNMP_SendUserTrap(FW_VERSION_UPDATE);
             SNMP_SendUserTrap(FW_VERSION_UPDATE);
             source_act_t src_act = get_act_source();
             source_act_t src_act = get_act_source();
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+#ifdef CLI_ENABLE
             if (src_act == CLI_ACT) {
             if (src_act == CLI_ACT) {
                 log_event_data(LOG_UPDATE_SOFT, "Администратор");
                 log_event_data(LOG_UPDATE_SOFT, "Администратор");
             } else
             } else
 #endif
 #endif
                 log_event_data(LOG_UPDATE_SOFT, name_login);
                 log_event_data(LOG_UPDATE_SOFT, name_login);
             SetLoadMode();
             SetLoadMode();
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+#ifdef CLI_ENABLE
             if (src_act == CLI_ACT) {
             if (src_act == CLI_ACT) {
                 SETTINGS_Save();
                 SETTINGS_Save();
                 log_event_data(LOG_SETTING_SAVE, "Администратор");
                 log_event_data(LOG_SETTING_SAVE, "Администратор");

+ 4 - 0
modules/cli/cli.h

@@ -8,6 +8,10 @@
 #include "settings_api.h"
 #include "settings_api.h"
 #include "log.h"
 #include "log.h"
 
 
+#if defined TELNET_ENABLE || defined SSH_ENABLE
+#define CLI_ENABLE
+#endif
+
 /* Dimensions the buffer into which input characters are placed. */
 /* Dimensions the buffer into which input characters are placed. */
 #define cmdMAX_INPUT_SIZE			144
 #define cmdMAX_INPUT_SIZE			144
 #define MAX_SESSIONS	5
 #define MAX_SESSIONS	5

+ 1 - 1
modules/common/hal.c

@@ -28,7 +28,7 @@ void Reboot(source_act_t source_reset)
             break;
             break;
         case SNMP_ACT:
         case SNMP_ACT:
         case OTHER_ACT:
         case OTHER_ACT:
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+#ifdef CLI_ENABLE
         case CLI_ACT:
         case CLI_ACT:
 #endif
 #endif
             log_event_data(LOG_SYSTEM_BOOT, "Администратор");
             log_event_data(LOG_SYSTEM_BOOT, "Администратор");

+ 1 - 1
modules/monitor/ups_monitor.c

@@ -358,7 +358,7 @@ void UPS_TestFinishMonitor(void)
         case OTHER_ACT:
         case OTHER_ACT:
             strcpy(log_string, "Администратор");
             strcpy(log_string, "Администратор");
             break;
             break;
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
+#ifdef CLI_ENABLE
         case CLI_ACT:
         case CLI_ACT:
             strcpy(log_string, "Администратор");
             strcpy(log_string, "Администратор");
             break;
             break;

+ 1 - 1
modules/parameters.c

@@ -19,7 +19,7 @@
 #include "snmp_api.h"
 #include "snmp_api.h"
 #include "snmp.h"
 #include "snmp.h"
 #include "megatec.h"
 #include "megatec.h"
-#ifdef HARDWARE_BT6709
+#ifdef SSH_ENABLE
 #include "server.h"
 #include "server.h"
 #endif
 #endif
 #endif
 #endif

+ 6 - 2
user/init_task.c

@@ -24,8 +24,10 @@
 #include "netconf.h"
 #include "netconf.h"
 #include "udp_netsetting.h"
 #include "udp_netsetting.h"
 #include "snmp_api.h"
 #include "snmp_api.h"
-#ifdef TELNET_ENABLE
+#ifdef CLI_ENABLE
 #include "cli.h"
 #include "cli.h"
+#endif
+#ifdef TELNET_ENABLE
 #include "telnet_server.h"
 #include "telnet_server.h"
 #endif
 #endif
 #ifdef SSH_ENABLE
 #ifdef SSH_ENABLE
@@ -161,8 +163,10 @@ void InitTask(void *params)
 	   else{
 	   else{
 		   UDP_netsetting_init();
 		   UDP_netsetting_init();
 	   }
 	   }
+#ifdef CLI_ENABLE
+    cli_init();
+#endif
 #if defined TELNET_ENABLE
 #if defined TELNET_ENABLE
-	   cli_init();
 	   telnet_server_init();
 	   telnet_server_init();
 #ifdef SSH_ENABLE
 #ifdef SSH_ENABLE
 	   ssh_server_init();
 	   ssh_server_init();