From 27d8bc7cad4a8f68c2da3efbb77f45ec70ae40e6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 05 一月 2022 14:11:39 +0800
Subject: [PATCH] pb.go MsgQueryProcReply add subLocalTopics and subNetTopics
---
proto/source/bhome_msg/bhome_msg_api.pb.go | 202 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 160 insertions(+), 42 deletions(-)
diff --git a/proto/source/bhome_msg/bhome_msg_api.pb.go b/proto/source/bhome_msg/bhome_msg_api.pb.go
index 2a565f0..394074b 100644
--- a/proto/source/bhome_msg/bhome_msg_api.pb.go
+++ b/proto/source/bhome_msg/bhome_msg_api.pb.go
@@ -779,9 +779,11 @@
}
type MsgQueryProcReply_Info struct {
- Proc *ProcInfo `protobuf:"bytes,1,opt,name=proc,proto3" json:"proc,omitempty"`
- Online bool `protobuf:"varint,2,opt,name=online,proto3" json:"online,omitempty"`
- Topics *MsgTopicList `protobuf:"bytes,3,opt,name=topics,proto3" json:"topics,omitempty"`
+ Proc *ProcInfo `protobuf:"bytes,1,opt,name=proc,proto3" json:"proc,omitempty"`
+ Online bool `protobuf:"varint,2,opt,name=online,proto3" json:"online,omitempty"`
+ Topics *MsgTopicList `protobuf:"bytes,3,opt,name=topics,proto3" json:"topics,omitempty"`
+ SubLocalTopics *MsgTopicList `protobuf:"bytes,4,opt,name=subLocalTopics,proto3" json:"subLocalTopics,omitempty"`
+ SubNetTopics *MsgTopicList `protobuf:"bytes,5,opt,name=subNetTopics,proto3" json:"subNetTopics,omitempty"`
}
func (m *MsgQueryProcReply_Info) Reset() { *m = MsgQueryProcReply_Info{} }
@@ -838,6 +840,20 @@
return nil
}
+func (m *MsgQueryProcReply_Info) GetSubLocalTopics() *MsgTopicList {
+ if m != nil {
+ return m.SubLocalTopics
+ }
+ return nil
+}
+
+func (m *MsgQueryProcReply_Info) GetSubNetTopics() *MsgTopicList {
+ if m != nil {
+ return m.SubNetTopics
+ }
+ return nil
+}
+
func init() {
proto.RegisterType((*BHAddress)(nil), "bhome_msg.BHAddress")
proto.RegisterType((*ProcInfo)(nil), "bhome_msg.ProcInfo")
@@ -860,45 +876,47 @@
func init() { proto.RegisterFile("bhome_msg_api.proto", fileDescriptor_a49c9c1f511a168c) }
var fileDescriptor_a49c9c1f511a168c = []byte{
- // 601 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xd1, 0x6a, 0xd4, 0x40,
- 0x14, 0x6d, 0x76, 0xd3, 0xed, 0xee, 0x4d, 0xda, 0xe2, 0xb4, 0xd8, 0x58, 0x30, 0xa6, 0x01, 0x69,
- 0xa0, 0x98, 0xc2, 0x0a, 0x55, 0x10, 0x05, 0x2b, 0xc2, 0x16, 0xdc, 0x52, 0x07, 0x45, 0xf0, 0x25,
- 0x24, 0x9b, 0x69, 0x3a, 0xb0, 0xc9, 0xa4, 0x33, 0x53, 0xb1, 0xf8, 0x13, 0x7e, 0x96, 0x8f, 0x7d,
- 0xf4, 0x51, 0x5a, 0xfc, 0x09, 0x9f, 0x64, 0x26, 0xd9, 0xd8, 0xea, 0x56, 0xba, 0x7d, 0x9b, 0x3b,
- 0x73, 0xce, 0xb9, 0x97, 0x7b, 0x38, 0x03, 0x2b, 0xc9, 0x11, 0xcb, 0x49, 0x94, 0x8b, 0x2c, 0x8a,
- 0x4b, 0x1a, 0x96, 0x9c, 0x49, 0x86, 0x7a, 0xcd, 0xe5, 0xfa, 0x32, 0xe1, 0x9c, 0x71, 0x75, 0xac,
- 0xde, 0xfc, 0x08, 0x7a, 0xbb, 0x83, 0x97, 0x69, 0xca, 0x89, 0x10, 0x68, 0x05, 0xe6, 0xf3, 0xe3,
- 0x88, 0xa6, 0x8e, 0xe1, 0x19, 0x81, 0x89, 0xcd, 0xfc, 0x78, 0x2f, 0x45, 0xf7, 0xa0, 0x1b, 0x27,
- 0x22, 0x8a, 0xd3, 0x94, 0x3b, 0x2d, 0xcf, 0x08, 0xda, 0x78, 0x21, 0x4e, 0x84, 0xa2, 0xa0, 0x25,
- 0x68, 0xd1, 0xd2, 0x69, 0x7b, 0x46, 0x60, 0xe3, 0x16, 0x2d, 0x11, 0x02, 0xb3, 0x64, 0x5c, 0x3a,
- 0xa6, 0x67, 0x04, 0xf3, 0x58, 0x9f, 0xfd, 0x2f, 0xd0, 0x3d, 0xe0, 0x6c, 0xb4, 0x57, 0x1c, 0x32,
- 0xb4, 0x06, 0x0b, 0x25, 0x67, 0xa3, 0x49, 0x07, 0x1b, 0x77, 0x54, 0xb9, 0x97, 0x2a, 0x62, 0x11,
- 0xe7, 0x44, 0xeb, 0xdb, 0x58, 0x9f, 0xd1, 0x03, 0xb0, 0xca, 0x93, 0x64, 0x4c, 0x47, 0x11, 0x2d,
- 0x0e, 0x59, 0xdd, 0x05, 0xaa, 0x2b, 0xad, 0xb6, 0x01, 0x76, 0xc9, 0xe9, 0xa7, 0x58, 0x92, 0x0a,
- 0x61, 0x6a, 0x84, 0x55, 0xdf, 0x29, 0x88, 0xff, 0x08, 0xec, 0xa1, 0xc8, 0xde, 0xb1, 0x92, 0x8e,
- 0xde, 0x50, 0x21, 0xd1, 0x7d, 0x00, 0xa9, 0x8a, 0x68, 0x4c, 0x85, 0x74, 0x0c, 0xaf, 0x1d, 0xd8,
- 0xb8, 0x27, 0x27, 0xcf, 0xfe, 0x0e, 0xc0, 0x50, 0x64, 0x07, 0xaa, 0x85, 0x38, 0x42, 0xab, 0x30,
- 0xaf, 0x9f, 0xea, 0x59, 0xab, 0x42, 0x8d, 0x9a, 0xc6, 0x32, 0x9e, 0x8c, 0xaa, 0xce, 0xfe, 0x73,
- 0x58, 0x1a, 0x8a, 0xec, 0x15, 0xcb, 0x73, 0x56, 0x60, 0x52, 0x8e, 0x4f, 0xd1, 0x16, 0x74, 0x08,
- 0xe7, 0xb9, 0xc8, 0x34, 0xd9, 0xea, 0xaf, 0x84, 0x8d, 0x07, 0xe1, 0x6b, 0x65, 0xc1, 0x50, 0x64,
- 0xb8, 0x86, 0xf8, 0xcf, 0x60, 0x59, 0x95, 0xe4, 0xf8, 0x84, 0x08, 0xa9, 0x87, 0x9d, 0xa1, 0xf7,
- 0x07, 0x58, 0xfd, 0x8b, 0x3c, 0xfb, 0x04, 0x53, 0x85, 0x77, 0xc0, 0xd2, 0xc2, 0x19, 0x15, 0x92,
- 0x70, 0xb4, 0x09, 0xa6, 0x32, 0x6b, 0x8a, 0xda, 0xc4, 0x5e, 0xac, 0x01, 0xfe, 0x53, 0x58, 0x1c,
- 0x8a, 0xec, 0x7d, 0xc1, 0x67, 0x66, 0x3e, 0xd1, 0x6e, 0x0d, 0x48, 0xcc, 0x65, 0x42, 0x62, 0x79,
- 0x73, 0xe2, 0x43, 0xdd, 0xf2, 0xed, 0x09, 0xe1, 0xa7, 0xff, 0x59, 0x9f, 0xff, 0xd3, 0x00, 0x74,
- 0x05, 0x77, 0x8b, 0x4d, 0xed, 0x83, 0x5d, 0xb0, 0x94, 0xe8, 0x38, 0x10, 0x21, 0x9c, 0x96, 0xd7,
- 0x0e, 0xac, 0xfe, 0xd6, 0x25, 0xca, 0xbf, 0x1d, 0xc2, 0xdd, 0xc1, 0x3e, 0x4b, 0x49, 0x9d, 0x32,
- 0x6c, 0x15, 0x7f, 0x8a, 0x75, 0x0c, 0x8b, 0x57, 0x5e, 0xaf, 0xcf, 0x48, 0x00, 0x66, 0x93, 0x41,
- 0xab, 0xbf, 0x7a, 0xa9, 0x63, 0x13, 0x60, 0xac, 0x11, 0xfe, 0xa6, 0xde, 0xa3, 0x1e, 0x42, 0x2d,
- 0xea, 0x5a, 0x49, 0xff, 0x97, 0x01, 0x77, 0x2e, 0x23, 0x6f, 0xb1, 0x8f, 0x17, 0xd0, 0xd3, 0xda,
- 0x3a, 0x50, 0xd5, 0x32, 0x36, 0xa6, 0x2c, 0xa3, 0x51, 0x0f, 0xb5, 0x6d, 0x5d, 0xc5, 0x51, 0x91,
- 0x5b, 0xff, 0x0c, 0xa6, 0x0e, 0xf3, 0x4d, 0xbd, 0x46, 0x77, 0xa1, 0xc3, 0x8a, 0x31, 0x2d, 0xaa,
- 0xcf, 0xa2, 0x8b, 0xeb, 0x0a, 0x6d, 0x43, 0x47, 0xbb, 0x2c, 0xf4, 0x4f, 0x61, 0xf5, 0xd7, 0xae,
- 0x4e, 0xd1, 0xfc, 0x01, 0xb8, 0x86, 0xed, 0x6e, 0x7e, 0x3b, 0x77, 0x8d, 0xb3, 0x73, 0xd7, 0xf8,
- 0x71, 0xee, 0x1a, 0x5f, 0x2f, 0xdc, 0xb9, 0xb3, 0x0b, 0x77, 0xee, 0xfb, 0x85, 0x3b, 0x37, 0x68,
- 0x7f, 0xb4, 0xc2, 0xed, 0x86, 0x9d, 0x74, 0xf4, 0x4f, 0xf9, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff,
- 0xff, 0xe9, 0xcf, 0xb1, 0x11, 0x5c, 0x05, 0x00, 0x00,
+ // 634 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xd1, 0x4a, 0xdc, 0x40,
+ 0x14, 0x35, 0xbb, 0xd9, 0x75, 0xf7, 0x26, 0x2a, 0x1d, 0xa5, 0x6e, 0x85, 0x6e, 0x63, 0xa0, 0x18,
+ 0x90, 0x46, 0xd8, 0x82, 0x2d, 0x48, 0x5b, 0x6a, 0x29, 0xac, 0xe0, 0x8a, 0x1d, 0x2c, 0x85, 0xbe,
+ 0x84, 0x64, 0x33, 0xc6, 0x81, 0x4d, 0x26, 0xce, 0xcc, 0x16, 0xa4, 0x3f, 0xd1, 0xcf, 0xea, 0xa3,
+ 0x8f, 0x7d, 0x2c, 0x4a, 0x7f, 0xa1, 0xd0, 0xb7, 0x32, 0x93, 0x6c, 0xea, 0x5a, 0x15, 0xf5, 0x6d,
+ 0xee, 0xcc, 0x39, 0xe7, 0x5e, 0xee, 0xe1, 0x0c, 0x2c, 0x46, 0x47, 0x2c, 0x25, 0x41, 0x2a, 0x92,
+ 0x20, 0xcc, 0xa9, 0x9f, 0x73, 0x26, 0x19, 0x6a, 0x57, 0x97, 0x2b, 0x0b, 0x84, 0x73, 0xc6, 0xd5,
+ 0xb1, 0x78, 0x73, 0x03, 0x68, 0x6f, 0xf7, 0xdf, 0xc6, 0x31, 0x27, 0x42, 0xa0, 0x45, 0x68, 0xa4,
+ 0xc7, 0x01, 0x8d, 0x3b, 0x86, 0x63, 0x78, 0x26, 0x36, 0xd3, 0xe3, 0x9d, 0x18, 0x3d, 0x82, 0x56,
+ 0x18, 0x89, 0x20, 0x8c, 0x63, 0xde, 0xa9, 0x39, 0x86, 0x57, 0xc7, 0xb3, 0x61, 0x24, 0x14, 0x05,
+ 0xcd, 0x43, 0x8d, 0xe6, 0x9d, 0xba, 0x63, 0x78, 0x36, 0xae, 0xd1, 0x1c, 0x21, 0x30, 0x73, 0xc6,
+ 0x65, 0xc7, 0x74, 0x0c, 0xaf, 0x81, 0xf5, 0xd9, 0xfd, 0x0a, 0xad, 0x7d, 0xce, 0x86, 0x3b, 0xd9,
+ 0x21, 0x43, 0xcb, 0x30, 0x9b, 0x73, 0x36, 0x9c, 0x74, 0xb0, 0x71, 0x53, 0x95, 0x3b, 0xb1, 0x22,
+ 0x66, 0x61, 0x4a, 0xb4, 0xbe, 0x8d, 0xf5, 0x19, 0x3d, 0x01, 0x2b, 0x1f, 0x47, 0x23, 0x3a, 0x0c,
+ 0x68, 0x76, 0xc8, 0xca, 0x2e, 0x50, 0x5c, 0x69, 0xb5, 0x55, 0xb0, 0x73, 0x4e, 0xbf, 0x84, 0x92,
+ 0x14, 0x08, 0x53, 0x23, 0xac, 0xf2, 0x4e, 0x41, 0xdc, 0x67, 0x60, 0x0f, 0x44, 0x72, 0xc0, 0x72,
+ 0x3a, 0xdc, 0xa5, 0x42, 0xa2, 0xc7, 0x00, 0x52, 0x15, 0xc1, 0x88, 0x0a, 0xd9, 0x31, 0x9c, 0xba,
+ 0x67, 0xe3, 0xb6, 0x9c, 0x3c, 0xbb, 0x9b, 0x00, 0x03, 0x91, 0xec, 0xab, 0x16, 0xe2, 0x08, 0x2d,
+ 0x41, 0x43, 0x3f, 0x95, 0xb3, 0x16, 0x85, 0x1a, 0x35, 0x0e, 0x65, 0x38, 0x19, 0x55, 0x9d, 0xdd,
+ 0x57, 0x30, 0x3f, 0x10, 0xc9, 0x3b, 0x96, 0xa6, 0x2c, 0xc3, 0x24, 0x1f, 0x9d, 0xa0, 0x75, 0x68,
+ 0x12, 0xce, 0x53, 0x91, 0x68, 0xb2, 0xd5, 0x5b, 0xf4, 0x2b, 0x0f, 0xfc, 0xf7, 0xca, 0x82, 0x81,
+ 0x48, 0x70, 0x09, 0x71, 0xb7, 0x60, 0x41, 0x95, 0xe4, 0x78, 0x4c, 0x84, 0xd4, 0xc3, 0xde, 0xa1,
+ 0xf7, 0x27, 0x58, 0xba, 0x44, 0xbe, 0xfb, 0x04, 0x57, 0x0a, 0x6f, 0x82, 0xa5, 0x85, 0x13, 0x2a,
+ 0x24, 0xe1, 0x68, 0x0d, 0x4c, 0x65, 0xd6, 0x15, 0x6a, 0x13, 0x7b, 0xb1, 0x06, 0xb8, 0x2f, 0x61,
+ 0x6e, 0x20, 0x92, 0x8f, 0x19, 0xbf, 0x33, 0xf3, 0x85, 0x76, 0xab, 0x4f, 0x42, 0x2e, 0x23, 0x12,
+ 0xca, 0xdb, 0x13, 0x9f, 0xea, 0x96, 0x1f, 0xc6, 0x84, 0x9f, 0xdc, 0xb0, 0x3e, 0xf7, 0x97, 0x01,
+ 0x68, 0x0a, 0x77, 0x8f, 0x4d, 0xed, 0x81, 0x9d, 0xb1, 0x98, 0xe8, 0x38, 0x10, 0x21, 0x3a, 0x35,
+ 0xa7, 0xee, 0x59, 0xbd, 0xf5, 0x0b, 0x94, 0xff, 0x3b, 0xf8, 0xdb, 0xfd, 0x3d, 0x16, 0x93, 0x32,
+ 0x65, 0xd8, 0xca, 0xfe, 0x15, 0x2b, 0x18, 0xe6, 0xa6, 0x5e, 0xaf, 0xcf, 0x88, 0x07, 0x66, 0x95,
+ 0x41, 0xab, 0xb7, 0x74, 0xa1, 0x63, 0x15, 0x60, 0xac, 0x11, 0xee, 0x9a, 0xde, 0xa3, 0x1e, 0x42,
+ 0x2d, 0xea, 0x5a, 0x49, 0xf7, 0x4f, 0x0d, 0x1e, 0x5c, 0x44, 0xde, 0x63, 0x1f, 0xaf, 0xa1, 0xad,
+ 0xb5, 0x75, 0xa0, 0x8a, 0x65, 0xac, 0x5e, 0xb1, 0x8c, 0x4a, 0xdd, 0xd7, 0xb6, 0xb5, 0x14, 0x47,
+ 0x45, 0x6e, 0xe5, 0xb7, 0x01, 0xa6, 0x4e, 0xf3, 0x6d, 0xcd, 0x46, 0x0f, 0xa1, 0xc9, 0xb2, 0x11,
+ 0xcd, 0x8a, 0xdf, 0xa2, 0x85, 0xcb, 0x0a, 0x6d, 0x40, 0x53, 0xdb, 0x2c, 0xf4, 0x57, 0x61, 0xf5,
+ 0x96, 0xa7, 0xc7, 0xa8, 0x3e, 0x01, 0x5c, 0xc2, 0xd0, 0x1b, 0x98, 0x17, 0xe3, 0x68, 0x97, 0x0d,
+ 0xc3, 0xd1, 0x41, 0x41, 0x34, 0x6f, 0x26, 0x5e, 0x82, 0xa3, 0x2d, 0xb0, 0xc5, 0x38, 0xda, 0x23,
+ 0xb2, 0xa4, 0x37, 0x6e, 0xa6, 0x4f, 0x81, 0xb7, 0xd7, 0xbe, 0x9f, 0x75, 0x8d, 0xd3, 0xb3, 0xae,
+ 0xf1, 0xf3, 0xac, 0x6b, 0x7c, 0x3b, 0xef, 0xce, 0x9c, 0x9e, 0x77, 0x67, 0x7e, 0x9c, 0x77, 0x67,
+ 0xfa, 0xf5, 0xcf, 0x96, 0xbf, 0x51, 0x69, 0x44, 0x4d, 0xfd, 0x51, 0x3f, 0xff, 0x1b, 0x00, 0x00,
+ 0xff, 0xff, 0x36, 0xed, 0xd2, 0x3a, 0xdb, 0x05, 0x00, 0x00,
}
func (m *BHAddress) Marshal() (dAtA []byte, err error) {
@@ -1421,6 +1439,26 @@
}
i += n10
}
+ if m.SubLocalTopics != nil {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.SubLocalTopics.Size()))
+ n11, err11 := m.SubLocalTopics.MarshalTo(dAtA[i:])
+ if err11 != nil {
+ return 0, err11
+ }
+ i += n11
+ }
+ if m.SubNetTopics != nil {
+ dAtA[i] = 0x2a
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.SubNetTopics.Size()))
+ n12, err12 := m.SubNetTopics.MarshalTo(dAtA[i:])
+ if err12 != nil {
+ return 0, err12
+ }
+ i += n12
+ }
return i, nil
}
@@ -1694,6 +1732,14 @@
}
if m.Topics != nil {
l = m.Topics.Size()
+ n += 1 + l + sovBhomeMsgApi(uint64(l))
+ }
+ if m.SubLocalTopics != nil {
+ l = m.SubLocalTopics.Size()
+ n += 1 + l + sovBhomeMsgApi(uint64(l))
+ }
+ if m.SubNetTopics != nil {
+ l = m.SubNetTopics.Size()
n += 1 + l + sovBhomeMsgApi(uint64(l))
}
return n
@@ -3508,6 +3554,78 @@
return err
}
iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field SubLocalTopics", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsgApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.SubLocalTopics == nil {
+ m.SubLocalTopics = &MsgTopicList{}
+ }
+ if err := m.SubLocalTopics.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ case 5:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field SubNetTopics", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsgApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.SubNetTopics == nil {
+ m.SubNetTopics = &MsgTopicList{}
+ }
+ if err := m.SubNetTopics.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipBhomeMsgApi(dAtA[iNdEx:])
--
Gitblit v1.8.0