diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index 7553e20fffe4a6abd039a67d0651c58274e882d4..cfab9ffce7ae8b157b271d7e381b5395fc88181f 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -422,7 +422,7 @@ func (f *Flows) buildAndStartPipeline(ctx context.Context) (*node.Terminal[[]*fl rbTracer.SendsTo(accounter) if f.cfg.Deduper == DeduperFirstCome { - deduper := node.AsMiddle(flow.Dedupe(f.cfg.DeduperFCExpiry, f.cfg.DeduperJustMark), + deduper := node.AsMiddle(flow.Dedupe(f.cfg.DeduperFCExpiry, f.cfg.DeduperJustMark, f.cfg.DeduperMerge), node.ChannelBufferLen(f.cfg.BuffersLength)) mapTracer.SendsTo(deduper) accounter.SendsTo(deduper) diff --git a/pkg/agent/config.go b/pkg/agent/config.go index 80d28bd53731ae481850fb9e030ab6e10ae64518..63edce4d3a4bfb03916ba430f0b3e39ff1c72a79 100644 --- a/pkg/agent/config.go +++ b/pkg/agent/config.go @@ -86,6 +86,8 @@ type Config struct { DeduperFCExpiry time.Duration `env:"DEDUPER_FC_EXPIRY"` // DeduperJustMark will just mark duplicates (boolean field) instead of dropping them. DeduperJustMark bool `env:"DEDUPER_JUST_MARK"` + // DeduperMerge will merge duplicated flows and generate list of interfaces and direction pairs + DeduperMerge bool `env:"DEDUPER_MERGE" envDefault:"false"` // Direction allows selecting which flows to trace according to its direction. Accepted values // are "ingress", "egress" or "both" (default). Direction string `env:"DIRECTION" envDefault:"both"` diff --git a/pkg/decode/decode_protobuf.go b/pkg/decode/decode_protobuf.go index 5a6bb15f44621900ca27c4d99888c77fb8b329c9..b3b05b5765d36c87dad3e4347dfb02d2d027f4ae 100644 --- a/pkg/decode/decode_protobuf.go +++ b/pkg/decode/decode_protobuf.go @@ -65,7 +65,12 @@ func PBFlowToMap(flow *pbflow.Record) config.GenericMap { if flow.Packets != 0 { out["Packets"] = flow.Packets } - + var interfaces []interface{} + var directions []interface{} + for _, entry := range flow.GetDupList() { + out["Interfaces"] = append([]interface{}{entry.Interface}, interfaces...) + out["FlowDirections"] = append([]interface{}{int(entry.Direction.Number())}, directions...) + } ethType := ethernet.EtherType(flow.EthProtocol) if ethType == ethernet.EtherTypeIPv4 || ethType == ethernet.EtherTypeIPv6 { out["SrcAddr"] = ipToStr(flow.Network.GetSrcAddr()) diff --git a/pkg/decode/decode_protobuf_test.go b/pkg/decode/decode_protobuf_test.go index 4c4aa4b6d8933a59d72f5f8ddb5a78d6eb5a8b57..8867d03fae878f0c669cdb2fd28907ca1ded1a9d 100644 --- a/pkg/decode/decode_protobuf_test.go +++ b/pkg/decode/decode_protobuf_test.go @@ -17,7 +17,13 @@ func TestPBFlowToMap(t *testing.T) { someTime := time.Now() var someDuration time.Duration = 10000000 // 10ms flow := &pbflow.Record{ - Interface: "eth0", + Interface: "eth0", + DupList: []*pbflow.DupMapEntry{ + { + Interface: "eth0", + Direction: pbflow.Direction_EGRESS, + }, + }, EthProtocol: 2048, Bytes: 456, Packets: 123, @@ -64,6 +70,7 @@ func TestPBFlowToMap(t *testing.T) { delete(out, "TimeReceived") assert.Equal(t, config.GenericMap{ "FlowDirection": 1, + "FlowDirections": []interface{}{1}, "Bytes": uint64(456), "SrcAddr": "1.2.3.4", "DstAddr": "5.6.7.8", @@ -78,6 +85,7 @@ func TestPBFlowToMap(t *testing.T) { "Proto": uint32(6), "TimeFlowStartMs": someTime.UnixMilli(), "TimeFlowEndMs": someTime.UnixMilli(), + "Interfaces": []interface{}{"eth0"}, "Interface": "eth0", "AgentIP": "10.9.8.7", "Flags": uint32(0x100), diff --git a/pkg/exporter/kafka_proto_test.go b/pkg/exporter/kafka_proto_test.go index 9bdb0b2b81fa97675ccf16254283c9f82783804f..00c8b65ffa567d0c676e3839acefdbec952af189 100644 --- a/pkg/exporter/kafka_proto_test.go +++ b/pkg/exporter/kafka_proto_test.go @@ -57,7 +57,10 @@ func TestProtoConversion(t *testing.T) { var r pbflow.Record require.NoError(t, proto.Unmarshal(wc.messages[0].Value, &r)) assert.EqualValues(t, 3, r.EthProtocol) - assert.EqualValues(t, 1, r.Direction) + for _, e := range r.DupList { + assert.EqualValues(t, 1, e.Direction) + assert.Equal(t, "veth0", e.Interface) + } assert.EqualValues(t, uint64(0xaabbccddeeff), r.DataLink.SrcMac) assert.EqualValues(t, uint64(0x112233445566), r.DataLink.DstMac) assert.EqualValues(t, uint64(0xC0010203) /* 192.1.2.3 */, r.Network.SrcAddr.GetIpv4()) @@ -71,7 +74,6 @@ func TestProtoConversion(t *testing.T) { assert.EqualValues(t, 789, r.Bytes) assert.EqualValues(t, 987, r.Packets) assert.EqualValues(t, uint16(1), r.Flags) - assert.Equal(t, "veth0", r.Interface) assert.Equal(t, ByteArrayFromNetIP(net.ParseIP("127.3.2.1")), wc.messages[0].Key[0:16]) assert.Equal(t, ByteArrayFromNetIP(net.ParseIP("192.1.2.3")), wc.messages[0].Key[16:]) } diff --git a/pkg/exporter/proto.go b/pkg/exporter/proto.go index 800971dc61db0704a80010d63b22ba69def71acc..4da92eab1998913c6b5a76be9aa6c8040a04b8a9 100644 --- a/pkg/exporter/proto.go +++ b/pkg/exporter/proto.go @@ -71,7 +71,7 @@ func v4FlowToPB(fr *flow.Record) *pbflow.Record { Duplicate: fr.Duplicate, AgentIp: agentIP(fr.AgentIP), Flags: uint32(fr.Metrics.Flags), - Interface: string(fr.Interface), + Interface: fr.Interface, PktDropBytes: fr.Metrics.PktDrops.Bytes, PktDropPackets: uint64(fr.Metrics.PktDrops.Packets), PktDropLatestFlags: uint32(fr.Metrics.PktDrops.LatestFlags), @@ -85,6 +85,13 @@ func v4FlowToPB(fr *flow.Record) *pbflow.Record { if fr.Metrics.DnsRecord.Latency != 0 { pbflowRecord.DnsLatency = durationpb.New(fr.DNSLatency) } + pbflowRecord.DupList = make([]*pbflow.DupMapEntry, 0) + for _, m := range fr.DupList { + pbflowRecord.DupList = append(pbflowRecord.DupList, &pbflow.DupMapEntry{ + Interface: fr.Interface, + Direction: pbflow.Direction(m[fr.Interface]), + }) + } return &pbflowRecord } @@ -135,6 +142,13 @@ func v6FlowToPB(fr *flow.Record) *pbflow.Record { if fr.Metrics.DnsRecord.Latency != 0 { pbflowRecord.DnsLatency = durationpb.New(fr.DNSLatency) } + pbflowRecord.DupList = make([]*pbflow.DupMapEntry, 0) + for _, m := range fr.DupList { + pbflowRecord.DupList = append(pbflowRecord.DupList, &pbflow.DupMapEntry{ + Interface: fr.Interface, + Direction: pbflow.Direction(m[fr.Interface]), + }) + } return &pbflowRecord } diff --git a/pkg/flow/account_test.go b/pkg/flow/account_test.go index 1600549320e242b1dedfc1b3282a036a4ab8bed0..d275f914a76e89d6d398d2184687a0e800a26b62 100644 --- a/pkg/flow/account_test.go +++ b/pkg/flow/account_test.go @@ -109,6 +109,7 @@ func TestEvict_MaxEntries(t *testing.T) { }, TimeFlowStart: now.Add(-(1000 - 123) * time.Nanosecond), TimeFlowEnd: now.Add(-(1000 - 789) * time.Nanosecond), + DupList: make([]map[string]uint8, 0), }, k2: { RawRecord: RawRecord{ @@ -119,6 +120,7 @@ func TestEvict_MaxEntries(t *testing.T) { }, TimeFlowStart: now.Add(-(1000 - 456) * time.Nanosecond), TimeFlowEnd: now.Add(-(1000 - 456) * time.Nanosecond), + DupList: make([]map[string]uint8, 0), }, }, received) } @@ -187,6 +189,7 @@ func TestEvict_Period(t *testing.T) { }, TimeFlowStart: now.Add(-1000 + 123), TimeFlowEnd: now.Add(-1000 + 789), + DupList: make([]map[string]uint8, 0), }, *records[0]) records = receiveTimeout(t, evictor) require.Len(t, records, 1) @@ -203,6 +206,7 @@ func TestEvict_Period(t *testing.T) { }, TimeFlowStart: now.Add(-1000 + 1123), TimeFlowEnd: now.Add(-1000 + 1456), + DupList: make([]map[string]uint8, 0), }, *records[0]) // no more flows are evicted diff --git a/pkg/flow/deduper.go b/pkg/flow/deduper.go index cb1cca38f2808a8e8cc292d44bcb849aa2ab3955..bf48e58c57b370f9fa81fb07852f248912b0ed74 100644 --- a/pkg/flow/deduper.go +++ b/pkg/flow/deduper.go @@ -29,6 +29,7 @@ type entry struct { dnsRecord *ebpf.BpfDnsRecordT ifIndex uint32 expiryTime time.Time + dupList *[]map[string]uint8 } // Dedupe receives flows and filters these belonging to duplicate interfaces. It will forward @@ -36,7 +37,7 @@ type entry struct { // (no activity for it during the expiration time) // The justMark argument tells that the deduper should not drop the duplicate flows but // set their Duplicate field. -func Dedupe(expireTime time.Duration, justMark bool) func(in <-chan []*Record, out chan<- []*Record) { +func Dedupe(expireTime time.Duration, justMark, mergeDup bool) func(in <-chan []*Record, out chan<- []*Record) { cache := &deduperCache{ expire: expireTime, entries: list.New(), @@ -47,7 +48,7 @@ func Dedupe(expireTime time.Duration, justMark bool) func(in <-chan []*Record, o cache.removeExpired() fwd := make([]*Record, 0, len(records)) for _, record := range records { - cache.checkDupe(record, justMark, &fwd) + cache.checkDupe(record, justMark, mergeDup, &fwd) } if len(fwd) > 0 { out <- fwd @@ -57,7 +58,8 @@ func Dedupe(expireTime time.Duration, justMark bool) func(in <-chan []*Record, o } // checkDupe check current record if its already available nad if not added to fwd records list -func (c *deduperCache) checkDupe(r *Record, justMark bool, fwd *[]*Record) { +func (c *deduperCache) checkDupe(r *Record, justMark, mergeDup bool, fwd *[]*Record) { + mergeEntry := make(map[string]uint8) rk := r.Id // zeroes fields from key that should be ignored from the flow comparison rk.IfIndex = 0 @@ -86,6 +88,10 @@ func (c *deduperCache) checkDupe(r *Record, justMark bool, fwd *[]*Record) { r.Duplicate = true *fwd = append(*fwd, r) } + if mergeDup { + mergeEntry[r.Interface] = r.Id.Direction + *fEntry.dupList = append(*fEntry.dupList, mergeEntry) + } return } *fwd = append(*fwd, r) @@ -99,6 +105,11 @@ func (c *deduperCache) checkDupe(r *Record, justMark bool, fwd *[]*Record) { ifIndex: r.Id.IfIndex, expiryTime: timeNow().Add(c.expire), } + if mergeDup { + mergeEntry[r.Interface] = r.Id.Direction + r.DupList = append(r.DupList, mergeEntry) + e.dupList = &r.DupList + } c.ifaces[rk] = c.entries.PushFront(&e) *fwd = append(*fwd, r) } diff --git a/pkg/flow/deduper_test.go b/pkg/flow/deduper_test.go index 7d6cf6cb2053a47a57d3da5db8dc06f854b91e0e..dfa51665ac2a85bad3d3132f1ee88b2e286a586b 100644 --- a/pkg/flow/deduper_test.go +++ b/pkg/flow/deduper_test.go @@ -56,7 +56,7 @@ func TestDedupe(t *testing.T) { input := make(chan []*Record, 100) output := make(chan []*Record, 100) - go Dedupe(time.Minute, false)(input, output) + go Dedupe(time.Minute, false, false)(input, output) input <- []*Record{ oneIf2, // record 1 at interface 2: should be accepted @@ -89,7 +89,7 @@ func TestDedupe_EvictFlows(t *testing.T) { input := make(chan []*Record, 100) output := make(chan []*Record, 100) - go Dedupe(15*time.Second, false)(input, output) + go Dedupe(15*time.Second, false, false)(input, output) // Should only accept records 1 and 2, at interface 1 input <- []*Record{oneIf1, twoIf1, oneIf2} @@ -120,6 +120,21 @@ func TestDedupe_EvictFlows(t *testing.T) { receiveTimeout(t, output)) } +func TestDedupeMerge(t *testing.T) { + input := make(chan []*Record, 100) + output := make(chan []*Record, 100) + + go Dedupe(time.Minute, false, true)(input, output) + + input <- []*Record{ + oneIf2, // record 1 at interface 2: should be accepted + oneIf1, + } + deduped := receiveTimeout(t, output) + assert.Equal(t, []*Record{oneIf2}, deduped) + assert.Equal(t, 2, len(oneIf2.DupList)) +} + type timerMock struct { now time.Time } diff --git a/pkg/flow/record.go b/pkg/flow/record.go index 3be0b0d83ce1983e750a8ca62fe9149ad745ea97..8fc92138d46c9f7cb9de6ddbb14d8ad6e9bcb8e7 100644 --- a/pkg/flow/record.go +++ b/pkg/flow/record.go @@ -53,6 +53,7 @@ type Record struct { AgentIP net.IP // Calculated RTT which is set when record is created by calling NewRecord TimeFlowRtt time.Duration + DupList []map[string]uint8 } func NewRecord( @@ -78,6 +79,7 @@ func NewRecord( if metrics.DnsRecord.Latency != 0 { record.DNSLatency = time.Duration(metrics.DnsRecord.Latency) } + record.DupList = make([]map[string]uint8, 0) return &record } diff --git a/pkg/grpc/grpc_test.go b/pkg/grpc/grpc_test.go index d43af6db70ed54887510125d22d7bdd9215e8ed1..ff3824ca3c6df375dc320e70eaa61ef3c8fd5413 100644 --- a/pkg/grpc/grpc_test.go +++ b/pkg/grpc/grpc_test.go @@ -142,8 +142,12 @@ func BenchmarkIPv4GRPCCommunication(b *testing.B) { EthProtocol: 2048, Bytes: 456, Flags: 1, - - Direction: pbflow.Direction_EGRESS, + DupList: []*pbflow.DupMapEntry{ + { + Interface: "eth0", + Direction: pbflow.Direction_EGRESS, + }, + }, TimeFlowStart: timestamppb.Now(), TimeFlowEnd: timestamppb.Now(), Network: &pbflow.Network{ @@ -196,10 +200,15 @@ func BenchmarkIPv6GRPCCommunication(b *testing.B) { client := cc.Client() f := &pbflow.Record{ - EthProtocol: 2048, - Bytes: 456, - Flags: 1, - Direction: pbflow.Direction_EGRESS, + EthProtocol: 2048, + Bytes: 456, + Flags: 1, + DupList: []*pbflow.DupMapEntry{ + { + Interface: "eth0", + Direction: pbflow.Direction_EGRESS, + }, + }, TimeFlowStart: timestamppb.Now(), TimeFlowEnd: timestamppb.Now(), Network: &pbflow.Network{ diff --git a/pkg/pbflow/flow.pb.go b/pkg/pbflow/flow.pb.go index a0ed4ddcd1d9f1c9f0e09c7888ea9ee18a5614bb..7b51fab47961d77d99963c850536d61970322bea 100644 --- a/pkg/pbflow/flow.pb.go +++ b/pkg/pbflow/flow.pb.go @@ -156,6 +156,61 @@ func (x *Records) GetEntries() []*Record { return nil } +type DupMapEntry struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Interface string `protobuf:"bytes,1,opt,name=interface,proto3" json:"interface,omitempty"` + Direction Direction `protobuf:"varint,2,opt,name=direction,proto3,enum=pbflow.Direction" json:"direction,omitempty"` +} + +func (x *DupMapEntry) Reset() { + *x = DupMapEntry{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_flow_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DupMapEntry) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DupMapEntry) ProtoMessage() {} + +func (x *DupMapEntry) ProtoReflect() protoreflect.Message { + mi := &file_proto_flow_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DupMapEntry.ProtoReflect.Descriptor instead. +func (*DupMapEntry) Descriptor() ([]byte, []int) { + return file_proto_flow_proto_rawDescGZIP(), []int{2} +} + +func (x *DupMapEntry) GetInterface() string { + if x != nil { + return x.Interface + } + return "" +} + +func (x *DupMapEntry) GetDirection() Direction { + if x != nil { + return x.Direction + } + return Direction_INGRESS +} + type Record struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -192,12 +247,13 @@ type Record struct { DnsLatency *durationpb.Duration `protobuf:"bytes,23,opt,name=dns_latency,json=dnsLatency,proto3" json:"dns_latency,omitempty"` TimeFlowRtt *durationpb.Duration `protobuf:"bytes,24,opt,name=time_flow_rtt,json=timeFlowRtt,proto3" json:"time_flow_rtt,omitempty"` DnsErrno uint32 `protobuf:"varint,25,opt,name=dns_errno,json=dnsErrno,proto3" json:"dns_errno,omitempty"` + DupList []*DupMapEntry `protobuf:"bytes,26,rep,name=dup_list,json=dupList,proto3" json:"dup_list,omitempty"` } func (x *Record) Reset() { *x = Record{} if protoimpl.UnsafeEnabled { - mi := &file_proto_flow_proto_msgTypes[2] + mi := &file_proto_flow_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -210,7 +266,7 @@ func (x *Record) String() string { func (*Record) ProtoMessage() {} func (x *Record) ProtoReflect() protoreflect.Message { - mi := &file_proto_flow_proto_msgTypes[2] + mi := &file_proto_flow_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -223,7 +279,7 @@ func (x *Record) ProtoReflect() protoreflect.Message { // Deprecated: Use Record.ProtoReflect.Descriptor instead. func (*Record) Descriptor() ([]byte, []int) { - return file_proto_flow_proto_rawDescGZIP(), []int{2} + return file_proto_flow_proto_rawDescGZIP(), []int{3} } func (x *Record) GetEthProtocol() uint32 { @@ -401,6 +457,13 @@ func (x *Record) GetDnsErrno() uint32 { return 0 } +func (x *Record) GetDupList() []*DupMapEntry { + if x != nil { + return x.DupList + } + return nil +} + type DataLink struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -413,7 +476,7 @@ type DataLink struct { func (x *DataLink) Reset() { *x = DataLink{} if protoimpl.UnsafeEnabled { - mi := &file_proto_flow_proto_msgTypes[3] + mi := &file_proto_flow_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -426,7 +489,7 @@ func (x *DataLink) String() string { func (*DataLink) ProtoMessage() {} func (x *DataLink) ProtoReflect() protoreflect.Message { - mi := &file_proto_flow_proto_msgTypes[3] + mi := &file_proto_flow_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -439,7 +502,7 @@ func (x *DataLink) ProtoReflect() protoreflect.Message { // Deprecated: Use DataLink.ProtoReflect.Descriptor instead. func (*DataLink) Descriptor() ([]byte, []int) { - return file_proto_flow_proto_rawDescGZIP(), []int{3} + return file_proto_flow_proto_rawDescGZIP(), []int{4} } func (x *DataLink) GetSrcMac() uint64 { @@ -469,7 +532,7 @@ type Network struct { func (x *Network) Reset() { *x = Network{} if protoimpl.UnsafeEnabled { - mi := &file_proto_flow_proto_msgTypes[4] + mi := &file_proto_flow_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -482,7 +545,7 @@ func (x *Network) String() string { func (*Network) ProtoMessage() {} func (x *Network) ProtoReflect() protoreflect.Message { - mi := &file_proto_flow_proto_msgTypes[4] + mi := &file_proto_flow_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -495,7 +558,7 @@ func (x *Network) ProtoReflect() protoreflect.Message { // Deprecated: Use Network.ProtoReflect.Descriptor instead. func (*Network) Descriptor() ([]byte, []int) { - return file_proto_flow_proto_rawDescGZIP(), []int{4} + return file_proto_flow_proto_rawDescGZIP(), []int{5} } func (x *Network) GetSrcAddr() *IP { @@ -534,7 +597,7 @@ type IP struct { func (x *IP) Reset() { *x = IP{} if protoimpl.UnsafeEnabled { - mi := &file_proto_flow_proto_msgTypes[5] + mi := &file_proto_flow_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -547,7 +610,7 @@ func (x *IP) String() string { func (*IP) ProtoMessage() {} func (x *IP) ProtoReflect() protoreflect.Message { - mi := &file_proto_flow_proto_msgTypes[5] + mi := &file_proto_flow_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -560,7 +623,7 @@ func (x *IP) ProtoReflect() protoreflect.Message { // Deprecated: Use IP.ProtoReflect.Descriptor instead. func (*IP) Descriptor() ([]byte, []int) { - return file_proto_flow_proto_rawDescGZIP(), []int{5} + return file_proto_flow_proto_rawDescGZIP(), []int{6} } func (m *IP) GetIpFamily() isIP_IpFamily { @@ -615,7 +678,7 @@ type Transport struct { func (x *Transport) Reset() { *x = Transport{} if protoimpl.UnsafeEnabled { - mi := &file_proto_flow_proto_msgTypes[6] + mi := &file_proto_flow_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -628,7 +691,7 @@ func (x *Transport) String() string { func (*Transport) ProtoMessage() {} func (x *Transport) ProtoReflect() protoreflect.Message { - mi := &file_proto_flow_proto_msgTypes[6] + mi := &file_proto_flow_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -641,7 +704,7 @@ func (x *Transport) ProtoReflect() protoreflect.Message { // Deprecated: Use Transport.ProtoReflect.Descriptor instead. func (*Transport) Descriptor() ([]byte, []int) { - return file_proto_flow_proto_rawDescGZIP(), []int{6} + return file_proto_flow_proto_rawDescGZIP(), []int{7} } func (x *Transport) GetSrcPort() uint32 { @@ -678,100 +741,109 @@ var file_proto_flow_proto_rawDesc = []byte{ 0x07, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, - 0x65, 0x73, 0x22, 0x8c, 0x08, 0x0a, 0x06, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, - 0x0c, 0x65, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x65, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, - 0x12, 0x2f, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x44, 0x69, 0x72, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x42, 0x0a, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x65, 0x73, 0x22, 0x5c, 0x0a, 0x0b, 0x44, 0x75, 0x70, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x12, + 0x2f, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x44, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0xbc, 0x08, 0x0a, 0x06, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x65, + 0x74, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x0b, 0x65, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x2f, + 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x42, 0x0a, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, 0x6f, 0x77, 0x53, 0x74, + 0x61, 0x72, 0x74, 0x12, 0x3e, 0x0a, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, 0x6f, 0x77, + 0x5f, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, 0x6f, 0x77, - 0x53, 0x74, 0x61, 0x72, 0x74, 0x12, 0x3e, 0x0a, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, - 0x6f, 0x77, 0x5f, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, - 0x6f, 0x77, 0x45, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x09, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6c, 0x69, - 0x6e, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, - 0x77, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x08, 0x64, 0x61, 0x74, 0x61, - 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x29, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x4e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, - 0x2f, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, - 0x12, 0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, - 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x12, 0x1c, - 0x0a, 0x09, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x09, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x08, - 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, - 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, - 0x74, 0x49, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x0d, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x63, 0x6d, - 0x70, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x63, - 0x6d, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x63, - 0x6f, 0x64, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x63, 0x6d, 0x70, 0x43, - 0x6f, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, - 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x70, 0x6b, 0x74, - 0x44, 0x72, 0x6f, 0x70, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x6b, 0x74, - 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x11, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x0e, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x50, 0x61, 0x63, 0x6b, - 0x65, 0x74, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, - 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x12, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x12, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, 0x74, 0x65, 0x73, - 0x74, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, - 0x6f, 0x70, 0x5f, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, - 0x13, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, - 0x74, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x1a, 0x70, 0x6b, 0x74, - 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x72, 0x6f, - 0x70, 0x5f, 0x63, 0x61, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x70, - 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x44, 0x72, 0x6f, 0x70, - 0x43, 0x61, 0x75, 0x73, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x64, 0x6e, 0x73, 0x5f, 0x69, 0x64, 0x18, - 0x15, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x64, 0x6e, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, - 0x64, 0x6e, 0x73, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x08, 0x64, 0x6e, 0x73, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x3a, 0x0a, 0x0b, 0x64, 0x6e, 0x73, - 0x5f, 0x6c, 0x61, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x64, 0x6e, 0x73, 0x4c, 0x61, - 0x74, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x3d, 0x0a, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, - 0x6f, 0x77, 0x5f, 0x72, 0x74, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, 0x6f, 0x77, + 0x45, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x09, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, + 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x08, 0x64, 0x61, 0x74, 0x61, 0x4c, 0x69, + 0x6e, 0x6b, 0x12, 0x29, 0x0a, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x4e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x07, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2f, 0x0a, + 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, + 0x6f, 0x72, 0x74, 0x52, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x14, + 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x1c, + 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x09, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, + 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x09, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x61, 0x67, + 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, + 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x49, + 0x70, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x05, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x63, 0x6d, 0x70, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x63, 0x6d, 0x70, 0x5f, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x69, 0x63, 0x6d, 0x70, 0x43, 0x6f, 0x64, + 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x62, 0x79, + 0x74, 0x65, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x70, 0x6b, 0x74, 0x44, 0x72, + 0x6f, 0x70, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x6b, 0x74, 0x5f, 0x64, + 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, + 0x04, 0x52, 0x0e, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, + 0x73, 0x12, 0x31, 0x0a, 0x15, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x6c, 0x61, + 0x74, 0x65, 0x73, 0x74, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x12, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x46, + 0x6c, 0x61, 0x67, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x70, 0x6b, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, + 0x5f, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x13, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x12, 0x70, 0x6b, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, 0x74, 0x65, + 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3a, 0x0a, 0x1a, 0x70, 0x6b, 0x74, 0x5f, 0x64, + 0x72, 0x6f, 0x70, 0x5f, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x72, 0x6f, 0x70, 0x5f, + 0x63, 0x61, 0x75, 0x73, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x70, 0x6b, 0x74, + 0x44, 0x72, 0x6f, 0x70, 0x4c, 0x61, 0x74, 0x65, 0x73, 0x74, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x61, + 0x75, 0x73, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x64, 0x6e, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x15, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x05, 0x64, 0x6e, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6e, + 0x73, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, + 0x6e, 0x73, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12, 0x3a, 0x0a, 0x0b, 0x64, 0x6e, 0x73, 0x5f, 0x6c, + 0x61, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, - 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, 0x6f, - 0x77, 0x52, 0x74, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6e, 0x73, 0x5f, 0x65, 0x72, 0x72, 0x6e, - 0x6f, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, 0x6e, 0x73, 0x45, 0x72, 0x72, 0x6e, - 0x6f, 0x22, 0x3c, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x17, 0x0a, - 0x07, 0x73, 0x72, 0x63, 0x5f, 0x6d, 0x61, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, - 0x73, 0x72, 0x63, 0x4d, 0x61, 0x63, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x73, 0x74, 0x5f, 0x6d, 0x61, - 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x64, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x22, - 0x6b, 0x0a, 0x07, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x08, 0x73, 0x72, - 0x63, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, - 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, 0x07, 0x73, 0x72, 0x63, 0x41, 0x64, 0x64, - 0x72, 0x12, 0x25, 0x0a, 0x08, 0x64, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, - 0x07, 0x64, 0x73, 0x74, 0x41, 0x64, 0x64, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x73, 0x63, 0x70, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x64, 0x73, 0x63, 0x70, 0x22, 0x3d, 0x0a, 0x02, - 0x49, 0x50, 0x12, 0x14, 0x0a, 0x04, 0x69, 0x70, 0x76, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x07, - 0x48, 0x00, 0x52, 0x04, 0x69, 0x70, 0x76, 0x34, 0x12, 0x14, 0x0a, 0x04, 0x69, 0x70, 0x76, 0x36, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x04, 0x69, 0x70, 0x76, 0x36, 0x42, 0x0b, - 0x0a, 0x09, 0x69, 0x70, 0x5f, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x22, 0x5d, 0x0a, 0x09, 0x54, - 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x72, 0x63, 0x5f, - 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x73, 0x72, 0x63, 0x50, - 0x6f, 0x72, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x64, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2a, 0x24, 0x0a, 0x09, 0x44, 0x69, - 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x47, 0x52, 0x45, - 0x53, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x45, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10, 0x01, - 0x32, 0x3e, 0x0a, 0x09, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x31, 0x0a, - 0x04, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, - 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, - 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x64, 0x6e, 0x73, 0x4c, 0x61, 0x74, 0x65, + 0x6e, 0x63, 0x79, 0x12, 0x3d, 0x0a, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x66, 0x6c, 0x6f, 0x77, + 0x5f, 0x72, 0x74, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x6c, 0x6f, 0x77, 0x52, + 0x74, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x6e, 0x73, 0x5f, 0x65, 0x72, 0x72, 0x6e, 0x6f, 0x18, + 0x19, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x64, 0x6e, 0x73, 0x45, 0x72, 0x72, 0x6e, 0x6f, 0x12, + 0x2e, 0x0a, 0x08, 0x64, 0x75, 0x70, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x1a, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x44, 0x75, 0x70, 0x4d, 0x61, + 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x75, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x22, + 0x3c, 0x0a, 0x08, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x17, 0x0a, 0x07, 0x73, + 0x72, 0x63, 0x5f, 0x6d, 0x61, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x73, 0x72, + 0x63, 0x4d, 0x61, 0x63, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x73, 0x74, 0x5f, 0x6d, 0x61, 0x63, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x64, 0x73, 0x74, 0x4d, 0x61, 0x63, 0x22, 0x6b, 0x0a, + 0x07, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x25, 0x0a, 0x08, 0x73, 0x72, 0x63, 0x5f, + 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x66, + 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, 0x07, 0x73, 0x72, 0x63, 0x41, 0x64, 0x64, 0x72, 0x12, + 0x25, 0x0a, 0x08, 0x64, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x49, 0x50, 0x52, 0x07, 0x64, + 0x73, 0x74, 0x41, 0x64, 0x64, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x73, 0x63, 0x70, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x64, 0x73, 0x63, 0x70, 0x22, 0x3d, 0x0a, 0x02, 0x49, 0x50, + 0x12, 0x14, 0x0a, 0x04, 0x69, 0x70, 0x76, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x07, 0x48, 0x00, + 0x52, 0x04, 0x69, 0x70, 0x76, 0x34, 0x12, 0x14, 0x0a, 0x04, 0x69, 0x70, 0x76, 0x36, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x04, 0x69, 0x70, 0x76, 0x36, 0x42, 0x0b, 0x0a, 0x09, + 0x69, 0x70, 0x5f, 0x66, 0x61, 0x6d, 0x69, 0x6c, 0x79, 0x22, 0x5d, 0x0a, 0x09, 0x54, 0x72, 0x61, + 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x72, 0x63, 0x5f, 0x70, 0x6f, + 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x73, 0x72, 0x63, 0x50, 0x6f, 0x72, + 0x74, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x07, 0x64, 0x73, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2a, 0x24, 0x0a, 0x09, 0x44, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x47, 0x52, 0x45, 0x53, 0x53, + 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x45, 0x47, 0x52, 0x45, 0x53, 0x53, 0x10, 0x01, 0x32, 0x3e, + 0x0a, 0x09, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x31, 0x0a, 0x04, 0x53, + 0x65, 0x6e, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x73, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x2e, 0x43, 0x6f, + 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0a, + 0x5a, 0x08, 0x2e, 0x2f, 0x70, 0x62, 0x66, 0x6c, 0x6f, 0x77, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -787,39 +859,42 @@ func file_proto_flow_proto_rawDescGZIP() []byte { } var file_proto_flow_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_proto_flow_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_proto_flow_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_proto_flow_proto_goTypes = []interface{}{ (Direction)(0), // 0: pbflow.Direction (*CollectorReply)(nil), // 1: pbflow.CollectorReply (*Records)(nil), // 2: pbflow.Records - (*Record)(nil), // 3: pbflow.Record - (*DataLink)(nil), // 4: pbflow.DataLink - (*Network)(nil), // 5: pbflow.Network - (*IP)(nil), // 6: pbflow.IP - (*Transport)(nil), // 7: pbflow.Transport - (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp - (*durationpb.Duration)(nil), // 9: google.protobuf.Duration + (*DupMapEntry)(nil), // 3: pbflow.DupMapEntry + (*Record)(nil), // 4: pbflow.Record + (*DataLink)(nil), // 5: pbflow.DataLink + (*Network)(nil), // 6: pbflow.Network + (*IP)(nil), // 7: pbflow.IP + (*Transport)(nil), // 8: pbflow.Transport + (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp + (*durationpb.Duration)(nil), // 10: google.protobuf.Duration } var file_proto_flow_proto_depIdxs = []int32{ - 3, // 0: pbflow.Records.entries:type_name -> pbflow.Record - 0, // 1: pbflow.Record.direction:type_name -> pbflow.Direction - 8, // 2: pbflow.Record.time_flow_start:type_name -> google.protobuf.Timestamp - 8, // 3: pbflow.Record.time_flow_end:type_name -> google.protobuf.Timestamp - 4, // 4: pbflow.Record.data_link:type_name -> pbflow.DataLink - 5, // 5: pbflow.Record.network:type_name -> pbflow.Network - 7, // 6: pbflow.Record.transport:type_name -> pbflow.Transport - 6, // 7: pbflow.Record.agent_ip:type_name -> pbflow.IP - 9, // 8: pbflow.Record.dns_latency:type_name -> google.protobuf.Duration - 9, // 9: pbflow.Record.time_flow_rtt:type_name -> google.protobuf.Duration - 6, // 10: pbflow.Network.src_addr:type_name -> pbflow.IP - 6, // 11: pbflow.Network.dst_addr:type_name -> pbflow.IP - 2, // 12: pbflow.Collector.Send:input_type -> pbflow.Records - 1, // 13: pbflow.Collector.Send:output_type -> pbflow.CollectorReply - 13, // [13:14] is the sub-list for method output_type - 12, // [12:13] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 4, // 0: pbflow.Records.entries:type_name -> pbflow.Record + 0, // 1: pbflow.DupMapEntry.direction:type_name -> pbflow.Direction + 0, // 2: pbflow.Record.direction:type_name -> pbflow.Direction + 9, // 3: pbflow.Record.time_flow_start:type_name -> google.protobuf.Timestamp + 9, // 4: pbflow.Record.time_flow_end:type_name -> google.protobuf.Timestamp + 5, // 5: pbflow.Record.data_link:type_name -> pbflow.DataLink + 6, // 6: pbflow.Record.network:type_name -> pbflow.Network + 8, // 7: pbflow.Record.transport:type_name -> pbflow.Transport + 7, // 8: pbflow.Record.agent_ip:type_name -> pbflow.IP + 10, // 9: pbflow.Record.dns_latency:type_name -> google.protobuf.Duration + 10, // 10: pbflow.Record.time_flow_rtt:type_name -> google.protobuf.Duration + 3, // 11: pbflow.Record.dup_list:type_name -> pbflow.DupMapEntry + 7, // 12: pbflow.Network.src_addr:type_name -> pbflow.IP + 7, // 13: pbflow.Network.dst_addr:type_name -> pbflow.IP + 2, // 14: pbflow.Collector.Send:input_type -> pbflow.Records + 1, // 15: pbflow.Collector.Send:output_type -> pbflow.CollectorReply + 15, // [15:16] is the sub-list for method output_type + 14, // [14:15] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_proto_flow_proto_init() } @@ -853,7 +928,7 @@ func file_proto_flow_proto_init() { } } file_proto_flow_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Record); i { + switch v := v.(*DupMapEntry); i { case 0: return &v.state case 1: @@ -865,7 +940,7 @@ func file_proto_flow_proto_init() { } } file_proto_flow_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DataLink); i { + switch v := v.(*Record); i { case 0: return &v.state case 1: @@ -877,7 +952,7 @@ func file_proto_flow_proto_init() { } } file_proto_flow_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Network); i { + switch v := v.(*DataLink); i { case 0: return &v.state case 1: @@ -889,7 +964,7 @@ func file_proto_flow_proto_init() { } } file_proto_flow_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*IP); i { + switch v := v.(*Network); i { case 0: return &v.state case 1: @@ -901,6 +976,18 @@ func file_proto_flow_proto_init() { } } file_proto_flow_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*IP); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_proto_flow_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Transport); i { case 0: return &v.state @@ -913,7 +1000,7 @@ func file_proto_flow_proto_init() { } } } - file_proto_flow_proto_msgTypes[5].OneofWrappers = []interface{}{ + file_proto_flow_proto_msgTypes[6].OneofWrappers = []interface{}{ (*IP_Ipv4)(nil), (*IP_Ipv6)(nil), } @@ -923,7 +1010,7 @@ func file_proto_flow_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_proto_flow_proto_rawDesc, NumEnums: 1, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 1, }, diff --git a/proto/flow.proto b/proto/flow.proto index bf3209caf69e4dba21578d578fcf17d7e5341e88..6c758c2228a7e5580108150620f028d83b861743 100644 --- a/proto/flow.proto +++ b/proto/flow.proto @@ -18,6 +18,10 @@ message Records { repeated Record entries = 1; } +message DupMapEntry { + string interface = 1; + Direction direction = 2; +} message Record { // protocol as defined by ETH_P_* in linux/if_ether.h // https://github.com/torvalds/linux/blob/master/include/uapi/linux/if_ether.h @@ -34,7 +38,7 @@ message Record { uint64 bytes = 8; uint64 packets = 9; string interface = 10; - + // if true, the same flow has been recorded via another interface. // From all the duplicate flows, one will set this value to false and the rest will be true. bool duplicate = 11; @@ -54,6 +58,7 @@ message Record { google.protobuf.Duration dns_latency = 23; google.protobuf.Duration time_flow_rtt = 24; uint32 dns_errno = 25; + repeated DupMapEntry dup_list = 26; } message DataLink {