mirror of
https://github.com/pavel-odintsov/fastnetmon.git
synced 2024-09-21 10:27:13 +00:00
Unified JSON attack serialisation logic. Added new C++ native JSON library: nlohmann/json, 3.10.5
This commit is contained in:
parent
7bbbcb7bcb
commit
e3f0860bc6
@ -949,20 +949,8 @@ bool manage_interface_promisc_mode(std::string interface_name, bool switch_on) {
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
json_object* serialize_attack_description_to_json(attack_details_t& current_attack) {
|
// Adds traffic speed to JSON structure
|
||||||
json_object* jobj = json_object_new_object();
|
void serialize_traffic_counters_to_json(json_object* jobj, const attack_details_t& current_attack) {
|
||||||
|
|
||||||
attack_type_t attack_type = detect_attack_type(current_attack);
|
|
||||||
std::string printable_attack_type = get_printable_attack_name(attack_type);
|
|
||||||
|
|
||||||
json_object_object_add(jobj, "attack_type", json_object_new_string(printable_attack_type.c_str()));
|
|
||||||
json_object_object_add(jobj, "initial_attack_power", json_object_new_int(current_attack.attack_power));
|
|
||||||
json_object_object_add(jobj, "peak_attack_power", json_object_new_int(current_attack.max_attack_power));
|
|
||||||
json_object_object_add(jobj, "attack_direction",
|
|
||||||
json_object_new_string(get_direction_name(current_attack.attack_direction).c_str()));
|
|
||||||
json_object_object_add(jobj, "attack_protocol",
|
|
||||||
json_object_new_string(get_printable_protocol_name(current_attack.attack_protocol).c_str()));
|
|
||||||
|
|
||||||
json_object_object_add(jobj, "total_incoming_traffic", json_object_new_int(current_attack.in_bytes));
|
json_object_object_add(jobj, "total_incoming_traffic", json_object_new_int(current_attack.in_bytes));
|
||||||
json_object_object_add(jobj, "total_outgoing_traffic", json_object_new_int(current_attack.out_bytes));
|
json_object_object_add(jobj, "total_outgoing_traffic", json_object_new_int(current_attack.out_bytes));
|
||||||
json_object_object_add(jobj, "total_incoming_pps", json_object_new_int(current_attack.in_packets));
|
json_object_object_add(jobj, "total_incoming_pps", json_object_new_int(current_attack.in_packets));
|
||||||
@ -970,13 +958,6 @@ json_object* serialize_attack_description_to_json(attack_details_t& current_atta
|
|||||||
json_object_object_add(jobj, "total_incoming_flows", json_object_new_int(current_attack.in_flows));
|
json_object_object_add(jobj, "total_incoming_flows", json_object_new_int(current_attack.in_flows));
|
||||||
json_object_object_add(jobj, "total_outgoing_flows", json_object_new_int(current_attack.out_flows));
|
json_object_object_add(jobj, "total_outgoing_flows", json_object_new_int(current_attack.out_flows));
|
||||||
|
|
||||||
json_object_object_add(jobj, "average_incoming_traffic", json_object_new_int(current_attack.average_in_bytes));
|
|
||||||
json_object_object_add(jobj, "average_outgoing_traffic", json_object_new_int(current_attack.average_out_bytes));
|
|
||||||
json_object_object_add(jobj, "average_incoming_pps", json_object_new_int(current_attack.average_in_packets));
|
|
||||||
json_object_object_add(jobj, "average_outgoing_pps", json_object_new_int(current_attack.average_out_packets));
|
|
||||||
json_object_object_add(jobj, "average_incoming_flows", json_object_new_int(current_attack.average_in_flows));
|
|
||||||
json_object_object_add(jobj, "average_outgoing_flows", json_object_new_int(current_attack.average_out_flows));
|
|
||||||
|
|
||||||
json_object_object_add(jobj, "incoming_ip_fragmented_traffic", json_object_new_int(current_attack.fragmented_in_bytes));
|
json_object_object_add(jobj, "incoming_ip_fragmented_traffic", json_object_new_int(current_attack.fragmented_in_bytes));
|
||||||
json_object_object_add(jobj, "outgoing_ip_fragmented_traffic", json_object_new_int(current_attack.fragmented_out_bytes));
|
json_object_object_add(jobj, "outgoing_ip_fragmented_traffic", json_object_new_int(current_attack.fragmented_out_bytes));
|
||||||
json_object_object_add(jobj, "incoming_ip_fragmented_pps", json_object_new_int(current_attack.fragmented_in_packets));
|
json_object_object_add(jobj, "incoming_ip_fragmented_pps", json_object_new_int(current_attack.fragmented_in_packets));
|
||||||
@ -1001,6 +982,35 @@ json_object* serialize_attack_description_to_json(attack_details_t& current_atta
|
|||||||
json_object_object_add(jobj, "outgoing_icmp_traffic", json_object_new_int(current_attack.icmp_out_bytes));
|
json_object_object_add(jobj, "outgoing_icmp_traffic", json_object_new_int(current_attack.icmp_out_bytes));
|
||||||
json_object_object_add(jobj, "incoming_icmp_pps", json_object_new_int(current_attack.icmp_in_packets));
|
json_object_object_add(jobj, "incoming_icmp_pps", json_object_new_int(current_attack.icmp_in_packets));
|
||||||
json_object_object_add(jobj, "outgoing_icmp_pps", json_object_new_int(current_attack.icmp_out_packets));
|
json_object_object_add(jobj, "outgoing_icmp_pps", json_object_new_int(current_attack.icmp_out_packets));
|
||||||
|
}
|
||||||
|
|
||||||
|
json_object* serialize_attack_description_to_json(attack_details_t& current_attack) {
|
||||||
|
json_object* jobj = json_object_new_object();
|
||||||
|
|
||||||
|
attack_type_t attack_type = detect_attack_type(current_attack);
|
||||||
|
std::string printable_attack_type = get_printable_attack_name(attack_type);
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "attack_type", json_object_new_string(printable_attack_type.c_str()));
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "initial_attack_power", json_object_new_int(current_attack.attack_power));
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "peak_attack_power", json_object_new_int(current_attack.max_attack_power));
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "attack_direction",
|
||||||
|
json_object_new_string(get_direction_name(current_attack.attack_direction).c_str()));
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "attack_protocol",
|
||||||
|
json_object_new_string(get_printable_protocol_name(current_attack.attack_protocol).c_str()));
|
||||||
|
|
||||||
|
// Populate traffic counters
|
||||||
|
serialize_traffic_counters_to_json(jobj, current_attack);
|
||||||
|
|
||||||
|
json_object_object_add(jobj, "average_incoming_traffic", json_object_new_int(current_attack.average_in_bytes));
|
||||||
|
json_object_object_add(jobj, "average_outgoing_traffic", json_object_new_int(current_attack.average_out_bytes));
|
||||||
|
json_object_object_add(jobj, "average_incoming_pps", json_object_new_int(current_attack.average_in_packets));
|
||||||
|
json_object_object_add(jobj, "average_outgoing_pps", json_object_new_int(current_attack.average_out_packets));
|
||||||
|
json_object_object_add(jobj, "average_incoming_flows", json_object_new_int(current_attack.average_in_flows));
|
||||||
|
json_object_object_add(jobj, "average_outgoing_flows", json_object_new_int(current_attack.average_out_flows));
|
||||||
|
|
||||||
return jobj;
|
return jobj;
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
#include <json-c/json.h>
|
#include <json-c/json.h>
|
||||||
|
|
||||||
|
#include "nlohmann/json.hpp"
|
||||||
|
|
||||||
// Boost libs
|
// Boost libs
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
|
22091
src/nlohmann/json.hpp
Normal file
22091
src/nlohmann/json.hpp
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user