补全其余流地址的使用标识

This commit is contained in:
杨德昌 2022-07-07 10:26:04 +08:00
parent bdaf30bd5f
commit 5ade0479ec
5 changed files with 31 additions and 29 deletions

View File

@ -16,8 +16,8 @@ message ApmBaseDataFlow {
uint32 probe_if = 2;
uint32 tuple_source = 3;
uint32 tuple_dest = 4;
uint32 tuple_saddr = 5;
uint32 tuple_daddr = 6;
IPAddress tuple_saddr = 5;
IPAddress tuple_daddr = 6;
string src_mac = 7;
string dst_mac = 8;
uint32 vlan_id = 9;

View File

@ -11,9 +11,9 @@ package dataflow;
message AppFlow {
int32 table_id = 1; //17
uint32 src_ip = 2;
IPAddress src_ip = 2;
uint32 src_port = 3;
uint32 dst_ip = 4;
IPAddress dst_ip = 4;
uint32 dst_port = 5;
uint32 s_tv_sec = 6;
uint32 s_tv_usec = 7;
@ -28,7 +28,7 @@ message AppFlow {
string protocol = 16;
uint32 app_id = 17;
uint32 app_group_id = 18;
uint32 probe_id = 19;
uint32 probe_if = 19;
uint32 app_style = 20;
uint32 time_flag = 21;
int32 vlan_id = 22;

View File

@ -12,22 +12,22 @@ package dataflow;
message BacktrackingFlow {
int32 table_id = 1; //20
int64 mac_src = 2;
int64 mac_dst = 3;
int64 ip_src = 4;
int64 ip_dst = 5;
int32 port_src = 6;
int32 port_dst = 7;
int32 l3_proto = 8;
int32 l4_proto = 9;
int32 tos = 10;
int32 vlan_id = 11;
uint64 bytes = 12;
uint64 packets = 13;
uint64 tcp_sp = 14;
uint64 tcp_scpn = 15;
uint64 tcp_srp = 16;
uint32 app_id = 17;
uint32 app_group_id = 18;
int32 mpls_label = 19;
}
int64 mac_src = 2;
int64 mac_dst = 3;
IPAddress ip_src = 4;
IPAddress ip_dst = 5;
int32 port_src = 6;
int32 port_dst = 7;
int32 l3_proto = 8;
int32 l4_proto = 9;
int32 tos = 10;
int32 vlan_id = 11;
uint64 bytes = 12;
uint64 packets = 13;
uint64 tcp_sp = 14;
uint64 tcp_scpn = 15;
uint64 tcp_srp = 16;
uint32 app_id = 17;
uint32 app_group_id = 18;
int32 mpls_label = 19;
}

View File

@ -34,9 +34,9 @@ uint32 recog_status = 19;
uint32 probe_if = 20;
string channel = 21;
string dbname = 22;
uint32 request_ip = 23;
IPAddress request_ip = 23;
uint32 request_port = 24;
uint32 response_ip = 25;
IPAddress response_ip = 25;
uint32 response_port = 26;
int64 status = 27;
int64 server_translate_time = 28;
@ -63,4 +63,4 @@ string req_data = 48;
string res_data = 49;
string reserved = 50;
}
}

View File

@ -1,5 +1,7 @@
syntax = "proto3";
import "Base.proto";
option java_multiple_files = false;
option java_package = "com.yuandian.dataflow.proto.msgtype";
option go_package = "../grpc-gen;grpcgen";
@ -11,8 +13,8 @@ message UsrFlow {
int32 table_id = 1; //19
uint32 probe_if = 2;
uint32 server_ip = 3;
uint32 client_ip = 4;
IPAddress server_ip = 3;
IPAddress client_ip = 4;
uint32 client_port = 5;
uint32 client_rtt = 6;
uint32 server_rtt = 7;