mirror of
https://github.com/pavel-odintsov/fastnetmon.git
synced 2024-09-21 10:27:13 +00:00
Protobuf field naming adjustments
This commit is contained in:
parent
b757876b30
commit
e0de8b3356
4
.gitignore
vendored
4
.gitignore
vendored
@ -14,5 +14,5 @@ src/fastnetmon.pb.cc
|
||||
src/fastnetmon.pb.h
|
||||
src/simple_packet_capnp/simple_packet.capnp.c++
|
||||
src/simple_packet_capnp/simple_packet.capnp.h
|
||||
src/flow_data.pb.cc
|
||||
src/flow_data.pb.h
|
||||
src/traffic_data.pb.cc
|
||||
src/traffic_data.pb.h
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <capnp/serialize-packed.h>
|
||||
#endif
|
||||
|
||||
#include "flow_data.pb.h"
|
||||
#include "traffic_data.pb.h"
|
||||
|
||||
boost::regex regular_expression_cidr_pattern("^\\d+\\.\\d+\\.\\d+\\.\\d+\\/\\d+$");
|
||||
boost::regex regular_expression_host_pattern("^\\d+\\.\\d+\\.\\d+\\.\\d+$");
|
||||
@ -2374,11 +2374,11 @@ bool write_simple_packet_to_protobuf(const simple_packet_t& packet, TrafficData&
|
||||
traffic_data.set_source_ip(packet.src_ip);
|
||||
traffic_data.set_destination_ip(packet.dst_ip);
|
||||
|
||||
traffic_data.set_ip_protocol_version(packet.ip_protocol_version);
|
||||
traffic_data.set_ip_version(packet.ip_protocol_version);
|
||||
traffic_data.set_ttl(packet.ttl);
|
||||
|
||||
traffic_data.set_source_port(packet.source_port);
|
||||
traffic_data.set_destinationPort(packet.destination_port);
|
||||
traffic_data.set_destination_port(packet.destination_port);
|
||||
|
||||
traffic_data.set_octets(packet.length);
|
||||
traffic_data.set_packets(packet.number_of_packets);
|
||||
|
@ -37,7 +37,7 @@ message TrafficData {
|
||||
TelemetryType telemetry_type = 3;
|
||||
|
||||
// IP protocol version: 4 or 6
|
||||
uint32 protocol_version = 4;
|
||||
uint32 ip_version = 4;
|
||||
|
||||
TrafficDirection traffic_direction = 5;
|
||||
|
||||
@ -78,6 +78,6 @@ message TrafficData {
|
||||
// TCP flags encoded in bit set
|
||||
uint32 tcp_flags = 20;
|
||||
|
||||
bool ip_fragmented = 21;
|
||||
bool ip_fragmented = 21;
|
||||
bool ip_dont_fragment = 22;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user