From e7efff5fd246db0ffb5e88488a149e19d037c10c Mon Sep 17 00:00:00 2001 From: huangsimin Date: Mon, 4 Jul 2022 13:42:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20IPAddress=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApmBaseDataFlow.proto | 2 ++ AppFlow.proto | 2 ++ BacktrackingFlow.proto | 2 ++ Base.proto | 8 +++++++- BussFlowDb.proto | 4 +++- BussFlowExternal.proto | 6 ++++-- BussFlowMidd.proto | 6 ++++-- BussFlowWeb.proto | 6 ++++-- QoeFlow.proto | 6 ++++-- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ApmBaseDataFlow.proto b/ApmBaseDataFlow.proto index 18f04e4..fa3a247 100644 --- a/ApmBaseDataFlow.proto +++ b/ApmBaseDataFlow.proto @@ -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"; diff --git a/AppFlow.proto b/AppFlow.proto index 730b80f..31fc2e6 100644 --- a/AppFlow.proto +++ b/AppFlow.proto @@ -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"; diff --git a/BacktrackingFlow.proto b/BacktrackingFlow.proto index 25be7f1..9ba178d 100644 --- a/BacktrackingFlow.proto +++ b/BacktrackingFlow.proto @@ -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"; diff --git a/Base.proto b/Base.proto index 4b00fb3..0b6adbc 100644 --- a/Base.proto +++ b/Base.proto @@ -5,7 +5,6 @@ import "google/protobuf/any.proto"; option java_multiple_files = false; //不要拆分成多个文件 option java_package = "com.yuandian.dataflow.proto"; - option go_package = "../grpc-gen;grpcgen"; package dataflow; @@ -22,6 +21,13 @@ message Request { repeated google.protobuf.Any param = 3; // 请求的可变参数. 暂不使用 } +message IPAddress { + oneof IP { + bytes v4 = 1; + bytes v6 = 2; + } +} + service CollectPacketsServer { rpc GetPackets (Request) returns (stream Response); } diff --git a/BussFlowDb.proto b/BussFlowDb.proto index 3c15c9c..d8d568a 100644 --- a/BussFlowDb.proto +++ b/BussFlowDb.proto @@ -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"; @@ -10,7 +12,7 @@ package dataflow; message BussFlowDb { - int32 table_id = 1; //编号24 +int32 table_id = 1; //编号24 uint32 msg_type = 2; string msg_version = 3; uint32 msg_seq = 4; diff --git a/BussFlowExternal.proto b/BussFlowExternal.proto index 838f648..557b732 100644 --- a/BussFlowExternal.proto +++ b/BussFlowExternal.proto @@ -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"; @@ -15,9 +17,9 @@ message BussFlowExternal { uint32 msg_len = 5; uint64 src_mac = 6; uint64 dst_mac = 7; - uint32 request_ip = 8; + IPAddress request_ip = 8; uint32 request_port = 9; - uint32 response_ip = 10; + IPAddress response_ip = 10; uint32 response_port = 11; uint32 probeif = 12; uint32 protocol = 13; diff --git a/BussFlowMidd.proto b/BussFlowMidd.proto index d029a07..a6d7e8a 100644 --- a/BussFlowMidd.proto +++ b/BussFlowMidd.proto @@ -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"; @@ -29,9 +31,9 @@ message BussFlowMidd { uint32 recog_status = 19; uint32 probe_if = 20; //探针编号 string channel = 21; //通道 - uint32 request_ip = 22; //请求地址 + IPAddress request_ip = 22; //请求地址 uint32 request_port = 23; //请求端口 - uint32 response_ip = 24; //响应地址 + IPAddress response_ip = 24; //响应地址 uint32 response_port = 25; //响应端口 uint32 start_time_tv_sec = 26; //开始时间（秒） uint32 start_time_tv_usec = 27; //开始时间（毫秒） diff --git a/BussFlowWeb.proto b/BussFlowWeb.proto index 7e4ae05..8a51d89 100644 --- a/BussFlowWeb.proto +++ b/BussFlowWeb.proto @@ -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"; @@ -33,9 +35,9 @@ message BussFlowWeb { uint32 probe_if = 23; //探针编号 string channel = 24; //业务类型 string sessionid = 25; //会话id - uint32 request_ip = 26; //请求ip地址 + IPAddress request_ip = 26; //请求ip地址 uint32 request_port = 27; //请求端口 - uint32 response_ip = 28; //响应ip地址 + IPAddress response_ip = 28; //响应ip地址 uint32 response_port = 29; //响应端口 uint32 start_time_tv_sec = 30; //开始时间（秒） uint32 start_time_tv_usec = 31; //开始时间（毫秒） diff --git a/QoeFlow.proto b/QoeFlow.proto index 3274363..99c8782 100644 --- a/QoeFlow.proto +++ b/QoeFlow.proto @@ -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"; @@ -9,8 +11,8 @@ package dataflow; message QoeFlow { int32 table_id = 1; //编号18 - uint32 src_ip = 2; - uint32 dst_ip = 3; + IPAddress src_ip = 2; + IPAddress dst_ip = 3; uint32 s_tv_sec = 4; uint32 s_tv_usec = 5; uint32 l_tv_sec = 6;