|
@@ -56,7 +56,7 @@ static int nIslog = 0;
|
|
|
|
|
|
struct evt_filter_key_t
|
|
|
{
|
|
|
- unsigned __int64 listen_id; // id
|
|
|
+ unsigned long long listen_id; // id
|
|
|
};
|
|
|
|
|
|
struct evt_filter_t
|
|
@@ -1497,12 +1497,18 @@ static int load_slot(evt_engine_t *engine, const char *ns, scew_element *slot_el
|
|
|
slot->arr_ref_trigger = array_make(-1, sizeof(evt_trigger_t*));
|
|
|
slot->arr_slotvar = array_make(-1, sizeof(evt_slotvar_t*));
|
|
|
slot->parent = engine;
|
|
|
+
|
|
|
+ char* code = NULL;
|
|
|
+ scew_list* slotval_list = NULL;
|
|
|
+ scew_list* filter_list = NULL;
|
|
|
+ scew_list* reset_list = NULL;
|
|
|
+
|
|
|
scew_attribute *attr = scew_element_attribute_by_name(slot_elem, "Code");
|
|
|
if (!attr) {
|
|
|
if (nIslog){Dbg("slot miss attribute code!");}
|
|
|
goto on_error;
|
|
|
} else {
|
|
|
- char *code = parse_code(ns, scew_attribute_value(attr));
|
|
|
+ code = parse_code(ns, scew_attribute_value(attr));
|
|
|
if (!code) {
|
|
|
if (nIslog){Dbg("parse code failed!");}
|
|
|
goto on_error;
|
|
@@ -1535,7 +1541,7 @@ static int load_slot(evt_engine_t *engine, const char *ns, scew_element *slot_el
|
|
|
} else {
|
|
|
slot->once = 0;
|
|
|
}
|
|
|
- scew_list *slotval_list = scew_element_list_by_name(slot_elem, "Var");
|
|
|
+ slotval_list = scew_element_list_by_name(slot_elem, "Var");
|
|
|
if (slotval_list) {
|
|
|
for (scew_list *it = scew_list_first(slotval_list); it; it = scew_list_next(it)) {
|
|
|
scew_element *elem = (scew_element *)scew_list_data(it);
|
|
@@ -1547,7 +1553,7 @@ static int load_slot(evt_engine_t *engine, const char *ns, scew_element *slot_el
|
|
|
}
|
|
|
scew_list_free(slotval_list);
|
|
|
}
|
|
|
- scew_list *filter_list = scew_element_list_by_name(slot_elem, "Filter");
|
|
|
+ filter_list = scew_element_list_by_name(slot_elem, "Filter");
|
|
|
if (filter_list) {
|
|
|
for (scew_list *it = scew_list_first(filter_list); it; it = scew_list_next(it)) {
|
|
|
scew_element *elem = (scew_element *)scew_list_data(it);
|
|
@@ -1559,7 +1565,7 @@ static int load_slot(evt_engine_t *engine, const char *ns, scew_element *slot_el
|
|
|
}
|
|
|
scew_list_free(filter_list);
|
|
|
}
|
|
|
- scew_list *reset_list = scew_element_list_by_name(slot_elem, "Reset");
|
|
|
+ reset_list = scew_element_list_by_name(slot_elem, "Reset");
|
|
|
if (reset_list) {
|
|
|
for (scew_list *it = scew_list_first(reset_list); it; it = scew_list_next(it)) {
|
|
|
scew_element *elem = (scew_element *)scew_list_data(it);
|
|
@@ -1631,6 +1637,8 @@ on_error:
|
|
|
static int load_sysvar_rule(evt_engine_t *engine, evt_trigger_t *trigger, scew_element *sysvar_elem)
|
|
|
{
|
|
|
evt_sysvar_rule_t *rule = ZALLOC_T(evt_sysvar_rule_t);
|
|
|
+ scew_list* state_list = NULL;
|
|
|
+
|
|
|
scew_attribute *attr = scew_element_attribute_by_name(sysvar_elem, "Code");
|
|
|
if (attr) {
|
|
|
char *code = (char*)scew_attribute_value(attr);
|
|
@@ -1661,7 +1669,7 @@ static int load_sysvar_rule(evt_engine_t *engine, evt_trigger_t *trigger, scew_e
|
|
|
}
|
|
|
rule->parent = trigger;
|
|
|
rule->arr_state = array_make(0, sizeof(char*));
|
|
|
- scew_list* state_list = scew_element_children(sysvar_elem);
|
|
|
+ state_list = scew_element_children(sysvar_elem);
|
|
|
if (state_list) {
|
|
|
for (scew_list *it = scew_list_first(state_list); it; it = scew_list_next(it)) {
|
|
|
scew_element *state_elem = (scew_element *)scew_list_data(it);
|
|
@@ -1804,6 +1812,9 @@ static int load_file(evt_engine_t *engine, const char *filename)
|
|
|
char tmp_ns[MAX_PATH];
|
|
|
int rc = Error_Param;
|
|
|
|
|
|
+ scew_attribute* attr = NULL;
|
|
|
+ scew_element* elem = NULL;
|
|
|
+
|
|
|
reader = scew_reader_file_create(filename);
|
|
|
if (!reader) {
|
|
|
if (nIslog){Dbg("open file %s failed!", filename);}
|
|
@@ -1821,7 +1832,7 @@ static int load_file(evt_engine_t *engine, const char *filename)
|
|
|
goto on_error;
|
|
|
}
|
|
|
|
|
|
- scew_attribute *attr = scew_element_attribute_by_name(root, "xmlns");
|
|
|
+ attr = scew_element_attribute_by_name(root, "xmlns");
|
|
|
if (attr) {
|
|
|
ns = (const char*)scew_attribute_value(attr);
|
|
|
} else {
|
|
@@ -1832,7 +1843,7 @@ static int load_file(evt_engine_t *engine, const char *filename)
|
|
|
ns = tmp_ns;
|
|
|
}
|
|
|
|
|
|
- scew_element *elem = scew_element_by_name(root, "SlotList");
|
|
|
+ elem = scew_element_by_name(root, "SlotList");
|
|
|
if (elem) {
|
|
|
scew_list *slot_list = scew_element_children(elem);
|
|
|
if (slot_list) {
|
|
@@ -1957,7 +1968,7 @@ int evt_engine_unload(evt_engine_t *engine)
|
|
|
|
|
|
int evt_engine_process_log(evt_engine_t *engine,
|
|
|
const CAutoArray<CUUID> &SubIDs,
|
|
|
- unsigned __int64 nLogID,
|
|
|
+ unsigned long long nLogID,
|
|
|
LogTypeEnum eLogType,
|
|
|
SeverityLevelEnum eLevel,
|
|
|
DWORD dwSysError,
|