Skip to content

Commit 604667d

Browse files
authored
Merge pull request #61 from wazuh/feat/50-logcollector-raw-eventchannel
Add raw Windows events support
2 parents 03c68e7 + 8be4c6f commit 604667d

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/modules/logcollector/src/read_win_event_channel.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ void send_channel_event(EVT_HANDLE evt, os_channel *channel)
398398
DWORD count = 0;
399399
int result = 0;
400400
wchar_t *wprovider_name = NULL;
401-
char *msg_sent = NULL;
402401
char *provider_name = NULL;
403402
char *msg_from_prov = NULL;
404403
char *xml_event = NULL;
@@ -407,8 +406,6 @@ void send_channel_event(EVT_HANDLE evt, os_channel *channel)
407406
char *find_prov = NULL;
408407
size_t num;
409408

410-
cJSON *event_json = cJSON_CreateObject();
411-
412409
os_malloc(OS_MAXSTR, provider_name);
413410

414411
result = EvtRender(NULL,
@@ -486,19 +483,13 @@ void send_channel_event(EVT_HANDLE evt, os_channel *channel)
486483
"Could not get message for (%s)",
487484
channel->evt_log);
488485
}
489-
else {
490-
cJSON_AddStringToObject(event_json, "Message", msg_from_prov);
491-
}
492486
}
493487

494488
win_format_event_string(xml_event);
495489

496-
cJSON_AddStringToObject(event_json, "Event", xml_event);
497-
msg_sent = cJSON_PrintUnformatted(event_json);
498-
499-
w_logcollector_state_update_file(channel->evt_log, strlen(msg_sent));
490+
w_logcollector_state_update_file(channel->evt_log, strlen(xml_event));
500491

501-
if (SendMSG(logr_queue, msg_sent, "EventChannel", WIN_EVT_MQ) < 0) {
492+
if (SendMSG(logr_queue, xml_event, "EventChannel", WIN_EVT_MQ) < 0) {
502493
merror(QUEUE_SEND);
503494
w_logcollector_state_update_target(channel->evt_log, "agent", true);
504495
} else {
@@ -512,11 +503,9 @@ void send_channel_event(EVT_HANDLE evt, os_channel *channel)
512503
cleanup:
513504
os_free(msg_from_prov);
514505
os_free(xml_event);
515-
os_free(msg_sent);
516506
os_free(properties_values);
517507
os_free(provider_name);
518508
os_free(wprovider_name);
519-
cJSON_Delete(event_json);
520509

521510
return;
522511
}

0 commit comments

Comments
 (0)