clean up logic

This commit is contained in:
dave 2018-08-06 13:45:22 -07:00
parent 58937beeed
commit fa8a9655bd
1 changed files with 70 additions and 70 deletions

View File

@ -163,7 +163,9 @@ int handle_message(char* msg, struct sockaddr_in* sender) {
/*parse syslog message into fields*/
if(sysmsg_parse(&result, msg) != 0) {
printf("Failed to parse message: %s", msg);
} else {
return 1;
}
/*printf("syslog message is valid:\n\tpriority: %d\n\tapplication: %s\n\tDate: %s %d %02d:%02d:%02d\n",
result.priority,
result.application,
@ -178,9 +180,9 @@ int handle_message(char* msg, struct sockaddr_in* sender) {
//memset(&fwdata, 0, sizeof(fwdata));
if(pfdata_parse(msg, &fwdata) != 0) {
printf("Failed to parse pfsense data: %s\n\n", msg);
} else {
return 1;
}
// pfdata_print(&fwdata);
cur_t = time(NULL);
cur_time = *localtime(&cur_t);
@ -223,7 +225,6 @@ int handle_message(char* msg, struct sockaddr_in* sender) {
GeoIPRecord_delete(ginfo);
const char* json_msg = json_object_to_json_string(jobj);
// printf("%s\n", json_msg);
{
@ -232,8 +233,7 @@ int handle_message(char* msg, struct sockaddr_in* sender) {
pthread_mutex_unlock(&buflock);
}
json_object_put(jobj);
}
}
return 0;
}