|
@@ -59,6 +59,8 @@ extern TRAP_t traps[];
|
|
*/
|
|
*/
|
|
extern SETTINGS_t sSettings;
|
|
extern SETTINGS_t sSettings;
|
|
|
|
|
|
|
|
+extern bool isIpReceived;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @brief Очередь для отправки трапов
|
|
* @brief Очередь для отправки трапов
|
|
*/
|
|
*/
|
|
@@ -104,25 +106,27 @@ void snmp_trap_tread(void *arg)
|
|
uint8_t trapName;
|
|
uint8_t trapName;
|
|
|
|
|
|
while (1) {
|
|
while (1) {
|
|
- if (xQueueReceive(SNMP_TrapQueue, &trapName, 0) == pdTRUE) {
|
|
|
|
|
|
+ if (isIpReceived) {
|
|
|
|
+ if (xQueueReceive(SNMP_TrapQueue, &trapName, 0) == pdTRUE) {
|
|
#ifdef HARDWARE_BT6709
|
|
#ifdef HARDWARE_BT6709
|
|
- if(sSettings.sFlagNotification[trapName])
|
|
|
|
|
|
+ if (sSettings.sFlagNotification[trapName])
|
|
#endif
|
|
#endif
|
|
- {
|
|
|
|
- SNMP_SetManagerIP(sSettings.sSnmp.managerIP);
|
|
|
|
- SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
+ {
|
|
|
|
+ SNMP_SetManagerIP(sSettings.sSnmp.managerIP);
|
|
|
|
+ SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
- SNMP_SetManagerIP(sSettings.sSnmp.managerIP2);
|
|
|
|
- SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
+ SNMP_SetManagerIP(sSettings.sSnmp.managerIP2);
|
|
|
|
+ SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
- SNMP_SetManagerIP(sSettings.sSnmp.managerIP3);
|
|
|
|
- SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
+ SNMP_SetManagerIP(sSettings.sSnmp.managerIP3);
|
|
|
|
+ SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
- SNMP_SetManagerIP(sSettings.sSnmp.managerIP4);
|
|
|
|
- SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
+ SNMP_SetManagerIP(sSettings.sSnmp.managerIP4);
|
|
|
|
+ SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
- SNMP_SetManagerIP(sSettings.sSnmp.managerIP5);
|
|
|
|
- SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
|
|
+ SNMP_SetManagerIP(sSettings.sSnmp.managerIP5);
|
|
|
|
+ SNMP_SendVarbindTrap(&traps[trapName]);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
vTaskDelay(10);
|
|
vTaskDelay(10);
|