diff --git a/src/main/java/com/yuandian/dataflow/proto/msgtype/ApmBaseDataFlowOuterClass.java b/src/main/java/com/yuandian/dataflow/proto/msgtype/ApmBaseDataFlowOuterClass.java
index 5a4a787..59421c7 100644
--- a/src/main/java/com/yuandian/dataflow/proto/msgtype/ApmBaseDataFlowOuterClass.java
+++ b/src/main/java/com/yuandian/dataflow/proto/msgtype/ApmBaseDataFlowOuterClass.java
@@ -47,16 +47,34 @@ public final class ApmBaseDataFlowOuterClass {
int getTupleDest();
/**
- * uint32 tuple_saddr = 5;
+ * .dataflow.IPAddress tuple_saddr = 5;
+ * @return Whether the tupleSaddr field is set.
+ */
+ boolean hasTupleSaddr();
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
* @return The tupleSaddr.
*/
- int getTupleSaddr();
+ com.yuandian.dataflow.proto.Base.IPAddress getTupleSaddr();
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleSaddrOrBuilder();
/**
- * uint32 tuple_daddr = 6;
+ * .dataflow.IPAddress tuple_daddr = 6;
+ * @return Whether the tupleDaddr field is set.
+ */
+ boolean hasTupleDaddr();
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
* @return The tupleDaddr.
*/
- int getTupleDaddr();
+ com.yuandian.dataflow.proto.Base.IPAddress getTupleDaddr();
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleDaddrOrBuilder();
/**
* string src_mac = 7;
@@ -330,14 +348,30 @@ public final class ApmBaseDataFlowOuterClass {
tupleDest_ = input.readUInt32();
break;
}
- case 40: {
+ case 42: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (tupleSaddr_ != null) {
+ subBuilder = tupleSaddr_.toBuilder();
+ }
+ tupleSaddr_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(tupleSaddr_);
+ tupleSaddr_ = subBuilder.buildPartial();
+ }
- tupleSaddr_ = input.readUInt32();
break;
}
- case 48: {
+ case 50: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (tupleDaddr_ != null) {
+ subBuilder = tupleDaddr_.toBuilder();
+ }
+ tupleDaddr_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(tupleDaddr_);
+ tupleDaddr_ = subBuilder.buildPartial();
+ }
- tupleDaddr_ = input.readUInt32();
break;
}
case 58: {
@@ -581,25 +615,55 @@ public final class ApmBaseDataFlowOuterClass {
}
public static final int TUPLE_SADDR_FIELD_NUMBER = 5;
- private int tupleSaddr_;
+ private com.yuandian.dataflow.proto.Base.IPAddress tupleSaddr_;
/**
- * uint32 tuple_saddr = 5;
+ * .dataflow.IPAddress tuple_saddr = 5;
+ * @return Whether the tupleSaddr field is set.
+ */
+ @java.lang.Override
+ public boolean hasTupleSaddr() {
+ return tupleSaddr_ != null;
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
* @return The tupleSaddr.
*/
@java.lang.Override
- public int getTupleSaddr() {
- return tupleSaddr_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getTupleSaddr() {
+ return tupleSaddr_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleSaddr_;
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleSaddrOrBuilder() {
+ return getTupleSaddr();
}
public static final int TUPLE_DADDR_FIELD_NUMBER = 6;
- private int tupleDaddr_;
+ private com.yuandian.dataflow.proto.Base.IPAddress tupleDaddr_;
/**
- * uint32 tuple_daddr = 6;
+ * .dataflow.IPAddress tuple_daddr = 6;
+ * @return Whether the tupleDaddr field is set.
+ */
+ @java.lang.Override
+ public boolean hasTupleDaddr() {
+ return tupleDaddr_ != null;
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
* @return The tupleDaddr.
*/
@java.lang.Override
- public int getTupleDaddr() {
- return tupleDaddr_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getTupleDaddr() {
+ return tupleDaddr_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleDaddr_;
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleDaddrOrBuilder() {
+ return getTupleDaddr();
}
public static final int SRC_MAC_FIELD_NUMBER = 7;
@@ -1050,11 +1114,11 @@ public final class ApmBaseDataFlowOuterClass {
if (tupleDest_ != 0) {
output.writeUInt32(4, tupleDest_);
}
- if (tupleSaddr_ != 0) {
- output.writeUInt32(5, tupleSaddr_);
+ if (tupleSaddr_ != null) {
+ output.writeMessage(5, getTupleSaddr());
}
- if (tupleDaddr_ != 0) {
- output.writeUInt32(6, tupleDaddr_);
+ if (tupleDaddr_ != null) {
+ output.writeMessage(6, getTupleDaddr());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(srcMac_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 7, srcMac_);
@@ -1174,13 +1238,13 @@ public final class ApmBaseDataFlowOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(4, tupleDest_);
}
- if (tupleSaddr_ != 0) {
+ if (tupleSaddr_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(5, tupleSaddr_);
+ .computeMessageSize(5, getTupleSaddr());
}
- if (tupleDaddr_ != 0) {
+ if (tupleDaddr_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(6, tupleDaddr_);
+ .computeMessageSize(6, getTupleDaddr());
}
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(srcMac_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, srcMac_);
@@ -1326,10 +1390,16 @@ public final class ApmBaseDataFlowOuterClass {
!= other.getTupleSource()) return false;
if (getTupleDest()
!= other.getTupleDest()) return false;
- if (getTupleSaddr()
- != other.getTupleSaddr()) return false;
- if (getTupleDaddr()
- != other.getTupleDaddr()) return false;
+ if (hasTupleSaddr() != other.hasTupleSaddr()) return false;
+ if (hasTupleSaddr()) {
+ if (!getTupleSaddr()
+ .equals(other.getTupleSaddr())) return false;
+ }
+ if (hasTupleDaddr() != other.hasTupleDaddr()) return false;
+ if (hasTupleDaddr()) {
+ if (!getTupleDaddr()
+ .equals(other.getTupleDaddr())) return false;
+ }
if (!getSrcMac()
.equals(other.getSrcMac())) return false;
if (!getDstMac()
@@ -1411,10 +1481,14 @@ public final class ApmBaseDataFlowOuterClass {
hash = (53 * hash) + getTupleSource();
hash = (37 * hash) + TUPLE_DEST_FIELD_NUMBER;
hash = (53 * hash) + getTupleDest();
- hash = (37 * hash) + TUPLE_SADDR_FIELD_NUMBER;
- hash = (53 * hash) + getTupleSaddr();
- hash = (37 * hash) + TUPLE_DADDR_FIELD_NUMBER;
- hash = (53 * hash) + getTupleDaddr();
+ if (hasTupleSaddr()) {
+ hash = (37 * hash) + TUPLE_SADDR_FIELD_NUMBER;
+ hash = (53 * hash) + getTupleSaddr().hashCode();
+ }
+ if (hasTupleDaddr()) {
+ hash = (37 * hash) + TUPLE_DADDR_FIELD_NUMBER;
+ hash = (53 * hash) + getTupleDaddr().hashCode();
+ }
hash = (37 * hash) + SRC_MAC_FIELD_NUMBER;
hash = (53 * hash) + getSrcMac().hashCode();
hash = (37 * hash) + DST_MAC_FIELD_NUMBER;
@@ -1618,10 +1692,18 @@ public final class ApmBaseDataFlowOuterClass {
tupleDest_ = 0;
- tupleSaddr_ = 0;
-
- tupleDaddr_ = 0;
-
+ if (tupleSaddrBuilder_ == null) {
+ tupleSaddr_ = null;
+ } else {
+ tupleSaddr_ = null;
+ tupleSaddrBuilder_ = null;
+ }
+ if (tupleDaddrBuilder_ == null) {
+ tupleDaddr_ = null;
+ } else {
+ tupleDaddr_ = null;
+ tupleDaddrBuilder_ = null;
+ }
srcMac_ = "";
dstMac_ = "";
@@ -1714,8 +1796,16 @@ public final class ApmBaseDataFlowOuterClass {
result.probeIf_ = probeIf_;
result.tupleSource_ = tupleSource_;
result.tupleDest_ = tupleDest_;
- result.tupleSaddr_ = tupleSaddr_;
- result.tupleDaddr_ = tupleDaddr_;
+ if (tupleSaddrBuilder_ == null) {
+ result.tupleSaddr_ = tupleSaddr_;
+ } else {
+ result.tupleSaddr_ = tupleSaddrBuilder_.build();
+ }
+ if (tupleDaddrBuilder_ == null) {
+ result.tupleDaddr_ = tupleDaddr_;
+ } else {
+ result.tupleDaddr_ = tupleDaddrBuilder_.build();
+ }
result.srcMac_ = srcMac_;
result.dstMac_ = dstMac_;
result.vlanId_ = vlanId_;
@@ -1807,11 +1897,11 @@ public final class ApmBaseDataFlowOuterClass {
if (other.getTupleDest() != 0) {
setTupleDest(other.getTupleDest());
}
- if (other.getTupleSaddr() != 0) {
- setTupleSaddr(other.getTupleSaddr());
+ if (other.hasTupleSaddr()) {
+ mergeTupleSaddr(other.getTupleSaddr());
}
- if (other.getTupleDaddr() != 0) {
- setTupleDaddr(other.getTupleDaddr());
+ if (other.hasTupleDaddr()) {
+ mergeTupleDaddr(other.getTupleDaddr());
}
if (!other.getSrcMac().isEmpty()) {
srcMac_ = other.srcMac_;
@@ -2074,67 +2164,243 @@ public final class ApmBaseDataFlowOuterClass {
return this;
}
- private int tupleSaddr_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress tupleSaddr_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> tupleSaddrBuilder_;
/**
- * uint32 tuple_saddr = 5;
+ * .dataflow.IPAddress tuple_saddr = 5;
+ * @return Whether the tupleSaddr field is set.
+ */
+ public boolean hasTupleSaddr() {
+ return tupleSaddrBuilder_ != null || tupleSaddr_ != null;
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
* @return The tupleSaddr.
*/
- @java.lang.Override
- public int getTupleSaddr() {
- return tupleSaddr_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getTupleSaddr() {
+ if (tupleSaddrBuilder_ == null) {
+ return tupleSaddr_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleSaddr_;
+ } else {
+ return tupleSaddrBuilder_.getMessage();
+ }
}
/**
- * uint32 tuple_saddr = 5;
- * @param value The tupleSaddr to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress tuple_saddr = 5;
*/
- public Builder setTupleSaddr(int value) {
-
- tupleSaddr_ = value;
- onChanged();
+ public Builder setTupleSaddr(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (tupleSaddrBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ tupleSaddr_ = value;
+ onChanged();
+ } else {
+ tupleSaddrBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 tuple_saddr = 5;
- * @return This builder for chaining.
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ public Builder setTupleSaddr(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (tupleSaddrBuilder_ == null) {
+ tupleSaddr_ = builderForValue.build();
+ onChanged();
+ } else {
+ tupleSaddrBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ public Builder mergeTupleSaddr(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (tupleSaddrBuilder_ == null) {
+ if (tupleSaddr_ != null) {
+ tupleSaddr_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(tupleSaddr_).mergeFrom(value).buildPartial();
+ } else {
+ tupleSaddr_ = value;
+ }
+ onChanged();
+ } else {
+ tupleSaddrBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
*/
public Builder clearTupleSaddr() {
-
- tupleSaddr_ = 0;
- onChanged();
+ if (tupleSaddrBuilder_ == null) {
+ tupleSaddr_ = null;
+ onChanged();
+ } else {
+ tupleSaddr_ = null;
+ tupleSaddrBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getTupleSaddrBuilder() {
+
+ onChanged();
+ return getTupleSaddrFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleSaddrOrBuilder() {
+ if (tupleSaddrBuilder_ != null) {
+ return tupleSaddrBuilder_.getMessageOrBuilder();
+ } else {
+ return tupleSaddr_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleSaddr_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress tuple_saddr = 5;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getTupleSaddrFieldBuilder() {
+ if (tupleSaddrBuilder_ == null) {
+ tupleSaddrBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getTupleSaddr(),
+ getParentForChildren(),
+ isClean());
+ tupleSaddr_ = null;
+ }
+ return tupleSaddrBuilder_;
+ }
- private int tupleDaddr_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress tupleDaddr_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> tupleDaddrBuilder_;
/**
- * uint32 tuple_daddr = 6;
+ * .dataflow.IPAddress tuple_daddr = 6;
+ * @return Whether the tupleDaddr field is set.
+ */
+ public boolean hasTupleDaddr() {
+ return tupleDaddrBuilder_ != null || tupleDaddr_ != null;
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
* @return The tupleDaddr.
*/
- @java.lang.Override
- public int getTupleDaddr() {
- return tupleDaddr_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getTupleDaddr() {
+ if (tupleDaddrBuilder_ == null) {
+ return tupleDaddr_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleDaddr_;
+ } else {
+ return tupleDaddrBuilder_.getMessage();
+ }
}
/**
- * uint32 tuple_daddr = 6;
- * @param value The tupleDaddr to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress tuple_daddr = 6;
*/
- public Builder setTupleDaddr(int value) {
-
- tupleDaddr_ = value;
- onChanged();
+ public Builder setTupleDaddr(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (tupleDaddrBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ tupleDaddr_ = value;
+ onChanged();
+ } else {
+ tupleDaddrBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 tuple_daddr = 6;
- * @return This builder for chaining.
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ public Builder setTupleDaddr(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (tupleDaddrBuilder_ == null) {
+ tupleDaddr_ = builderForValue.build();
+ onChanged();
+ } else {
+ tupleDaddrBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ public Builder mergeTupleDaddr(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (tupleDaddrBuilder_ == null) {
+ if (tupleDaddr_ != null) {
+ tupleDaddr_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(tupleDaddr_).mergeFrom(value).buildPartial();
+ } else {
+ tupleDaddr_ = value;
+ }
+ onChanged();
+ } else {
+ tupleDaddrBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
*/
public Builder clearTupleDaddr() {
-
- tupleDaddr_ = 0;
- onChanged();
+ if (tupleDaddrBuilder_ == null) {
+ tupleDaddr_ = null;
+ onChanged();
+ } else {
+ tupleDaddr_ = null;
+ tupleDaddrBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getTupleDaddrBuilder() {
+
+ onChanged();
+ return getTupleDaddrFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getTupleDaddrOrBuilder() {
+ if (tupleDaddrBuilder_ != null) {
+ return tupleDaddrBuilder_.getMessageOrBuilder();
+ } else {
+ return tupleDaddr_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : tupleDaddr_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress tuple_daddr = 6;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getTupleDaddrFieldBuilder() {
+ if (tupleDaddrBuilder_ == null) {
+ tupleDaddrBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getTupleDaddr(),
+ getParentForChildren(),
+ isClean());
+ tupleDaddr_ = null;
+ }
+ return tupleDaddrBuilder_;
+ }
private java.lang.Object srcMac_ = "";
/**
@@ -3299,28 +3565,29 @@ public final class ApmBaseDataFlowOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025ApmBaseDataFlow.proto\022\010dataflow\032\nBase." +
- "proto\"\223\006\n\017ApmBaseDataFlow\022\020\n\010table_id\030\001 " +
+ "proto\"\275\006\n\017ApmBaseDataFlow\022\020\n\010table_id\030\001 " +
"\001(\005\022\020\n\010probe_if\030\002 \001(\r\022\024\n\014tuple_source\030\003 " +
- "\001(\r\022\022\n\ntuple_dest\030\004 \001(\r\022\023\n\013tuple_saddr\030\005" +
- " \001(\r\022\023\n\013tuple_daddr\030\006 \001(\r\022\017\n\007src_mac\030\007 \001" +
- "(\t\022\017\n\007dst_mac\030\010 \001(\t\022\017\n\007vlan_id\030\t \001(\r\022\027\n\017" +
- "start_tm_tv_sec\030\n \001(\r\022\030\n\020start_tm_tv_use" +
- "c\030\013 \001(\r\022\023\n\013total_bytes\030\014 \001(\r\022\025\n\rtotal_pa" +
- "ckets\030\r \001(\r\022\032\n\022total_drop_packets\030\016 \001(\r\022" +
- "\031\n\021retran_time_delay\030\017 \001(\r\022\022\n\nclient_rtt" +
- "\030\020 \001(\r\022\022\n\nserver_rtt\030\021 \001(\r\022\032\n\022user_respo" +
- "nse_time\030\022 \001(\r\022\034\n\024server_response_time\030\023" +
- " \001(\r\022\020\n\010con_fail\030\024 \001(\r\022\020\n\010bytes_in\030\025 \001(\r" +
- "\022\021\n\tbytes_out\030\026 \001(\r\022\021\n\ttime_flag\030\027 \001(\r\022\025" +
- "\n\rend_tm_tv_sec\030\030 \001(\r\022\026\n\016end_tm_tv_usec\030" +
- "\031 \001(\r\022\022\n\nrespon_num\030\032 \001(\r\022\021\n\tcs_window\030\033" +
- " \001(\r\022\021\n\tsc_window\030\034 \001(\r\022\020\n\010cs_reset\030\035 \001(" +
- "\r\022\020\n\010sc_reset\030\036 \001(\r\022\021\n\tcs_retran\030\037 \001(\r\022\021" +
- "\n\tsc_retran\030 \001(\r\022\025\n\rconn_setup_tm\030! \001(\r" +
- "\022\023\n\013new_session\030\" \001(\r\022\020\n\010cs_alert\030# \001(\r\022" +
- "\020\n\010sc_alert\030$ \001(\r\022\020\n\010protocol\030% \001(\tB<\n#c" +
- "om.yuandian.dataflow.proto.msgtypeP\000Z\023.." +
- "/grpc-gen;grpcgenb\006proto3"
+ "\001(\r\022\022\n\ntuple_dest\030\004 \001(\r\022(\n\013tuple_saddr\030\005" +
+ " \001(\0132\023.dataflow.IPAddress\022(\n\013tuple_daddr" +
+ "\030\006 \001(\0132\023.dataflow.IPAddress\022\017\n\007src_mac\030\007" +
+ " \001(\t\022\017\n\007dst_mac\030\010 \001(\t\022\017\n\007vlan_id\030\t \001(\r\022\027" +
+ "\n\017start_tm_tv_sec\030\n \001(\r\022\030\n\020start_tm_tv_u" +
+ "sec\030\013 \001(\r\022\023\n\013total_bytes\030\014 \001(\r\022\025\n\rtotal_" +
+ "packets\030\r \001(\r\022\032\n\022total_drop_packets\030\016 \001(" +
+ "\r\022\031\n\021retran_time_delay\030\017 \001(\r\022\022\n\nclient_r" +
+ "tt\030\020 \001(\r\022\022\n\nserver_rtt\030\021 \001(\r\022\032\n\022user_res" +
+ "ponse_time\030\022 \001(\r\022\034\n\024server_response_time" +
+ "\030\023 \001(\r\022\020\n\010con_fail\030\024 \001(\r\022\020\n\010bytes_in\030\025 \001" +
+ "(\r\022\021\n\tbytes_out\030\026 \001(\r\022\021\n\ttime_flag\030\027 \001(\r" +
+ "\022\025\n\rend_tm_tv_sec\030\030 \001(\r\022\026\n\016end_tm_tv_use" +
+ "c\030\031 \001(\r\022\022\n\nrespon_num\030\032 \001(\r\022\021\n\tcs_window" +
+ "\030\033 \001(\r\022\021\n\tsc_window\030\034 \001(\r\022\020\n\010cs_reset\030\035 " +
+ "\001(\r\022\020\n\010sc_reset\030\036 \001(\r\022\021\n\tcs_retran\030\037 \001(\r" +
+ "\022\021\n\tsc_retran\030 \001(\r\022\025\n\rconn_setup_tm\030! \001" +
+ "(\r\022\023\n\013new_session\030\" \001(\r\022\020\n\010cs_alert\030# \001(" +
+ "\r\022\020\n\010sc_alert\030$ \001(\r\022\020\n\010protocol\030% \001(\tB<\n" +
+ "#com.yuandian.dataflow.proto.msgtypeP\000Z\023" +
+ "../grpc-gen;grpcgenb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/main/java/com/yuandian/dataflow/proto/msgtype/AppFlowOuterClass.java b/src/main/java/com/yuandian/dataflow/proto/msgtype/AppFlowOuterClass.java
index 086bf2e..f659344 100644
--- a/src/main/java/com/yuandian/dataflow/proto/msgtype/AppFlowOuterClass.java
+++ b/src/main/java/com/yuandian/dataflow/proto/msgtype/AppFlowOuterClass.java
@@ -29,10 +29,19 @@ public final class AppFlowOuterClass {
int getTableId();
/**
- * uint32 src_ip = 2;
+ * .dataflow.IPAddress src_ip = 2;
+ * @return Whether the srcIp field is set.
+ */
+ boolean hasSrcIp();
+ /**
+ * .dataflow.IPAddress src_ip = 2;
* @return The srcIp.
*/
- int getSrcIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getSrcIp();
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getSrcIpOrBuilder();
/**
* uint32 src_port = 3;
@@ -41,10 +50,19 @@ public final class AppFlowOuterClass {
int getSrcPort();
/**
- * uint32 dst_ip = 4;
+ * .dataflow.IPAddress dst_ip = 4;
+ * @return Whether the dstIp field is set.
+ */
+ boolean hasDstIp();
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
* @return The dstIp.
*/
- int getDstIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getDstIp();
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getDstIpOrBuilder();
/**
* uint32 dst_port = 5;
@@ -137,10 +155,10 @@ public final class AppFlowOuterClass {
int getAppGroupId();
/**
- * uint32 probe_id = 19;
- * @return The probeId.
+ * uint32 probe_if = 19;
+ * @return The probeIf.
*/
- int getProbeId();
+ int getProbeIf();
/**
* uint32 app_style = 20;
@@ -223,9 +241,17 @@ public final class AppFlowOuterClass {
tableId_ = input.readInt32();
break;
}
- case 16: {
+ case 18: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (srcIp_ != null) {
+ subBuilder = srcIp_.toBuilder();
+ }
+ srcIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(srcIp_);
+ srcIp_ = subBuilder.buildPartial();
+ }
- srcIp_ = input.readUInt32();
break;
}
case 24: {
@@ -233,9 +259,17 @@ public final class AppFlowOuterClass {
srcPort_ = input.readUInt32();
break;
}
- case 32: {
+ case 34: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (dstIp_ != null) {
+ subBuilder = dstIp_.toBuilder();
+ }
+ dstIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(dstIp_);
+ dstIp_ = subBuilder.buildPartial();
+ }
- dstIp_ = input.readUInt32();
break;
}
case 40: {
@@ -311,7 +345,7 @@ public final class AppFlowOuterClass {
}
case 152: {
- probeId_ = input.readUInt32();
+ probeIf_ = input.readUInt32();
break;
}
case 160: {
@@ -389,14 +423,29 @@ public final class AppFlowOuterClass {
}
public static final int SRC_IP_FIELD_NUMBER = 2;
- private int srcIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress srcIp_;
/**
- * uint32 src_ip = 2;
+ * .dataflow.IPAddress src_ip = 2;
+ * @return Whether the srcIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasSrcIp() {
+ return srcIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
* @return The srcIp.
*/
@java.lang.Override
- public int getSrcIp() {
- return srcIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getSrcIp() {
+ return srcIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : srcIp_;
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getSrcIpOrBuilder() {
+ return getSrcIp();
}
public static final int SRC_PORT_FIELD_NUMBER = 3;
@@ -411,14 +460,29 @@ public final class AppFlowOuterClass {
}
public static final int DST_IP_FIELD_NUMBER = 4;
- private int dstIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress dstIp_;
/**
- * uint32 dst_ip = 4;
+ * .dataflow.IPAddress dst_ip = 4;
+ * @return Whether the dstIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasDstIp() {
+ return dstIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
* @return The dstIp.
*/
@java.lang.Override
- public int getDstIp() {
- return dstIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getDstIp() {
+ return dstIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : dstIp_;
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getDstIpOrBuilder() {
+ return getDstIp();
}
public static final int DST_PORT_FIELD_NUMBER = 5;
@@ -602,15 +666,15 @@ public final class AppFlowOuterClass {
return appGroupId_;
}
- public static final int PROBE_ID_FIELD_NUMBER = 19;
- private int probeId_;
+ public static final int PROBE_IF_FIELD_NUMBER = 19;
+ private int probeIf_;
/**
- * uint32 probe_id = 19;
- * @return The probeId.
+ * uint32 probe_if = 19;
+ * @return The probeIf.
*/
@java.lang.Override
- public int getProbeId() {
- return probeId_;
+ public int getProbeIf() {
+ return probeIf_;
}
public static final int APP_STYLE_FIELD_NUMBER = 20;
@@ -685,14 +749,14 @@ public final class AppFlowOuterClass {
if (tableId_ != 0) {
output.writeInt32(1, tableId_);
}
- if (srcIp_ != 0) {
- output.writeUInt32(2, srcIp_);
+ if (srcIp_ != null) {
+ output.writeMessage(2, getSrcIp());
}
if (srcPort_ != 0) {
output.writeUInt32(3, srcPort_);
}
- if (dstIp_ != 0) {
- output.writeUInt32(4, dstIp_);
+ if (dstIp_ != null) {
+ output.writeMessage(4, getDstIp());
}
if (dstPort_ != 0) {
output.writeUInt32(5, dstPort_);
@@ -736,8 +800,8 @@ public final class AppFlowOuterClass {
if (appGroupId_ != 0) {
output.writeUInt32(18, appGroupId_);
}
- if (probeId_ != 0) {
- output.writeUInt32(19, probeId_);
+ if (probeIf_ != 0) {
+ output.writeUInt32(19, probeIf_);
}
if (appStyle_ != 0) {
output.writeUInt32(20, appStyle_);
@@ -767,17 +831,17 @@ public final class AppFlowOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(1, tableId_);
}
- if (srcIp_ != 0) {
+ if (srcIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(2, srcIp_);
+ .computeMessageSize(2, getSrcIp());
}
if (srcPort_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(3, srcPort_);
}
- if (dstIp_ != 0) {
+ if (dstIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(4, dstIp_);
+ .computeMessageSize(4, getDstIp());
}
if (dstPort_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -834,9 +898,9 @@ public final class AppFlowOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(18, appGroupId_);
}
- if (probeId_ != 0) {
+ if (probeIf_ != 0) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(19, probeId_);
+ .computeUInt32Size(19, probeIf_);
}
if (appStyle_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -875,12 +939,18 @@ public final class AppFlowOuterClass {
if (getTableId()
!= other.getTableId()) return false;
- if (getSrcIp()
- != other.getSrcIp()) return false;
+ if (hasSrcIp() != other.hasSrcIp()) return false;
+ if (hasSrcIp()) {
+ if (!getSrcIp()
+ .equals(other.getSrcIp())) return false;
+ }
if (getSrcPort()
!= other.getSrcPort()) return false;
- if (getDstIp()
- != other.getDstIp()) return false;
+ if (hasDstIp() != other.hasDstIp()) return false;
+ if (hasDstIp()) {
+ if (!getDstIp()
+ .equals(other.getDstIp())) return false;
+ }
if (getDstPort()
!= other.getDstPort()) return false;
if (getSTvSec()
@@ -909,8 +979,8 @@ public final class AppFlowOuterClass {
!= other.getAppId()) return false;
if (getAppGroupId()
!= other.getAppGroupId()) return false;
- if (getProbeId()
- != other.getProbeId()) return false;
+ if (getProbeIf()
+ != other.getProbeIf()) return false;
if (getAppStyle()
!= other.getAppStyle()) return false;
if (getTimeFlag()
@@ -934,12 +1004,16 @@ public final class AppFlowOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TABLE_ID_FIELD_NUMBER;
hash = (53 * hash) + getTableId();
- hash = (37 * hash) + SRC_IP_FIELD_NUMBER;
- hash = (53 * hash) + getSrcIp();
+ if (hasSrcIp()) {
+ hash = (37 * hash) + SRC_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getSrcIp().hashCode();
+ }
hash = (37 * hash) + SRC_PORT_FIELD_NUMBER;
hash = (53 * hash) + getSrcPort();
- hash = (37 * hash) + DST_IP_FIELD_NUMBER;
- hash = (53 * hash) + getDstIp();
+ if (hasDstIp()) {
+ hash = (37 * hash) + DST_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getDstIp().hashCode();
+ }
hash = (37 * hash) + DST_PORT_FIELD_NUMBER;
hash = (53 * hash) + getDstPort();
hash = (37 * hash) + S_TV_SEC_FIELD_NUMBER;
@@ -968,8 +1042,8 @@ public final class AppFlowOuterClass {
hash = (53 * hash) + getAppId();
hash = (37 * hash) + APP_GROUP_ID_FIELD_NUMBER;
hash = (53 * hash) + getAppGroupId();
- hash = (37 * hash) + PROBE_ID_FIELD_NUMBER;
- hash = (53 * hash) + getProbeId();
+ hash = (37 * hash) + PROBE_IF_FIELD_NUMBER;
+ hash = (53 * hash) + getProbeIf();
hash = (37 * hash) + APP_STYLE_FIELD_NUMBER;
hash = (53 * hash) + getAppStyle();
hash = (37 * hash) + TIME_FLAG_FIELD_NUMBER;
@@ -1115,12 +1189,20 @@ public final class AppFlowOuterClass {
super.clear();
tableId_ = 0;
- srcIp_ = 0;
-
+ if (srcIpBuilder_ == null) {
+ srcIp_ = null;
+ } else {
+ srcIp_ = null;
+ srcIpBuilder_ = null;
+ }
srcPort_ = 0;
- dstIp_ = 0;
-
+ if (dstIpBuilder_ == null) {
+ dstIp_ = null;
+ } else {
+ dstIp_ = null;
+ dstIpBuilder_ = null;
+ }
dstPort_ = 0;
sTvSec_ = 0;
@@ -1149,7 +1231,7 @@ public final class AppFlowOuterClass {
appGroupId_ = 0;
- probeId_ = 0;
+ probeIf_ = 0;
appStyle_ = 0;
@@ -1188,9 +1270,17 @@ public final class AppFlowOuterClass {
public com.yuandian.dataflow.proto.msgtype.AppFlowOuterClass.AppFlow buildPartial() {
com.yuandian.dataflow.proto.msgtype.AppFlowOuterClass.AppFlow result = new com.yuandian.dataflow.proto.msgtype.AppFlowOuterClass.AppFlow(this);
result.tableId_ = tableId_;
- result.srcIp_ = srcIp_;
+ if (srcIpBuilder_ == null) {
+ result.srcIp_ = srcIp_;
+ } else {
+ result.srcIp_ = srcIpBuilder_.build();
+ }
result.srcPort_ = srcPort_;
- result.dstIp_ = dstIp_;
+ if (dstIpBuilder_ == null) {
+ result.dstIp_ = dstIp_;
+ } else {
+ result.dstIp_ = dstIpBuilder_.build();
+ }
result.dstPort_ = dstPort_;
result.sTvSec_ = sTvSec_;
result.sTvUsec_ = sTvUsec_;
@@ -1205,7 +1295,7 @@ public final class AppFlowOuterClass {
result.protocol_ = protocol_;
result.appId_ = appId_;
result.appGroupId_ = appGroupId_;
- result.probeId_ = probeId_;
+ result.probeIf_ = probeIf_;
result.appStyle_ = appStyle_;
result.timeFlag_ = timeFlag_;
result.vlanId_ = vlanId_;
@@ -1262,14 +1352,14 @@ public final class AppFlowOuterClass {
if (other.getTableId() != 0) {
setTableId(other.getTableId());
}
- if (other.getSrcIp() != 0) {
- setSrcIp(other.getSrcIp());
+ if (other.hasSrcIp()) {
+ mergeSrcIp(other.getSrcIp());
}
if (other.getSrcPort() != 0) {
setSrcPort(other.getSrcPort());
}
- if (other.getDstIp() != 0) {
- setDstIp(other.getDstIp());
+ if (other.hasDstIp()) {
+ mergeDstIp(other.getDstIp());
}
if (other.getDstPort() != 0) {
setDstPort(other.getDstPort());
@@ -1314,8 +1404,8 @@ public final class AppFlowOuterClass {
if (other.getAppGroupId() != 0) {
setAppGroupId(other.getAppGroupId());
}
- if (other.getProbeId() != 0) {
- setProbeId(other.getProbeId());
+ if (other.getProbeIf() != 0) {
+ setProbeIf(other.getProbeIf());
}
if (other.getAppStyle() != 0) {
setAppStyle(other.getAppStyle());
@@ -1404,36 +1494,124 @@ public final class AppFlowOuterClass {
return this;
}
- private int srcIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress srcIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> srcIpBuilder_;
/**
- * uint32 src_ip = 2;
+ * .dataflow.IPAddress src_ip = 2;
+ * @return Whether the srcIp field is set.
+ */
+ public boolean hasSrcIp() {
+ return srcIpBuilder_ != null || srcIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
* @return The srcIp.
*/
- @java.lang.Override
- public int getSrcIp() {
- return srcIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getSrcIp() {
+ if (srcIpBuilder_ == null) {
+ return srcIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : srcIp_;
+ } else {
+ return srcIpBuilder_.getMessage();
+ }
}
/**
- * uint32 src_ip = 2;
- * @param value The srcIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress src_ip = 2;
*/
- public Builder setSrcIp(int value) {
-
- srcIp_ = value;
- onChanged();
+ public Builder setSrcIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (srcIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ srcIp_ = value;
+ onChanged();
+ } else {
+ srcIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 src_ip = 2;
- * @return This builder for chaining.
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ public Builder setSrcIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (srcIpBuilder_ == null) {
+ srcIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ srcIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ public Builder mergeSrcIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (srcIpBuilder_ == null) {
+ if (srcIp_ != null) {
+ srcIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(srcIp_).mergeFrom(value).buildPartial();
+ } else {
+ srcIp_ = value;
+ }
+ onChanged();
+ } else {
+ srcIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
*/
public Builder clearSrcIp() {
-
- srcIp_ = 0;
- onChanged();
+ if (srcIpBuilder_ == null) {
+ srcIp_ = null;
+ onChanged();
+ } else {
+ srcIp_ = null;
+ srcIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getSrcIpBuilder() {
+
+ onChanged();
+ return getSrcIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getSrcIpOrBuilder() {
+ if (srcIpBuilder_ != null) {
+ return srcIpBuilder_.getMessageOrBuilder();
+ } else {
+ return srcIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : srcIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress src_ip = 2;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getSrcIpFieldBuilder() {
+ if (srcIpBuilder_ == null) {
+ srcIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getSrcIp(),
+ getParentForChildren(),
+ isClean());
+ srcIp_ = null;
+ }
+ return srcIpBuilder_;
+ }
private int srcPort_ ;
/**
@@ -1466,36 +1644,124 @@ public final class AppFlowOuterClass {
return this;
}
- private int dstIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress dstIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> dstIpBuilder_;
/**
- * uint32 dst_ip = 4;
+ * .dataflow.IPAddress dst_ip = 4;
+ * @return Whether the dstIp field is set.
+ */
+ public boolean hasDstIp() {
+ return dstIpBuilder_ != null || dstIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
* @return The dstIp.
*/
- @java.lang.Override
- public int getDstIp() {
- return dstIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getDstIp() {
+ if (dstIpBuilder_ == null) {
+ return dstIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : dstIp_;
+ } else {
+ return dstIpBuilder_.getMessage();
+ }
}
/**
- * uint32 dst_ip = 4;
- * @param value The dstIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress dst_ip = 4;
*/
- public Builder setDstIp(int value) {
-
- dstIp_ = value;
- onChanged();
+ public Builder setDstIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (dstIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ dstIp_ = value;
+ onChanged();
+ } else {
+ dstIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 dst_ip = 4;
- * @return This builder for chaining.
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ public Builder setDstIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (dstIpBuilder_ == null) {
+ dstIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ dstIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ public Builder mergeDstIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (dstIpBuilder_ == null) {
+ if (dstIp_ != null) {
+ dstIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(dstIp_).mergeFrom(value).buildPartial();
+ } else {
+ dstIp_ = value;
+ }
+ onChanged();
+ } else {
+ dstIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
*/
public Builder clearDstIp() {
-
- dstIp_ = 0;
- onChanged();
+ if (dstIpBuilder_ == null) {
+ dstIp_ = null;
+ onChanged();
+ } else {
+ dstIp_ = null;
+ dstIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getDstIpBuilder() {
+
+ onChanged();
+ return getDstIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getDstIpOrBuilder() {
+ if (dstIpBuilder_ != null) {
+ return dstIpBuilder_.getMessageOrBuilder();
+ } else {
+ return dstIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : dstIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress dst_ip = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getDstIpFieldBuilder() {
+ if (dstIpBuilder_ == null) {
+ dstIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getDstIp(),
+ getParentForChildren(),
+ isClean());
+ dstIp_ = null;
+ }
+ return dstIpBuilder_;
+ }
private int dstPort_ ;
/**
@@ -1976,33 +2242,33 @@ public final class AppFlowOuterClass {
return this;
}
- private int probeId_ ;
+ private int probeIf_ ;
/**
- * uint32 probe_id = 19;
- * @return The probeId.
+ * uint32 probe_if = 19;
+ * @return The probeIf.
*/
@java.lang.Override
- public int getProbeId() {
- return probeId_;
+ public int getProbeIf() {
+ return probeIf_;
}
/**
- * uint32 probe_id = 19;
- * @param value The probeId to set.
+ * uint32 probe_if = 19;
+ * @param value The probeIf to set.
* @return This builder for chaining.
*/
- public Builder setProbeId(int value) {
+ public Builder setProbeIf(int value) {
- probeId_ = value;
+ probeIf_ = value;
onChanged();
return this;
}
/**
- * uint32 probe_id = 19;
+ * uint32 probe_if = 19;
* @return This builder for chaining.
*/
- public Builder clearProbeId() {
+ public Builder clearProbeIf() {
- probeId_ = 0;
+ probeIf_ = 0;
onChanged();
return this;
}
@@ -2228,21 +2494,22 @@ public final class AppFlowOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\rAppFlow.proto\022\010dataflow\032\nBase.proto\"\312\003" +
- "\n\007AppFlow\022\020\n\010table_id\030\001 \001(\005\022\016\n\006src_ip\030\002 " +
- "\001(\r\022\020\n\010src_port\030\003 \001(\r\022\016\n\006dst_ip\030\004 \001(\r\022\020\n" +
- "\010dst_port\030\005 \001(\r\022\020\n\010s_tv_sec\030\006 \001(\r\022\021\n\ts_t" +
- "v_usec\030\007 \001(\r\022\020\n\010l_tv_sec\030\010 \001(\r\022\021\n\tl_tv_u" +
- "sec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(\r\022\021\n\te_tv_usec" +
- "\030\013 \001(\r\022\025\n\rinput_packets\030\014 \001(\r\022\026\n\016output_" +
- "packets\030\r \001(\r\022\023\n\013input_bytes\030\016 \001(\r\022\024\n\014ou" +
- "tput_bytes\030\017 \001(\r\022\020\n\010protocol\030\020 \001(\t\022\016\n\006ap" +
- "p_id\030\021 \001(\r\022\024\n\014app_group_id\030\022 \001(\r\022\020\n\010prob" +
- "e_id\030\023 \001(\r\022\021\n\tapp_style\030\024 \001(\r\022\021\n\ttime_fl" +
- "ag\030\025 \001(\r\022\017\n\007vlan_id\030\026 \001(\005\022\022\n\nmpls_label\030" +
- "\027 \001(\005\022\013\n\003tos\030\030 \001(\005B<\n#com.yuandian.dataf" +
- "low.proto.msgtypeP\000Z\023../grpc-gen;grpcgen" +
- "b\006proto3"
+ "\n\rAppFlow.proto\022\010dataflow\032\nBase.proto\"\364\003" +
+ "\n\007AppFlow\022\020\n\010table_id\030\001 \001(\005\022#\n\006src_ip\030\002 " +
+ "\001(\0132\023.dataflow.IPAddress\022\020\n\010src_port\030\003 \001" +
+ "(\r\022#\n\006dst_ip\030\004 \001(\0132\023.dataflow.IPAddress\022" +
+ "\020\n\010dst_port\030\005 \001(\r\022\020\n\010s_tv_sec\030\006 \001(\r\022\021\n\ts" +
+ "_tv_usec\030\007 \001(\r\022\020\n\010l_tv_sec\030\010 \001(\r\022\021\n\tl_tv" +
+ "_usec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(\r\022\021\n\te_tv_us" +
+ "ec\030\013 \001(\r\022\025\n\rinput_packets\030\014 \001(\r\022\026\n\016outpu" +
+ "t_packets\030\r \001(\r\022\023\n\013input_bytes\030\016 \001(\r\022\024\n\014" +
+ "output_bytes\030\017 \001(\r\022\020\n\010protocol\030\020 \001(\t\022\016\n\006" +
+ "app_id\030\021 \001(\r\022\024\n\014app_group_id\030\022 \001(\r\022\020\n\010pr" +
+ "obe_if\030\023 \001(\r\022\021\n\tapp_style\030\024 \001(\r\022\021\n\ttime_" +
+ "flag\030\025 \001(\r\022\017\n\007vlan_id\030\026 \001(\005\022\022\n\nmpls_labe" +
+ "l\030\027 \001(\005\022\013\n\003tos\030\030 \001(\005B<\n#com.yuandian.dat" +
+ "aflow.proto.msgtypeP\000Z\023../grpc-gen;grpcg" +
+ "enb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -2254,7 +2521,7 @@ public final class AppFlowOuterClass {
internal_static_dataflow_AppFlow_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_dataflow_AppFlow_descriptor,
- new java.lang.String[] { "TableId", "SrcIp", "SrcPort", "DstIp", "DstPort", "STvSec", "STvUsec", "LTvSec", "LTvUsec", "ETvSec", "ETvUsec", "InputPackets", "OutputPackets", "InputBytes", "OutputBytes", "Protocol", "AppId", "AppGroupId", "ProbeId", "AppStyle", "TimeFlag", "VlanId", "MplsLabel", "Tos", });
+ new java.lang.String[] { "TableId", "SrcIp", "SrcPort", "DstIp", "DstPort", "STvSec", "STvUsec", "LTvSec", "LTvUsec", "ETvSec", "ETvUsec", "InputPackets", "OutputPackets", "InputBytes", "OutputBytes", "Protocol", "AppId", "AppGroupId", "ProbeIf", "AppStyle", "TimeFlag", "VlanId", "MplsLabel", "Tos", });
com.yuandian.dataflow.proto.Base.getDescriptor();
}
diff --git a/src/main/java/com/yuandian/dataflow/proto/msgtype/BacktrackingFlowOuterClass.java b/src/main/java/com/yuandian/dataflow/proto/msgtype/BacktrackingFlowOuterClass.java
index 12cf3b1..12b0fe6 100644
--- a/src/main/java/com/yuandian/dataflow/proto/msgtype/BacktrackingFlowOuterClass.java
+++ b/src/main/java/com/yuandian/dataflow/proto/msgtype/BacktrackingFlowOuterClass.java
@@ -41,16 +41,34 @@ public final class BacktrackingFlowOuterClass {
long getMacDst();
/**
- * int64 ip_src = 4;
+ * .dataflow.IPAddress ip_src = 4;
+ * @return Whether the ipSrc field is set.
+ */
+ boolean hasIpSrc();
+ /**
+ * .dataflow.IPAddress ip_src = 4;
* @return The ipSrc.
*/
- long getIpSrc();
+ com.yuandian.dataflow.proto.Base.IPAddress getIpSrc();
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpSrcOrBuilder();
/**
- * int64 ip_dst = 5;
+ * .dataflow.IPAddress ip_dst = 5;
+ * @return Whether the ipDst field is set.
+ */
+ boolean hasIpDst();
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
* @return The ipDst.
*/
- long getIpDst();
+ com.yuandian.dataflow.proto.Base.IPAddress getIpDst();
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpDstOrBuilder();
/**
* int32 port_src = 6;
@@ -196,14 +214,30 @@ public final class BacktrackingFlowOuterClass {
macDst_ = input.readInt64();
break;
}
- case 32: {
+ case 34: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (ipSrc_ != null) {
+ subBuilder = ipSrc_.toBuilder();
+ }
+ ipSrc_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(ipSrc_);
+ ipSrc_ = subBuilder.buildPartial();
+ }
- ipSrc_ = input.readInt64();
break;
}
- case 40: {
+ case 42: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (ipDst_ != null) {
+ subBuilder = ipDst_.toBuilder();
+ }
+ ipDst_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(ipDst_);
+ ipDst_ = subBuilder.buildPartial();
+ }
- ipDst_ = input.readInt64();
break;
}
case 48: {
@@ -348,25 +382,55 @@ public final class BacktrackingFlowOuterClass {
}
public static final int IP_SRC_FIELD_NUMBER = 4;
- private long ipSrc_;
+ private com.yuandian.dataflow.proto.Base.IPAddress ipSrc_;
/**
- * int64 ip_src = 4;
+ * .dataflow.IPAddress ip_src = 4;
+ * @return Whether the ipSrc field is set.
+ */
+ @java.lang.Override
+ public boolean hasIpSrc() {
+ return ipSrc_ != null;
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
* @return The ipSrc.
*/
@java.lang.Override
- public long getIpSrc() {
- return ipSrc_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getIpSrc() {
+ return ipSrc_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipSrc_;
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpSrcOrBuilder() {
+ return getIpSrc();
}
public static final int IP_DST_FIELD_NUMBER = 5;
- private long ipDst_;
+ private com.yuandian.dataflow.proto.Base.IPAddress ipDst_;
/**
- * int64 ip_dst = 5;
+ * .dataflow.IPAddress ip_dst = 5;
+ * @return Whether the ipDst field is set.
+ */
+ @java.lang.Override
+ public boolean hasIpDst() {
+ return ipDst_ != null;
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
* @return The ipDst.
*/
@java.lang.Override
- public long getIpDst() {
- return ipDst_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getIpDst() {
+ return ipDst_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipDst_;
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpDstOrBuilder() {
+ return getIpDst();
}
public static final int PORT_SRC_FIELD_NUMBER = 6;
@@ -546,11 +610,11 @@ public final class BacktrackingFlowOuterClass {
if (macDst_ != 0L) {
output.writeInt64(3, macDst_);
}
- if (ipSrc_ != 0L) {
- output.writeInt64(4, ipSrc_);
+ if (ipSrc_ != null) {
+ output.writeMessage(4, getIpSrc());
}
- if (ipDst_ != 0L) {
- output.writeInt64(5, ipDst_);
+ if (ipDst_ != null) {
+ output.writeMessage(5, getIpDst());
}
if (portSrc_ != 0) {
output.writeInt32(6, portSrc_);
@@ -615,13 +679,13 @@ public final class BacktrackingFlowOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(3, macDst_);
}
- if (ipSrc_ != 0L) {
+ if (ipSrc_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeInt64Size(4, ipSrc_);
+ .computeMessageSize(4, getIpSrc());
}
- if (ipDst_ != 0L) {
+ if (ipDst_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeInt64Size(5, ipDst_);
+ .computeMessageSize(5, getIpDst());
}
if (portSrc_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -700,10 +764,16 @@ public final class BacktrackingFlowOuterClass {
!= other.getMacSrc()) return false;
if (getMacDst()
!= other.getMacDst()) return false;
- if (getIpSrc()
- != other.getIpSrc()) return false;
- if (getIpDst()
- != other.getIpDst()) return false;
+ if (hasIpSrc() != other.hasIpSrc()) return false;
+ if (hasIpSrc()) {
+ if (!getIpSrc()
+ .equals(other.getIpSrc())) return false;
+ }
+ if (hasIpDst() != other.hasIpDst()) return false;
+ if (hasIpDst()) {
+ if (!getIpDst()
+ .equals(other.getIpDst())) return false;
+ }
if (getPortSrc()
!= other.getPortSrc()) return false;
if (getPortDst()
@@ -751,12 +821,14 @@ public final class BacktrackingFlowOuterClass {
hash = (37 * hash) + MAC_DST_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
getMacDst());
- hash = (37 * hash) + IP_SRC_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
- getIpSrc());
- hash = (37 * hash) + IP_DST_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
- getIpDst());
+ if (hasIpSrc()) {
+ hash = (37 * hash) + IP_SRC_FIELD_NUMBER;
+ hash = (53 * hash) + getIpSrc().hashCode();
+ }
+ if (hasIpDst()) {
+ hash = (37 * hash) + IP_DST_FIELD_NUMBER;
+ hash = (53 * hash) + getIpDst().hashCode();
+ }
hash = (37 * hash) + PORT_SRC_FIELD_NUMBER;
hash = (53 * hash) + getPortSrc();
hash = (37 * hash) + PORT_DST_FIELD_NUMBER;
@@ -929,10 +1001,18 @@ public final class BacktrackingFlowOuterClass {
macDst_ = 0L;
- ipSrc_ = 0L;
-
- ipDst_ = 0L;
-
+ if (ipSrcBuilder_ == null) {
+ ipSrc_ = null;
+ } else {
+ ipSrc_ = null;
+ ipSrcBuilder_ = null;
+ }
+ if (ipDstBuilder_ == null) {
+ ipDst_ = null;
+ } else {
+ ipDst_ = null;
+ ipDstBuilder_ = null;
+ }
portSrc_ = 0;
portDst_ = 0;
@@ -990,8 +1070,16 @@ public final class BacktrackingFlowOuterClass {
result.tableId_ = tableId_;
result.macSrc_ = macSrc_;
result.macDst_ = macDst_;
- result.ipSrc_ = ipSrc_;
- result.ipDst_ = ipDst_;
+ if (ipSrcBuilder_ == null) {
+ result.ipSrc_ = ipSrc_;
+ } else {
+ result.ipSrc_ = ipSrcBuilder_.build();
+ }
+ if (ipDstBuilder_ == null) {
+ result.ipDst_ = ipDst_;
+ } else {
+ result.ipDst_ = ipDstBuilder_.build();
+ }
result.portSrc_ = portSrc_;
result.portDst_ = portDst_;
result.l3Proto_ = l3Proto_;
@@ -1063,11 +1151,11 @@ public final class BacktrackingFlowOuterClass {
if (other.getMacDst() != 0L) {
setMacDst(other.getMacDst());
}
- if (other.getIpSrc() != 0L) {
- setIpSrc(other.getIpSrc());
+ if (other.hasIpSrc()) {
+ mergeIpSrc(other.getIpSrc());
}
- if (other.getIpDst() != 0L) {
- setIpDst(other.getIpDst());
+ if (other.hasIpDst()) {
+ mergeIpDst(other.getIpDst());
}
if (other.getPortSrc() != 0) {
setPortSrc(other.getPortSrc());
@@ -1245,67 +1333,243 @@ public final class BacktrackingFlowOuterClass {
return this;
}
- private long ipSrc_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress ipSrc_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> ipSrcBuilder_;
/**
- * int64 ip_src = 4;
+ * .dataflow.IPAddress ip_src = 4;
+ * @return Whether the ipSrc field is set.
+ */
+ public boolean hasIpSrc() {
+ return ipSrcBuilder_ != null || ipSrc_ != null;
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
* @return The ipSrc.
*/
- @java.lang.Override
- public long getIpSrc() {
- return ipSrc_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getIpSrc() {
+ if (ipSrcBuilder_ == null) {
+ return ipSrc_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipSrc_;
+ } else {
+ return ipSrcBuilder_.getMessage();
+ }
}
/**
- * int64 ip_src = 4;
- * @param value The ipSrc to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress ip_src = 4;
*/
- public Builder setIpSrc(long value) {
-
- ipSrc_ = value;
- onChanged();
+ public Builder setIpSrc(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (ipSrcBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ipSrc_ = value;
+ onChanged();
+ } else {
+ ipSrcBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * int64 ip_src = 4;
- * @return This builder for chaining.
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ public Builder setIpSrc(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (ipSrcBuilder_ == null) {
+ ipSrc_ = builderForValue.build();
+ onChanged();
+ } else {
+ ipSrcBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ public Builder mergeIpSrc(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (ipSrcBuilder_ == null) {
+ if (ipSrc_ != null) {
+ ipSrc_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(ipSrc_).mergeFrom(value).buildPartial();
+ } else {
+ ipSrc_ = value;
+ }
+ onChanged();
+ } else {
+ ipSrcBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
*/
public Builder clearIpSrc() {
-
- ipSrc_ = 0L;
- onChanged();
+ if (ipSrcBuilder_ == null) {
+ ipSrc_ = null;
+ onChanged();
+ } else {
+ ipSrc_ = null;
+ ipSrcBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getIpSrcBuilder() {
+
+ onChanged();
+ return getIpSrcFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpSrcOrBuilder() {
+ if (ipSrcBuilder_ != null) {
+ return ipSrcBuilder_.getMessageOrBuilder();
+ } else {
+ return ipSrc_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipSrc_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress ip_src = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getIpSrcFieldBuilder() {
+ if (ipSrcBuilder_ == null) {
+ ipSrcBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getIpSrc(),
+ getParentForChildren(),
+ isClean());
+ ipSrc_ = null;
+ }
+ return ipSrcBuilder_;
+ }
- private long ipDst_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress ipDst_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> ipDstBuilder_;
/**
- * int64 ip_dst = 5;
+ * .dataflow.IPAddress ip_dst = 5;
+ * @return Whether the ipDst field is set.
+ */
+ public boolean hasIpDst() {
+ return ipDstBuilder_ != null || ipDst_ != null;
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
* @return The ipDst.
*/
- @java.lang.Override
- public long getIpDst() {
- return ipDst_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getIpDst() {
+ if (ipDstBuilder_ == null) {
+ return ipDst_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipDst_;
+ } else {
+ return ipDstBuilder_.getMessage();
+ }
}
/**
- * int64 ip_dst = 5;
- * @param value The ipDst to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress ip_dst = 5;
*/
- public Builder setIpDst(long value) {
-
- ipDst_ = value;
- onChanged();
+ public Builder setIpDst(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (ipDstBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ipDst_ = value;
+ onChanged();
+ } else {
+ ipDstBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * int64 ip_dst = 5;
- * @return This builder for chaining.
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ public Builder setIpDst(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (ipDstBuilder_ == null) {
+ ipDst_ = builderForValue.build();
+ onChanged();
+ } else {
+ ipDstBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ public Builder mergeIpDst(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (ipDstBuilder_ == null) {
+ if (ipDst_ != null) {
+ ipDst_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(ipDst_).mergeFrom(value).buildPartial();
+ } else {
+ ipDst_ = value;
+ }
+ onChanged();
+ } else {
+ ipDstBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
*/
public Builder clearIpDst() {
-
- ipDst_ = 0L;
- onChanged();
+ if (ipDstBuilder_ == null) {
+ ipDst_ = null;
+ onChanged();
+ } else {
+ ipDst_ = null;
+ ipDstBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getIpDstBuilder() {
+
+ onChanged();
+ return getIpDstFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getIpDstOrBuilder() {
+ if (ipDstBuilder_ != null) {
+ return ipDstBuilder_.getMessageOrBuilder();
+ } else {
+ return ipDst_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : ipDst_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress ip_dst = 5;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getIpDstFieldBuilder() {
+ if (ipDstBuilder_ == null) {
+ ipDstBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getIpDst(),
+ getParentForChildren(),
+ isClean());
+ ipDst_ = null;
+ }
+ return ipDstBuilder_;
+ }
private int portSrc_ ;
/**
@@ -1808,17 +2072,18 @@ public final class BacktrackingFlowOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\026BacktrackingFlow.proto\022\010dataflow\032\nBase" +
- ".proto\"\331\002\n\020BacktrackingFlow\022\020\n\010table_id\030" +
+ ".proto\"\203\003\n\020BacktrackingFlow\022\020\n\010table_id\030" +
"\001 \001(\005\022\017\n\007mac_src\030\002 \001(\003\022\017\n\007mac_dst\030\003 \001(\003\022" +
- "\016\n\006ip_src\030\004 \001(\003\022\016\n\006ip_dst\030\005 \001(\003\022\020\n\010port_" +
- "src\030\006 \001(\005\022\020\n\010port_dst\030\007 \001(\005\022\020\n\010l3_proto\030" +
- "\010 \001(\005\022\020\n\010l4_proto\030\t \001(\005\022\013\n\003tos\030\n \001(\005\022\017\n\007" +
- "vlan_id\030\013 \001(\005\022\r\n\005bytes\030\014 \001(\004\022\017\n\007packets\030" +
- "\r \001(\004\022\016\n\006tcp_sp\030\016 \001(\004\022\020\n\010tcp_scpn\030\017 \001(\004\022" +
- "\017\n\007tcp_srp\030\020 \001(\004\022\016\n\006app_id\030\021 \001(\r\022\024\n\014app_" +
- "group_id\030\022 \001(\r\022\022\n\nmpls_label\030\023 \001(\005B<\n#co" +
- "m.yuandian.dataflow.proto.msgtypeP\000Z\023../" +
- "grpc-gen;grpcgenb\006proto3"
+ "#\n\006ip_src\030\004 \001(\0132\023.dataflow.IPAddress\022#\n\006" +
+ "ip_dst\030\005 \001(\0132\023.dataflow.IPAddress\022\020\n\010por" +
+ "t_src\030\006 \001(\005\022\020\n\010port_dst\030\007 \001(\005\022\020\n\010l3_prot" +
+ "o\030\010 \001(\005\022\020\n\010l4_proto\030\t \001(\005\022\013\n\003tos\030\n \001(\005\022\017" +
+ "\n\007vlan_id\030\013 \001(\005\022\r\n\005bytes\030\014 \001(\004\022\017\n\007packet" +
+ "s\030\r \001(\004\022\016\n\006tcp_sp\030\016 \001(\004\022\020\n\010tcp_scpn\030\017 \001(" +
+ "\004\022\017\n\007tcp_srp\030\020 \001(\004\022\016\n\006app_id\030\021 \001(\r\022\024\n\014ap" +
+ "p_group_id\030\022 \001(\r\022\022\n\nmpls_label\030\023 \001(\005B<\n#" +
+ "com.yuandian.dataflow.proto.msgtypeP\000Z\023." +
+ "./grpc-gen;grpcgenb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/main/java/com/yuandian/dataflow/proto/msgtype/BussFlowDbOuterClass.java b/src/main/java/com/yuandian/dataflow/proto/msgtype/BussFlowDbOuterClass.java
index c434d3f..c620770 100644
--- a/src/main/java/com/yuandian/dataflow/proto/msgtype/BussFlowDbOuterClass.java
+++ b/src/main/java/com/yuandian/dataflow/proto/msgtype/BussFlowDbOuterClass.java
@@ -179,10 +179,19 @@ public final class BussFlowDbOuterClass {
getDbnameBytes();
/**
- * uint32 request_ip = 23;
+ * .dataflow.IPAddress request_ip = 23;
+ * @return Whether the requestIp field is set.
+ */
+ boolean hasRequestIp();
+ /**
+ * .dataflow.IPAddress request_ip = 23;
* @return The requestIp.
*/
- int getRequestIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getRequestIp();
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getRequestIpOrBuilder();
/**
* uint32 request_port = 24;
@@ -191,10 +200,19 @@ public final class BussFlowDbOuterClass {
int getRequestPort();
/**
- * uint32 response_ip = 25;
+ * .dataflow.IPAddress response_ip = 25;
+ * @return Whether the responseIp field is set.
+ */
+ boolean hasResponseIp();
+ /**
+ * .dataflow.IPAddress response_ip = 25;
* @return The responseIp.
*/
- int getResponseIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getResponseIp();
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getResponseIpOrBuilder();
/**
* uint32 response_port = 26;
@@ -544,9 +562,17 @@ public final class BussFlowDbOuterClass {
dbname_ = s;
break;
}
- case 184: {
+ case 186: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (requestIp_ != null) {
+ subBuilder = requestIp_.toBuilder();
+ }
+ requestIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(requestIp_);
+ requestIp_ = subBuilder.buildPartial();
+ }
- requestIp_ = input.readUInt32();
break;
}
case 192: {
@@ -554,9 +580,17 @@ public final class BussFlowDbOuterClass {
requestPort_ = input.readUInt32();
break;
}
- case 200: {
+ case 202: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (responseIp_ != null) {
+ subBuilder = responseIp_.toBuilder();
+ }
+ responseIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(responseIp_);
+ responseIp_ = subBuilder.buildPartial();
+ }
- responseIp_ = input.readUInt32();
break;
}
case 208: {
@@ -1078,14 +1112,29 @@ public final class BussFlowDbOuterClass {
}
public static final int REQUEST_IP_FIELD_NUMBER = 23;
- private int requestIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress requestIp_;
/**
- * uint32 request_ip = 23;
+ * .dataflow.IPAddress request_ip = 23;
+ * @return Whether the requestIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasRequestIp() {
+ return requestIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
* @return The requestIp.
*/
@java.lang.Override
- public int getRequestIp() {
- return requestIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getRequestIp() {
+ return requestIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : requestIp_;
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getRequestIpOrBuilder() {
+ return getRequestIp();
}
public static final int REQUEST_PORT_FIELD_NUMBER = 24;
@@ -1100,14 +1149,29 @@ public final class BussFlowDbOuterClass {
}
public static final int RESPONSE_IP_FIELD_NUMBER = 25;
- private int responseIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress responseIp_;
/**
- * uint32 response_ip = 25;
+ * .dataflow.IPAddress response_ip = 25;
+ * @return Whether the responseIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasResponseIp() {
+ return responseIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
* @return The responseIp.
*/
@java.lang.Override
- public int getResponseIp() {
- return responseIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getResponseIp() {
+ return responseIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : responseIp_;
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getResponseIpOrBuilder() {
+ return getResponseIp();
}
public static final int RESPONSE_PORT_FIELD_NUMBER = 26;
@@ -1600,14 +1664,14 @@ public final class BussFlowDbOuterClass {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dbname_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 22, dbname_);
}
- if (requestIp_ != 0) {
- output.writeUInt32(23, requestIp_);
+ if (requestIp_ != null) {
+ output.writeMessage(23, getRequestIp());
}
if (requestPort_ != 0) {
output.writeUInt32(24, requestPort_);
}
- if (responseIp_ != 0) {
- output.writeUInt32(25, responseIp_);
+ if (responseIp_ != null) {
+ output.writeMessage(25, getResponseIp());
}
if (responsePort_ != 0) {
output.writeUInt32(26, responsePort_);
@@ -1777,17 +1841,17 @@ public final class BussFlowDbOuterClass {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dbname_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, dbname_);
}
- if (requestIp_ != 0) {
+ if (requestIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(23, requestIp_);
+ .computeMessageSize(23, getRequestIp());
}
if (requestPort_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(24, requestPort_);
}
- if (responseIp_ != 0) {
+ if (responseIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(25, responseIp_);
+ .computeMessageSize(25, getResponseIp());
}
if (responsePort_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -1943,12 +2007,18 @@ public final class BussFlowDbOuterClass {
.equals(other.getChannel())) return false;
if (!getDbname()
.equals(other.getDbname())) return false;
- if (getRequestIp()
- != other.getRequestIp()) return false;
+ if (hasRequestIp() != other.hasRequestIp()) return false;
+ if (hasRequestIp()) {
+ if (!getRequestIp()
+ .equals(other.getRequestIp())) return false;
+ }
if (getRequestPort()
!= other.getRequestPort()) return false;
- if (getResponseIp()
- != other.getResponseIp()) return false;
+ if (hasResponseIp() != other.hasResponseIp()) return false;
+ if (hasResponseIp()) {
+ if (!getResponseIp()
+ .equals(other.getResponseIp())) return false;
+ }
if (getResponsePort()
!= other.getResponsePort()) return false;
if (getStatus()
@@ -2056,12 +2126,16 @@ public final class BussFlowDbOuterClass {
hash = (53 * hash) + getChannel().hashCode();
hash = (37 * hash) + DBNAME_FIELD_NUMBER;
hash = (53 * hash) + getDbname().hashCode();
- hash = (37 * hash) + REQUEST_IP_FIELD_NUMBER;
- hash = (53 * hash) + getRequestIp();
+ if (hasRequestIp()) {
+ hash = (37 * hash) + REQUEST_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getRequestIp().hashCode();
+ }
hash = (37 * hash) + REQUEST_PORT_FIELD_NUMBER;
hash = (53 * hash) + getRequestPort();
- hash = (37 * hash) + RESPONSE_IP_FIELD_NUMBER;
- hash = (53 * hash) + getResponseIp();
+ if (hasResponseIp()) {
+ hash = (37 * hash) + RESPONSE_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getResponseIp().hashCode();
+ }
hash = (37 * hash) + RESPONSE_PORT_FIELD_NUMBER;
hash = (53 * hash) + getResponsePort();
hash = (37 * hash) + STATUS_FIELD_NUMBER;
@@ -2293,12 +2367,20 @@ public final class BussFlowDbOuterClass {
dbname_ = "";
- requestIp_ = 0;
-
+ if (requestIpBuilder_ == null) {
+ requestIp_ = null;
+ } else {
+ requestIp_ = null;
+ requestIpBuilder_ = null;
+ }
requestPort_ = 0;
- responseIp_ = 0;
-
+ if (responseIpBuilder_ == null) {
+ responseIp_ = null;
+ } else {
+ responseIp_ = null;
+ responseIpBuilder_ = null;
+ }
responsePort_ = 0;
status_ = 0L;
@@ -2397,9 +2479,17 @@ public final class BussFlowDbOuterClass {
result.probeIf_ = probeIf_;
result.channel_ = channel_;
result.dbname_ = dbname_;
- result.requestIp_ = requestIp_;
+ if (requestIpBuilder_ == null) {
+ result.requestIp_ = requestIp_;
+ } else {
+ result.requestIp_ = requestIpBuilder_.build();
+ }
result.requestPort_ = requestPort_;
- result.responseIp_ = responseIp_;
+ if (responseIpBuilder_ == null) {
+ result.responseIp_ = responseIp_;
+ } else {
+ result.responseIp_ = responseIpBuilder_.build();
+ }
result.responsePort_ = responsePort_;
result.status_ = status_;
result.serverTranslateTime_ = serverTranslateTime_;
@@ -2543,14 +2633,14 @@ public final class BussFlowDbOuterClass {
dbname_ = other.dbname_;
onChanged();
}
- if (other.getRequestIp() != 0) {
- setRequestIp(other.getRequestIp());
+ if (other.hasRequestIp()) {
+ mergeRequestIp(other.getRequestIp());
}
if (other.getRequestPort() != 0) {
setRequestPort(other.getRequestPort());
}
- if (other.getResponseIp() != 0) {
- setResponseIp(other.getResponseIp());
+ if (other.hasResponseIp()) {
+ mergeResponseIp(other.getResponseIp());
}
if (other.getResponsePort() != 0) {
setResponsePort(other.getResponsePort());
@@ -3535,36 +3625,124 @@ public final class BussFlowDbOuterClass {
return this;
}
- private int requestIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress requestIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> requestIpBuilder_;
/**
- * uint32 request_ip = 23;
+ * .dataflow.IPAddress request_ip = 23;
+ * @return Whether the requestIp field is set.
+ */
+ public boolean hasRequestIp() {
+ return requestIpBuilder_ != null || requestIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
* @return The requestIp.
*/
- @java.lang.Override
- public int getRequestIp() {
- return requestIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getRequestIp() {
+ if (requestIpBuilder_ == null) {
+ return requestIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : requestIp_;
+ } else {
+ return requestIpBuilder_.getMessage();
+ }
}
/**
- * uint32 request_ip = 23;
- * @param value The requestIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress request_ip = 23;
*/
- public Builder setRequestIp(int value) {
-
- requestIp_ = value;
- onChanged();
+ public Builder setRequestIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (requestIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ requestIp_ = value;
+ onChanged();
+ } else {
+ requestIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 request_ip = 23;
- * @return This builder for chaining.
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ public Builder setRequestIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (requestIpBuilder_ == null) {
+ requestIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ requestIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ public Builder mergeRequestIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (requestIpBuilder_ == null) {
+ if (requestIp_ != null) {
+ requestIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(requestIp_).mergeFrom(value).buildPartial();
+ } else {
+ requestIp_ = value;
+ }
+ onChanged();
+ } else {
+ requestIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
*/
public Builder clearRequestIp() {
-
- requestIp_ = 0;
- onChanged();
+ if (requestIpBuilder_ == null) {
+ requestIp_ = null;
+ onChanged();
+ } else {
+ requestIp_ = null;
+ requestIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getRequestIpBuilder() {
+
+ onChanged();
+ return getRequestIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getRequestIpOrBuilder() {
+ if (requestIpBuilder_ != null) {
+ return requestIpBuilder_.getMessageOrBuilder();
+ } else {
+ return requestIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : requestIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress request_ip = 23;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getRequestIpFieldBuilder() {
+ if (requestIpBuilder_ == null) {
+ requestIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getRequestIp(),
+ getParentForChildren(),
+ isClean());
+ requestIp_ = null;
+ }
+ return requestIpBuilder_;
+ }
private int requestPort_ ;
/**
@@ -3597,36 +3775,124 @@ public final class BussFlowDbOuterClass {
return this;
}
- private int responseIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress responseIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> responseIpBuilder_;
/**
- * uint32 response_ip = 25;
+ * .dataflow.IPAddress response_ip = 25;
+ * @return Whether the responseIp field is set.
+ */
+ public boolean hasResponseIp() {
+ return responseIpBuilder_ != null || responseIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
* @return The responseIp.
*/
- @java.lang.Override
- public int getResponseIp() {
- return responseIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getResponseIp() {
+ if (responseIpBuilder_ == null) {
+ return responseIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : responseIp_;
+ } else {
+ return responseIpBuilder_.getMessage();
+ }
}
/**
- * uint32 response_ip = 25;
- * @param value The responseIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress response_ip = 25;
*/
- public Builder setResponseIp(int value) {
-
- responseIp_ = value;
- onChanged();
+ public Builder setResponseIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (responseIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ responseIp_ = value;
+ onChanged();
+ } else {
+ responseIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 response_ip = 25;
- * @return This builder for chaining.
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ public Builder setResponseIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (responseIpBuilder_ == null) {
+ responseIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ responseIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ public Builder mergeResponseIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (responseIpBuilder_ == null) {
+ if (responseIp_ != null) {
+ responseIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(responseIp_).mergeFrom(value).buildPartial();
+ } else {
+ responseIp_ = value;
+ }
+ onChanged();
+ } else {
+ responseIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
*/
public Builder clearResponseIp() {
-
- responseIp_ = 0;
- onChanged();
+ if (responseIpBuilder_ == null) {
+ responseIp_ = null;
+ onChanged();
+ } else {
+ responseIp_ = null;
+ responseIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getResponseIpBuilder() {
+
+ onChanged();
+ return getResponseIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getResponseIpOrBuilder() {
+ if (responseIpBuilder_ != null) {
+ return responseIpBuilder_.getMessageOrBuilder();
+ } else {
+ return responseIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : responseIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress response_ip = 25;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getResponseIpFieldBuilder() {
+ if (responseIpBuilder_ == null) {
+ responseIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getResponseIp(),
+ getParentForChildren(),
+ isClean());
+ responseIp_ = null;
+ }
+ return responseIpBuilder_;
+ }
private int responsePort_ ;
/**
@@ -4695,7 +4961,7 @@ public final class BussFlowDbOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\020BussFlowDb.proto\022\010dataflow\032\nBase.proto" +
- "\"\372\010\n\nBussFlowDb\022\020\n\010table_id\030\001 \001(\005\022\020\n\010msg" +
+ "\"\244\t\n\nBussFlowDb\022\020\n\010table_id\030\001 \001(\005\022\020\n\010msg" +
"_type\030\002 \001(\r\022\023\n\013msg_version\030\003 \001(\t\022\017\n\007msg_" +
"seq\030\004 \001(\r\022\017\n\007msg_len\030\005 \001(\r\022\017\n\007src_mac\030\006 " +
"\001(\004\022\017\n\007dst_mac\030\007 \001(\004\022\017\n\007vlan_id\030\010 \001(\r\022\013\n" +
@@ -4706,26 +4972,27 @@ public final class BussFlowDbOuterClass {
"s\030\020 \001(\r\022\027\n\017request_packets\030\021 \001(\r\022\017\n\007seq_" +
"ack\030\022 \001(\t\022\024\n\014recog_status\030\023 \001(\r\022\020\n\010probe" +
"_if\030\024 \001(\r\022\017\n\007channel\030\025 \001(\t\022\016\n\006dbname\030\026 \001" +
- "(\t\022\022\n\nrequest_ip\030\027 \001(\r\022\024\n\014request_port\030\030" +
- " \001(\r\022\023\n\013response_ip\030\031 \001(\r\022\025\n\rresponse_po" +
- "rt\030\032 \001(\r\022\016\n\006status\030\033 \001(\003\022\035\n\025server_trans" +
- "late_time\030\034 \001(\003\022\035\n\025client_translate_time" +
- "\030\035 \001(\003\022\034\n\024server_response_time\030\036 \001(\003\022)\n!" +
- "server_response_start_time_tv_sec\030\037 \001(\r\022" +
- "*\n\"server_response_start_time_tv_usec\030 " +
- "\001(\r\022\'\n\037server_response_end_time_tv_sec\030!" +
- " \001(\r\022(\n server_response_end_time_tv_usec" +
- "\030\" \001(\r\022\031\n\021start_time_tv_sec\030# \001(\r\022\032\n\022sta" +
- "rt_time_tv_usec\030$ \001(\r\022\027\n\017end_time_tv_sec" +
- "\030% \001(\r\022\030\n\020end_time_tv_usec\030& \001(\r\022\025\n\ris_u" +
- "ncomplete\030\' \001(\005\022\021\n\ttime_flag\030( \001(\r\022\017\n\007sq" +
- "l_len\030) \001(\r\022\026\n\016detail_msg_len\030* \001(\r\022\017\n\007r" +
- "eq_len\030+ \001(\r\022\017\n\007res_len\030, \001(\r\022\024\n\014reserve" +
- "d_len\030- \001(\r\022\013\n\003sql\030. \001(\t\022\035\n\025bussiness_de" +
- "tail_mesg\030/ \001(\t\022\020\n\010req_data\0300 \001(\t\022\020\n\010res" +
- "_data\0301 \001(\t\022\020\n\010reserved\0302 \001(\tB<\n#com.yua" +
- "ndian.dataflow.proto.msgtypeP\000Z\023../grpc-" +
- "gen;grpcgenb\006proto3"
+ "(\t\022\'\n\nrequest_ip\030\027 \001(\0132\023.dataflow.IPAddr" +
+ "ess\022\024\n\014request_port\030\030 \001(\r\022(\n\013response_ip" +
+ "\030\031 \001(\0132\023.dataflow.IPAddress\022\025\n\rresponse_" +
+ "port\030\032 \001(\r\022\016\n\006status\030\033 \001(\003\022\035\n\025server_tra" +
+ "nslate_time\030\034 \001(\003\022\035\n\025client_translate_ti" +
+ "me\030\035 \001(\003\022\034\n\024server_response_time\030\036 \001(\003\022)" +
+ "\n!server_response_start_time_tv_sec\030\037 \001(" +
+ "\r\022*\n\"server_response_start_time_tv_usec\030" +
+ " \001(\r\022\'\n\037server_response_end_time_tv_sec" +
+ "\030! \001(\r\022(\n server_response_end_time_tv_us" +
+ "ec\030\" \001(\r\022\031\n\021start_time_tv_sec\030# \001(\r\022\032\n\022s" +
+ "tart_time_tv_usec\030$ \001(\r\022\027\n\017end_time_tv_s" +
+ "ec\030% \001(\r\022\030\n\020end_time_tv_usec\030& \001(\r\022\025\n\ris" +
+ "_uncomplete\030\' \001(\005\022\021\n\ttime_flag\030( \001(\r\022\017\n\007" +
+ "sql_len\030) \001(\r\022\026\n\016detail_msg_len\030* \001(\r\022\017\n" +
+ "\007req_len\030+ \001(\r\022\017\n\007res_len\030, \001(\r\022\024\n\014reser" +
+ "ved_len\030- \001(\r\022\013\n\003sql\030. \001(\t\022\035\n\025bussiness_" +
+ "detail_mesg\030/ \001(\t\022\020\n\010req_data\0300 \001(\t\022\020\n\010r" +
+ "es_data\0301 \001(\t\022\020\n\010reserved\0302 \001(\tB<\n#com.y" +
+ "uandian.dataflow.proto.msgtypeP\000Z\023../grp" +
+ "c-gen;grpcgenb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/main/java/com/yuandian/dataflow/proto/msgtype/UsrFlowOuterClass.java b/src/main/java/com/yuandian/dataflow/proto/msgtype/UsrFlowOuterClass.java
index e88f103..a829cdc 100644
--- a/src/main/java/com/yuandian/dataflow/proto/msgtype/UsrFlowOuterClass.java
+++ b/src/main/java/com/yuandian/dataflow/proto/msgtype/UsrFlowOuterClass.java
@@ -20,7 +20,7 @@ public final class UsrFlowOuterClass {
/**
*
- *编号19
+ *编号19
*
*
* int32 table_id = 1;
@@ -35,16 +35,34 @@ public final class UsrFlowOuterClass {
int getProbeIf();
/**
- * uint32 server_ip = 3;
+ * .dataflow.IPAddress server_ip = 3;
+ * @return Whether the serverIp field is set.
+ */
+ boolean hasServerIp();
+ /**
+ * .dataflow.IPAddress server_ip = 3;
* @return The serverIp.
*/
- int getServerIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getServerIp();
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getServerIpOrBuilder();
/**
- * uint32 client_ip = 4;
+ * .dataflow.IPAddress client_ip = 4;
+ * @return Whether the clientIp field is set.
+ */
+ boolean hasClientIp();
+ /**
+ * .dataflow.IPAddress client_ip = 4;
* @return The clientIp.
*/
- int getClientIp();
+ com.yuandian.dataflow.proto.Base.IPAddress getClientIp();
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getClientIpOrBuilder();
/**
* uint32 client_port = 5;
@@ -285,14 +303,30 @@ public final class UsrFlowOuterClass {
probeIf_ = input.readUInt32();
break;
}
- case 24: {
+ case 26: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (serverIp_ != null) {
+ subBuilder = serverIp_.toBuilder();
+ }
+ serverIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(serverIp_);
+ serverIp_ = subBuilder.buildPartial();
+ }
- serverIp_ = input.readUInt32();
break;
}
- case 32: {
+ case 34: {
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder subBuilder = null;
+ if (clientIp_ != null) {
+ subBuilder = clientIp_.toBuilder();
+ }
+ clientIp_ = input.readMessage(com.yuandian.dataflow.proto.Base.IPAddress.parser(), extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(clientIp_);
+ clientIp_ = subBuilder.buildPartial();
+ }
- clientIp_ = input.readUInt32();
break;
}
case 40: {
@@ -467,7 +501,7 @@ public final class UsrFlowOuterClass {
private int tableId_;
/**
*
- *编号19
+ *编号19
*
*
* int32 table_id = 1;
@@ -490,25 +524,55 @@ public final class UsrFlowOuterClass {
}
public static final int SERVER_IP_FIELD_NUMBER = 3;
- private int serverIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress serverIp_;
/**
- * uint32 server_ip = 3;
+ * .dataflow.IPAddress server_ip = 3;
+ * @return Whether the serverIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasServerIp() {
+ return serverIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
* @return The serverIp.
*/
@java.lang.Override
- public int getServerIp() {
- return serverIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getServerIp() {
+ return serverIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : serverIp_;
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getServerIpOrBuilder() {
+ return getServerIp();
}
public static final int CLIENT_IP_FIELD_NUMBER = 4;
- private int clientIp_;
+ private com.yuandian.dataflow.proto.Base.IPAddress clientIp_;
/**
- * uint32 client_ip = 4;
+ * .dataflow.IPAddress client_ip = 4;
+ * @return Whether the clientIp field is set.
+ */
+ @java.lang.Override
+ public boolean hasClientIp() {
+ return clientIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
* @return The clientIp.
*/
@java.lang.Override
- public int getClientIp() {
- return clientIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getClientIp() {
+ return clientIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : clientIp_;
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ @java.lang.Override
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getClientIpOrBuilder() {
+ return getClientIp();
}
public static final int CLIENT_PORT_FIELD_NUMBER = 5;
@@ -925,11 +989,11 @@ public final class UsrFlowOuterClass {
if (probeIf_ != 0) {
output.writeUInt32(2, probeIf_);
}
- if (serverIp_ != 0) {
- output.writeUInt32(3, serverIp_);
+ if (serverIp_ != null) {
+ output.writeMessage(3, getServerIp());
}
- if (clientIp_ != 0) {
- output.writeUInt32(4, clientIp_);
+ if (clientIp_ != null) {
+ output.writeMessage(4, getClientIp());
}
if (clientPort_ != 0) {
output.writeUInt32(5, clientPort_);
@@ -1026,13 +1090,13 @@ public final class UsrFlowOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(2, probeIf_);
}
- if (serverIp_ != 0) {
+ if (serverIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(3, serverIp_);
+ .computeMessageSize(3, getServerIp());
}
- if (clientIp_ != 0) {
+ if (clientIp_ != null) {
size += com.google.protobuf.CodedOutputStream
- .computeUInt32Size(4, clientIp_);
+ .computeMessageSize(4, getClientIp());
}
if (clientPort_ != 0) {
size += com.google.protobuf.CodedOutputStream
@@ -1153,10 +1217,16 @@ public final class UsrFlowOuterClass {
!= other.getTableId()) return false;
if (getProbeIf()
!= other.getProbeIf()) return false;
- if (getServerIp()
- != other.getServerIp()) return false;
- if (getClientIp()
- != other.getClientIp()) return false;
+ if (hasServerIp() != other.hasServerIp()) return false;
+ if (hasServerIp()) {
+ if (!getServerIp()
+ .equals(other.getServerIp())) return false;
+ }
+ if (hasClientIp() != other.hasClientIp()) return false;
+ if (hasClientIp()) {
+ if (!getClientIp()
+ .equals(other.getClientIp())) return false;
+ }
if (getClientPort()
!= other.getClientPort()) return false;
if (getClientRtt()
@@ -1224,10 +1294,14 @@ public final class UsrFlowOuterClass {
hash = (53 * hash) + getTableId();
hash = (37 * hash) + PROBE_IF_FIELD_NUMBER;
hash = (53 * hash) + getProbeIf();
- hash = (37 * hash) + SERVER_IP_FIELD_NUMBER;
- hash = (53 * hash) + getServerIp();
- hash = (37 * hash) + CLIENT_IP_FIELD_NUMBER;
- hash = (53 * hash) + getClientIp();
+ if (hasServerIp()) {
+ hash = (37 * hash) + SERVER_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getServerIp().hashCode();
+ }
+ if (hasClientIp()) {
+ hash = (37 * hash) + CLIENT_IP_FIELD_NUMBER;
+ hash = (53 * hash) + getClientIp().hashCode();
+ }
hash = (37 * hash) + CLIENT_PORT_FIELD_NUMBER;
hash = (53 * hash) + getClientPort();
hash = (37 * hash) + CLIENT_RTT_FIELD_NUMBER;
@@ -1417,10 +1491,18 @@ public final class UsrFlowOuterClass {
probeIf_ = 0;
- serverIp_ = 0;
-
- clientIp_ = 0;
-
+ if (serverIpBuilder_ == null) {
+ serverIp_ = null;
+ } else {
+ serverIp_ = null;
+ serverIpBuilder_ = null;
+ }
+ if (clientIpBuilder_ == null) {
+ clientIp_ = null;
+ } else {
+ clientIp_ = null;
+ clientIpBuilder_ = null;
+ }
clientPort_ = 0;
clientRtt_ = 0;
@@ -1501,8 +1583,16 @@ public final class UsrFlowOuterClass {
com.yuandian.dataflow.proto.msgtype.UsrFlowOuterClass.UsrFlow result = new com.yuandian.dataflow.proto.msgtype.UsrFlowOuterClass.UsrFlow(this);
result.tableId_ = tableId_;
result.probeIf_ = probeIf_;
- result.serverIp_ = serverIp_;
- result.clientIp_ = clientIp_;
+ if (serverIpBuilder_ == null) {
+ result.serverIp_ = serverIp_;
+ } else {
+ result.serverIp_ = serverIpBuilder_.build();
+ }
+ if (clientIpBuilder_ == null) {
+ result.clientIp_ = clientIp_;
+ } else {
+ result.clientIp_ = clientIpBuilder_.build();
+ }
result.clientPort_ = clientPort_;
result.clientRtt_ = clientRtt_;
result.serverRtt_ = serverRtt_;
@@ -1583,11 +1673,11 @@ public final class UsrFlowOuterClass {
if (other.getProbeIf() != 0) {
setProbeIf(other.getProbeIf());
}
- if (other.getServerIp() != 0) {
- setServerIp(other.getServerIp());
+ if (other.hasServerIp()) {
+ mergeServerIp(other.getServerIp());
}
- if (other.getClientIp() != 0) {
- setClientIp(other.getClientIp());
+ if (other.hasClientIp()) {
+ mergeClientIp(other.getClientIp());
}
if (other.getClientPort() != 0) {
setClientPort(other.getClientPort());
@@ -1703,7 +1793,7 @@ public final class UsrFlowOuterClass {
private int tableId_ ;
/**
*
- *编号19
+ *编号19
*
*
* int32 table_id = 1;
@@ -1715,7 +1805,7 @@ public final class UsrFlowOuterClass {
}
/**
*
- *编号19
+ *编号19
*
*
* int32 table_id = 1;
@@ -1730,7 +1820,7 @@ public final class UsrFlowOuterClass {
}
/**
*
- *编号19
+ *编号19
*
*
* int32 table_id = 1;
@@ -1774,67 +1864,243 @@ public final class UsrFlowOuterClass {
return this;
}
- private int serverIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress serverIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> serverIpBuilder_;
/**
- * uint32 server_ip = 3;
+ * .dataflow.IPAddress server_ip = 3;
+ * @return Whether the serverIp field is set.
+ */
+ public boolean hasServerIp() {
+ return serverIpBuilder_ != null || serverIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
* @return The serverIp.
*/
- @java.lang.Override
- public int getServerIp() {
- return serverIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getServerIp() {
+ if (serverIpBuilder_ == null) {
+ return serverIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : serverIp_;
+ } else {
+ return serverIpBuilder_.getMessage();
+ }
}
/**
- * uint32 server_ip = 3;
- * @param value The serverIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress server_ip = 3;
*/
- public Builder setServerIp(int value) {
-
- serverIp_ = value;
- onChanged();
+ public Builder setServerIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (serverIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ serverIp_ = value;
+ onChanged();
+ } else {
+ serverIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 server_ip = 3;
- * @return This builder for chaining.
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ public Builder setServerIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (serverIpBuilder_ == null) {
+ serverIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ serverIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ public Builder mergeServerIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (serverIpBuilder_ == null) {
+ if (serverIp_ != null) {
+ serverIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(serverIp_).mergeFrom(value).buildPartial();
+ } else {
+ serverIp_ = value;
+ }
+ onChanged();
+ } else {
+ serverIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
*/
public Builder clearServerIp() {
-
- serverIp_ = 0;
- onChanged();
+ if (serverIpBuilder_ == null) {
+ serverIp_ = null;
+ onChanged();
+ } else {
+ serverIp_ = null;
+ serverIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getServerIpBuilder() {
+
+ onChanged();
+ return getServerIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getServerIpOrBuilder() {
+ if (serverIpBuilder_ != null) {
+ return serverIpBuilder_.getMessageOrBuilder();
+ } else {
+ return serverIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : serverIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress server_ip = 3;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getServerIpFieldBuilder() {
+ if (serverIpBuilder_ == null) {
+ serverIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getServerIp(),
+ getParentForChildren(),
+ isClean());
+ serverIp_ = null;
+ }
+ return serverIpBuilder_;
+ }
- private int clientIp_ ;
+ private com.yuandian.dataflow.proto.Base.IPAddress clientIp_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder> clientIpBuilder_;
/**
- * uint32 client_ip = 4;
+ * .dataflow.IPAddress client_ip = 4;
+ * @return Whether the clientIp field is set.
+ */
+ public boolean hasClientIp() {
+ return clientIpBuilder_ != null || clientIp_ != null;
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
* @return The clientIp.
*/
- @java.lang.Override
- public int getClientIp() {
- return clientIp_;
+ public com.yuandian.dataflow.proto.Base.IPAddress getClientIp() {
+ if (clientIpBuilder_ == null) {
+ return clientIp_ == null ? com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : clientIp_;
+ } else {
+ return clientIpBuilder_.getMessage();
+ }
}
/**
- * uint32 client_ip = 4;
- * @param value The clientIp to set.
- * @return This builder for chaining.
+ * .dataflow.IPAddress client_ip = 4;
*/
- public Builder setClientIp(int value) {
-
- clientIp_ = value;
- onChanged();
+ public Builder setClientIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (clientIpBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ clientIp_ = value;
+ onChanged();
+ } else {
+ clientIpBuilder_.setMessage(value);
+ }
+
return this;
}
/**
- * uint32 client_ip = 4;
- * @return This builder for chaining.
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ public Builder setClientIp(
+ com.yuandian.dataflow.proto.Base.IPAddress.Builder builderForValue) {
+ if (clientIpBuilder_ == null) {
+ clientIp_ = builderForValue.build();
+ onChanged();
+ } else {
+ clientIpBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ public Builder mergeClientIp(com.yuandian.dataflow.proto.Base.IPAddress value) {
+ if (clientIpBuilder_ == null) {
+ if (clientIp_ != null) {
+ clientIp_ =
+ com.yuandian.dataflow.proto.Base.IPAddress.newBuilder(clientIp_).mergeFrom(value).buildPartial();
+ } else {
+ clientIp_ = value;
+ }
+ onChanged();
+ } else {
+ clientIpBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
*/
public Builder clearClientIp() {
-
- clientIp_ = 0;
- onChanged();
+ if (clientIpBuilder_ == null) {
+ clientIp_ = null;
+ onChanged();
+ } else {
+ clientIp_ = null;
+ clientIpBuilder_ = null;
+ }
+
return this;
}
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddress.Builder getClientIpBuilder() {
+
+ onChanged();
+ return getClientIpFieldBuilder().getBuilder();
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ public com.yuandian.dataflow.proto.Base.IPAddressOrBuilder getClientIpOrBuilder() {
+ if (clientIpBuilder_ != null) {
+ return clientIpBuilder_.getMessageOrBuilder();
+ } else {
+ return clientIp_ == null ?
+ com.yuandian.dataflow.proto.Base.IPAddress.getDefaultInstance() : clientIp_;
+ }
+ }
+ /**
+ * .dataflow.IPAddress client_ip = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>
+ getClientIpFieldBuilder() {
+ if (clientIpBuilder_ == null) {
+ clientIpBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ com.yuandian.dataflow.proto.Base.IPAddress, com.yuandian.dataflow.proto.Base.IPAddress.Builder, com.yuandian.dataflow.proto.Base.IPAddressOrBuilder>(
+ getClientIp(),
+ getParentForChildren(),
+ isClean());
+ clientIp_ = null;
+ }
+ return clientIpBuilder_;
+ }
private int clientPort_ ;
/**
@@ -2888,29 +3154,31 @@ public final class UsrFlowOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\rUsrFlow.proto\022\010dataflow\"\371\004\n\007UsrFlow\022\020\n" +
- "\010table_id\030\001 \001(\005\022\020\n\010probe_if\030\002 \001(\r\022\021\n\tser" +
- "ver_ip\030\003 \001(\r\022\021\n\tclient_ip\030\004 \001(\r\022\023\n\013clien" +
- "t_port\030\005 \001(\r\022\022\n\nclient_rtt\030\006 \001(\r\022\022\n\nserv" +
- "er_rtt\030\007 \001(\r\022\020\n\010s_tv_sec\030\010 \001(\r\022\021\n\ts_tv_u" +
- "sec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(\r\022\021\n\te_tv_usec" +
- "\030\013 \001(\r\022\024\n\014server_think\030\014 \001(\r\022\021\n\tpage_siz" +
- "e\030\r \001(\r\022\016\n\006app_id\030\016 \001(\r\022\024\n\014app_group_id\030" +
- "\017 \001(\r\022\023\n\013request_url\030\020 \001(\t\022\023\n\013referer_ur" +
- "l\030\021 \001(\t\022\023\n\013return_code\030\022 \001(\r\022\022\n\nerr_tv_s" +
- "ec\030\023 \001(\r\022\023\n\013err_tv_usec\030\024 \001(\r\022\027\n\017client_" +
- "loss_pkt\030\025 \001(\r\022\027\n\017server_loss_pkt\030\026 \001(\r\022" +
- "\024\n\014client_bytes\030\027 \001(\r\022\024\n\014server_bytes\030\030 " +
- "\001(\r\022\026\n\016client_packets\030\031 \001(\r\022\026\n\016server_pa" +
- "ckets\030\032 \001(\r\022\022\n\nuser_agent\030\033 \001(\t\022\024\n\014conte" +
- "nt_type\030\034 \001(\t\022\033\n\023request_transfer_tm\030\035 \001" +
- "(\r\022\021\n\ttime_flag\030\036 \001(\rB<\n#com.yuandian.da" +
- "taflow.proto.msgtypeP\000Z\023../grpc-gen;grpc" +
- "genb\006proto3"
+ "\n\rUsrFlow.proto\022\010dataflow\032\nBase.proto\"\243\005" +
+ "\n\007UsrFlow\022\020\n\010table_id\030\001 \001(\005\022\020\n\010probe_if\030" +
+ "\002 \001(\r\022&\n\tserver_ip\030\003 \001(\0132\023.dataflow.IPAd" +
+ "dress\022&\n\tclient_ip\030\004 \001(\0132\023.dataflow.IPAd" +
+ "dress\022\023\n\013client_port\030\005 \001(\r\022\022\n\nclient_rtt" +
+ "\030\006 \001(\r\022\022\n\nserver_rtt\030\007 \001(\r\022\020\n\010s_tv_sec\030\010" +
+ " \001(\r\022\021\n\ts_tv_usec\030\t \001(\r\022\020\n\010e_tv_sec\030\n \001(" +
+ "\r\022\021\n\te_tv_usec\030\013 \001(\r\022\024\n\014server_think\030\014 \001" +
+ "(\r\022\021\n\tpage_size\030\r \001(\r\022\016\n\006app_id\030\016 \001(\r\022\024\n" +
+ "\014app_group_id\030\017 \001(\r\022\023\n\013request_url\030\020 \001(\t" +
+ "\022\023\n\013referer_url\030\021 \001(\t\022\023\n\013return_code\030\022 \001" +
+ "(\r\022\022\n\nerr_tv_sec\030\023 \001(\r\022\023\n\013err_tv_usec\030\024 " +
+ "\001(\r\022\027\n\017client_loss_pkt\030\025 \001(\r\022\027\n\017server_l" +
+ "oss_pkt\030\026 \001(\r\022\024\n\014client_bytes\030\027 \001(\r\022\024\n\014s" +
+ "erver_bytes\030\030 \001(\r\022\026\n\016client_packets\030\031 \001(" +
+ "\r\022\026\n\016server_packets\030\032 \001(\r\022\022\n\nuser_agent\030" +
+ "\033 \001(\t\022\024\n\014content_type\030\034 \001(\t\022\033\n\023request_t" +
+ "ransfer_tm\030\035 \001(\r\022\021\n\ttime_flag\030\036 \001(\rB<\n#c" +
+ "om.yuandian.dataflow.proto.msgtypeP\000Z\023.." +
+ "/grpc-gen;grpcgenb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
+ com.yuandian.dataflow.proto.Base.getDescriptor(),
});
internal_static_dataflow_UsrFlow_descriptor =
getDescriptor().getMessageTypes().get(0);
@@ -2918,6 +3186,7 @@ public final class UsrFlowOuterClass {
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_dataflow_UsrFlow_descriptor,
new java.lang.String[] { "TableId", "ProbeIf", "ServerIp", "ClientIp", "ClientPort", "ClientRtt", "ServerRtt", "STvSec", "STvUsec", "ETvSec", "ETvUsec", "ServerThink", "PageSize", "AppId", "AppGroupId", "RequestUrl", "RefererUrl", "ReturnCode", "ErrTvSec", "ErrTvUsec", "ClientLossPkt", "ServerLossPkt", "ClientBytes", "ServerBytes", "ClientPackets", "ServerPackets", "UserAgent", "ContentType", "RequestTransferTm", "TimeFlag", });
+ com.yuandian.dataflow.proto.Base.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/src/main/proto b/src/main/proto
index e7efff5..bc99744 160000
--- a/src/main/proto
+++ b/src/main/proto
@@ -1 +1 @@
-Subproject commit e7efff5fd246db0ffb5e88488a149e19d037c10c
+Subproject commit bc997440f085ce75fadc071803b0b359bbf6ccb3