Browse Source

[BT-6711]correct check range

balbekova 3 years ago
parent
commit
ddb701ef84
2 changed files with 7 additions and 7 deletions
  1. 4 4
      modules/Ethernet/private_mib_bt6711.c
  2. 3 3
      modules/cli/CLI_Commands.c

+ 4 - 4
modules/Ethernet/private_mib_bt6711.c

@@ -867,7 +867,7 @@ static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len
                 }
                 }
             }
             }
             tmp_value = atof(val_string);
             tmp_value = atof(val_string);
-            if (tmp_value < sSettings.UPS_Setting.Ucellmax && tmp_value > MIN_VOLT_CELL_RANGE) {
+            if (tmp_value < sSettings.UPS_Setting.Ucellmax && tmp_value >= MIN_VOLT_CELL_RANGE) {
                 ret = SNMP_ERR_NOERROR;
                 ret = SNMP_ERR_NOERROR;
             }
             }
             break;
             break;
@@ -893,7 +893,7 @@ static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len
                 }
                 }
             }
             }
             tmp_value = atof(val_string);
             tmp_value = atof(val_string);
-            if (tmp_value > AKB_VOLTAGE_MIN_RANGE && tmp_value <= AKB_VOLTAGE_MAX_RANGE) {
+            if (tmp_value >= AKB_VOLTAGE_MIN_RANGE && tmp_value <= AKB_VOLTAGE_MAX_RANGE) {
                 ret = SNMP_ERR_NOERROR;
                 ret = SNMP_ERR_NOERROR;
             }
             }
             break;
             break;
@@ -906,7 +906,7 @@ static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len
                 }
                 }
             }
             }
             val = atoi(val_string);
             val = atoi(val_string);
-            if (val > CAPACITY_MIN_RANGE && val <= CAPACITY_MAX_RANGE) {
+            if (val >= CAPACITY_MIN_RANGE && val <= CAPACITY_MAX_RANGE) {
                 ret = SNMP_ERR_NOERROR;
                 ret = SNMP_ERR_NOERROR;
             }
             }
             break;
             break;
@@ -919,7 +919,7 @@ static snmp_err_t signal_set_test(struct snmp_node_instance *instance, u16_t len
                 }
                 }
             }
             }
             tmp_value = atof(val_string);
             tmp_value = atof(val_string);
-            if (tmp_value > UPS_POWER_MIN_RANGE && tmp_value <= UPS_POWER_MAX_RANGE) {
+            if (tmp_value >= UPS_POWER_MIN_RANGE && tmp_value <= UPS_POWER_MAX_RANGE) {
                 ret = SNMP_ERR_NOERROR;
                 ret = SNMP_ERR_NOERROR;
             }
             }
             break;
             break;

+ 3 - 3
modules/cli/CLI_Commands.c

@@ -1511,7 +1511,7 @@ static portBASE_TYPE prvTaskAKBCommand(cli_state_t *cli_state, int8_t *pcWriteBu
 
 
     switch (i) {
     switch (i) {
         case ARG_AKB_VOLT_CELL_MIN:
         case ARG_AKB_VOLT_CELL_MIN:
-            if (value < sSettings.UPS_Setting.Ucellmax && value > MIN_VOLT_CELL_RANGE) {
+            if (value < sSettings.UPS_Setting.Ucellmax && value >= MIN_VOLT_CELL_RANGE) {
                 SetUPSVoltCellMinStr(str);
                 SetUPSVoltCellMinStr(str);
                 cli_save_config(cli_state);
                 cli_save_config(cli_state);
             } else {
             } else {
@@ -2857,7 +2857,7 @@ static portBASE_TYPE prvTaskUPSCommand(cli_state_t *cli_state, int8_t *pcWriteBu
 
 
     memset(pcWriteBuffer, 0, configCOMMAND_INT_MAX_OUTPUT_SIZE);
     memset(pcWriteBuffer, 0, configCOMMAND_INT_MAX_OUTPUT_SIZE);
 
 
-    if (cli_state->user_id != ADMIN && i != ARG_CONFIG_INFO) {
+    if (cli_state->user_id != ADMIN) {
         strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcPermissionDenied, strlen( ( char * ) pcPermissionDenied ) );
         strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcPermissionDenied, strlen( ( char * ) pcPermissionDenied ) );
         return pdFALSE;
         return pdFALSE;
     }
     }
@@ -3121,7 +3121,7 @@ static portBASE_TYPE prvTaskFTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
 
 
     memset(pcWriteBuffer, 0, configCOMMAND_INT_MAX_OUTPUT_SIZE);
     memset(pcWriteBuffer, 0, configCOMMAND_INT_MAX_OUTPUT_SIZE);
 
 
-    if (cli_state->user_id != ADMIN) {
+    if (cli_state->user_id != ADMIN && i != ARG_FTP_info) {
         strncpy((char *)pcWriteBuffer, (const char *)pcPermissionDenied, strlen((char *)pcPermissionDenied));
         strncpy((char *)pcWriteBuffer, (const char *)pcPermissionDenied, strlen((char *)pcPermissionDenied));
         return pdFALSE;
         return pdFALSE;
     }
     }