From d4a1e59e1dac399a1e0117fc5184732507b212c6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 24 六月 2021 18:15:26 +0800
Subject: [PATCH] rebuild bhome_msg.proto,bhome_msg_api.proto
---
proto/source/bhome_msg/bhome_msg.pb.go | 189 +++++++++++++++++++-------
proto/source/bhome_msg/bhome_msg_api.pb.go | 224 ++++++++++++++++++++++++-------
2 files changed, 307 insertions(+), 106 deletions(-)
diff --git a/proto/source/bhome_msg/bhome_msg.pb.go b/proto/source/bhome_msg/bhome_msg.pb.go
index ddc80ee..1010ed1 100644
--- a/proto/source/bhome_msg/bhome_msg.pb.go
+++ b/proto/source/bhome_msg/bhome_msg.pb.go
@@ -202,7 +202,8 @@
}
type MsgSubscribe struct {
- Topics *MsgTopicList `protobuf:"bytes,1,opt,name=topics,proto3" json:"topics,omitempty"`
+ Topics *MsgTopicList `protobuf:"bytes,1,opt,name=topics,proto3" json:"topics,omitempty"`
+ Network bool `protobuf:"varint,2,opt,name=network,proto3" json:"network,omitempty"`
}
func (m *MsgSubscribe) Reset() { *m = MsgSubscribe{} }
@@ -245,8 +246,16 @@
return nil
}
+func (m *MsgSubscribe) GetNetwork() bool {
+ if m != nil {
+ return m.Network
+ }
+ return false
+}
+
type MsgUnsubscribe struct {
- Topics *MsgTopicList `protobuf:"bytes,1,opt,name=topics,proto3" json:"topics,omitempty"`
+ Topics *MsgTopicList `protobuf:"bytes,1,opt,name=topics,proto3" json:"topics,omitempty"`
+ Network bool `protobuf:"varint,2,opt,name=network,proto3" json:"network,omitempty"`
}
func (m *MsgUnsubscribe) Reset() { *m = MsgUnsubscribe{} }
@@ -287,6 +296,13 @@
return m.Topics
}
return nil
+}
+
+func (m *MsgUnsubscribe) GetNetwork() bool {
+ if m != nil {
+ return m.Network
+ }
+ return false
}
type MsgRegisterRPC struct {
@@ -832,57 +848,58 @@
func init() { proto.RegisterFile("bhome_msg.proto", fileDescriptor_88ce6d52215a3d3f) }
var fileDescriptor_88ce6d52215a3d3f = []byte{
- // 786 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcb, 0x6e, 0xdb, 0x46,
- 0x14, 0x25, 0x2d, 0x51, 0x8f, 0x2b, 0xd5, 0x1a, 0x8f, 0x5e, 0xb4, 0x6a, 0x09, 0x82, 0x36, 0x15,
- 0xec, 0xc2, 0x86, 0xd5, 0x2e, 0x0a, 0x74, 0xd1, 0x5a, 0x76, 0x01, 0x0a, 0xa8, 0x02, 0x85, 0x89,
- 0x37, 0xd9, 0x08, 0x94, 0x39, 0xa0, 0x89, 0x88, 0x0f, 0xcd, 0x90, 0x89, 0xf5, 0x17, 0x49, 0xfe,
- 0x28, 0xbb, 0x6c, 0x02, 0x78, 0x99, 0x65, 0x60, 0xff, 0x40, 0x3e, 0x21, 0x98, 0x21, 0x29, 0xd1,
- 0x6f, 0x04, 0xd9, 0x8d, 0xce, 0xbd, 0xe7, 0x9c, 0x3b, 0x77, 0xee, 0xa5, 0xa0, 0x32, 0x3b, 0xf7,
- 0x1c, 0x32, 0x75, 0x98, 0xb5, 0xef, 0x53, 0x2f, 0xf0, 0x70, 0x71, 0x05, 0xb4, 0xaa, 0xab, 0xe3,
- 0xd4, 0xf0, 0xed, 0x28, 0xde, 0xaa, 0x10, 0x4a, 0x3d, 0xba, 0x26, 0xf4, 0xbe, 0xc9, 0x50, 0x1c,
- 0x6a, 0x63, 0x66, 0x69, 0xc4, 0x30, 0x71, 0x1d, 0x72, 0x3c, 0xdf, 0x36, 0x55, 0xb9, 0x2b, 0xf7,
- 0xcb, 0xba, 0xe2, 0x30, 0x6b, 0x64, 0xe2, 0x5d, 0x50, 0xa8, 0x17, 0x06, 0x44, 0xdd, 0xe8, 0x66,
- 0xfa, 0xa5, 0x41, 0x6d, 0x7f, 0x6d, 0x3b, 0xd4, 0x8e, 0x4c, 0x93, 0x12, 0xc6, 0xf4, 0x28, 0x05,
- 0xef, 0x40, 0x31, 0xb0, 0x1d, 0xc2, 0x02, 0xc3, 0xf1, 0xd5, 0x4c, 0x57, 0xee, 0x67, 0xf4, 0x35,
- 0x80, 0x31, 0x64, 0x83, 0xa5, 0x4f, 0xd4, 0x6c, 0x57, 0xee, 0x2b, 0xba, 0x38, 0x73, 0x53, 0xc6,
- 0x5c, 0x6e, 0xaa, 0x74, 0xe5, 0x7e, 0x56, 0x57, 0x18, 0x73, 0x47, 0x26, 0x6e, 0x42, 0xde, 0xa7,
- 0xde, 0x19, 0xc7, 0x73, 0xa2, 0x98, 0x1c, 0xff, 0x39, 0x32, 0x71, 0x0d, 0x94, 0xc0, 0xf3, 0xed,
- 0x33, 0x35, 0x1f, 0xd5, 0x28, 0x7e, 0xe0, 0x3e, 0x64, 0x4d, 0xc2, 0x02, 0xb5, 0xd0, 0x95, 0x1f,
- 0x2c, 0x51, 0x64, 0xf4, 0xfe, 0x81, 0xf2, 0x98, 0x59, 0x2f, 0xc2, 0x19, 0x3b, 0xa3, 0xf6, 0x8c,
- 0xe0, 0x03, 0xc8, 0x09, 0x09, 0x26, 0x2e, 0x5d, 0x1a, 0x34, 0x53, 0xdc, 0x31, 0xb3, 0x5e, 0xf2,
- 0xd8, 0xff, 0x36, 0x0b, 0xf4, 0x38, 0xad, 0x77, 0x04, 0x9b, 0x63, 0x66, 0x9d, 0xba, 0xec, 0x67,
- 0x25, 0x74, 0x62, 0xd9, 0x2c, 0x20, 0x54, 0x9f, 0x1c, 0xff, 0xb8, 0xc4, 0x01, 0x94, 0xc6, 0xcc,
- 0x9a, 0xf0, 0x9e, 0xb8, 0x76, 0x80, 0xbb, 0x50, 0x26, 0x17, 0x01, 0x35, 0xa6, 0xce, 0x62, 0xea,
- 0x86, 0x8e, 0x50, 0x51, 0x74, 0x10, 0xd8, 0x78, 0xf1, 0x2c, 0x74, 0x7a, 0xef, 0x65, 0x40, 0x29,
- 0x86, 0x4e, 0xfc, 0xf9, 0x12, 0xef, 0x41, 0x8e, 0x50, 0xea, 0x30, 0x2b, 0xb6, 0xad, 0xa6, 0x6c,
- 0xff, 0xe3, 0xb3, 0xc2, 0xcb, 0x8c, 0x53, 0x70, 0x1b, 0x20, 0x7a, 0x12, 0xd7, 0x24, 0x17, 0xea,
- 0x86, 0x70, 0x28, 0x8a, 0x57, 0xe1, 0x00, 0x3e, 0x84, 0x62, 0x52, 0x02, 0x53, 0x33, 0x8f, 0x8c,
- 0x4a, 0x21, 0xae, 0x8a, 0xf5, 0x3e, 0xcb, 0x00, 0xa2, 0x11, 0x8b, 0x90, 0xb0, 0x00, 0xff, 0x09,
- 0x05, 0x1a, 0xf7, 0x24, 0xae, 0xa7, 0x71, 0xb3, 0x0d, 0x49, 0xc7, 0x34, 0x49, 0x5f, 0x65, 0xe2,
- 0x23, 0xf8, 0x45, 0xf4, 0x64, 0x4a, 0x23, 0x19, 0x51, 0x59, 0x69, 0xd0, 0xba, 0x4d, 0x15, 0x41,
- 0xd1, 0x48, 0x4d, 0xd2, 0xcb, 0x82, 0x92, 0x18, 0xff, 0x0d, 0xa5, 0x48, 0x62, 0x11, 0x12, 0xba,
- 0x14, 0x73, 0x5b, 0x1a, 0xa8, 0x37, 0x05, 0x9e, 0xf3, 0x50, 0x42, 0x07, 0x91, 0x2e, 0xa0, 0x61,
- 0x11, 0xf2, 0xb1, 0x73, 0xef, 0x2f, 0x28, 0x08, 0x2b, 0xde, 0xda, 0xdf, 0x21, 0x4f, 0xa8, 0xd8,
- 0xb5, 0xa7, 0x7a, 0x3b, 0x66, 0x56, 0x2f, 0x8c, 0xf7, 0x70, 0xe8, 0x99, 0x4b, 0x7c, 0xb8, 0x52,
- 0x8c, 0xa9, 0xf5, 0x7b, 0xef, 0xa2, 0x49, 0x7a, 0x92, 0x87, 0xf7, 0x40, 0xa1, 0xdc, 0x36, 0xbe,
- 0x7c, 0xf5, 0x36, 0xc1, 0x9f, 0x2f, 0x35, 0x49, 0x8f, 0x72, 0x86, 0x05, 0xc8, 0x51, 0xb2, 0xa0,
- 0xc4, 0xdf, 0xfd, 0x98, 0x81, 0x3c, 0x1f, 0x2f, 0xbe, 0x88, 0x55, 0xa8, 0xbc, 0x8e, 0xcf, 0x23,
- 0xf7, 0x8d, 0x31, 0xb7, 0x4d, 0x24, 0xa5, 0x41, 0xdd, 0x78, 0x7b, 0x62, 0x04, 0x06, 0x92, 0x71,
- 0x13, 0xaa, 0x09, 0x78, 0xec, 0x39, 0x8e, 0xe7, 0x0a, 0x7d, 0xb4, 0x81, 0x6b, 0x80, 0x92, 0x40,
- 0x32, 0x67, 0xa8, 0x80, 0xb7, 0xa1, 0x7e, 0x1b, 0x8d, 0x08, 0xc5, 0x34, 0x21, 0x79, 0x5b, 0x04,
- 0xb8, 0x0e, 0x5b, 0x09, 0xaa, 0x11, 0x83, 0x06, 0x33, 0x62, 0x04, 0xa8, 0x8c, 0x1b, 0x80, 0x13,
- 0x78, 0xfd, 0x18, 0x68, 0x13, 0xff, 0x0a, 0xcd, 0xbb, 0x78, 0xe4, 0x50, 0xc1, 0x2a, 0xd4, 0xd6,
- 0x0e, 0xeb, 0x11, 0x40, 0x08, 0xb7, 0x61, 0xfb, 0xbe, 0x48, 0x44, 0xdc, 0x4a, 0x5f, 0x32, 0xb5,
- 0xa8, 0x08, 0xa7, 0x5b, 0x32, 0x09, 0x67, 0x73, 0x9b, 0x9d, 0xa3, 0x5a, 0xba, 0xe4, 0xd5, 0xa7,
- 0x05, 0x35, 0xd2, 0x22, 0xa9, 0x0f, 0x06, 0x52, 0xd3, 0x77, 0x39, 0x75, 0x93, 0x51, 0x46, 0xad,
- 0xb4, 0x8e, 0xb8, 0x0b, 0x6f, 0x18, 0xda, 0xc1, 0x2d, 0x68, 0xdc, 0x81, 0xa3, 0x42, 0xdb, 0x83,
- 0x0f, 0x32, 0x14, 0xa2, 0xca, 0x27, 0xc7, 0xf8, 0x5f, 0x50, 0x44, 0x02, 0x7e, 0x70, 0x7a, 0x5b,
- 0xed, 0x87, 0x22, 0xd1, 0xdc, 0x9e, 0x40, 0x3e, 0x59, 0x8b, 0x47, 0x56, 0xe8, 0x09, 0x95, 0xe1,
- 0x6f, 0x9f, 0xae, 0x3a, 0xf2, 0xe5, 0x55, 0x47, 0xfe, 0x7a, 0xd5, 0x91, 0xdf, 0x5d, 0x77, 0xa4,
- 0xcb, 0xeb, 0x8e, 0xf4, 0xe5, 0xba, 0x23, 0x69, 0x99, 0x57, 0xa5, 0xfd, 0x83, 0x15, 0x77, 0x96,
- 0x13, 0x7f, 0x44, 0x7f, 0x7c, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x32, 0xaa, 0x1c, 0xcc, 0x06,
- 0x00, 0x00,
+ // 809 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xdb, 0x46,
+ 0x10, 0x16, 0x2d, 0x53, 0xa2, 0x46, 0x6a, 0xbc, 0x19, 0xc9, 0x36, 0xa3, 0xc6, 0x02, 0xc1, 0x4b,
+ 0x85, 0xa4, 0xb0, 0x11, 0xb5, 0x87, 0x02, 0xbd, 0xd4, 0x72, 0x0a, 0xd0, 0x40, 0x55, 0xb8, 0xdb,
+ 0xe6, 0xd0, 0xf6, 0x20, 0x50, 0xe6, 0x82, 0x21, 0x22, 0xfe, 0x68, 0x77, 0xd9, 0x44, 0x6f, 0xd1,
+ 0xf6, 0x8d, 0x7a, 0xeb, 0xa5, 0x40, 0x8e, 0x3d, 0x16, 0xf6, 0x0b, 0xf4, 0x11, 0x8a, 0x5d, 0x92,
+ 0x12, 0xe3, 0xc4, 0x31, 0x7a, 0xc8, 0x6d, 0xf7, 0x9b, 0xf9, 0xbe, 0xf9, 0xd9, 0x19, 0x12, 0xf6,
+ 0x16, 0xcf, 0xd3, 0x98, 0xcd, 0x63, 0x11, 0x1e, 0x67, 0x3c, 0x95, 0x29, 0x76, 0x36, 0xc0, 0xb0,
+ 0xbf, 0x39, 0xce, 0xfd, 0x2c, 0x2a, 0xec, 0xc3, 0x3d, 0xc6, 0x79, 0xca, 0xb7, 0x04, 0xf7, 0x5f,
+ 0x03, 0x3a, 0x53, 0x6f, 0x26, 0x42, 0x8f, 0xf9, 0x01, 0xee, 0x43, 0x4b, 0xf9, 0x47, 0x81, 0x6d,
+ 0x38, 0xc6, 0xb8, 0x47, 0xcd, 0x58, 0x84, 0xe7, 0x01, 0x3e, 0x02, 0x93, 0xa7, 0xb9, 0x64, 0xf6,
+ 0x8e, 0xd3, 0x1c, 0x77, 0x27, 0x83, 0xe3, 0x6d, 0xd8, 0xa9, 0x77, 0x1a, 0x04, 0x9c, 0x09, 0x41,
+ 0x0b, 0x17, 0x7c, 0x08, 0x1d, 0x19, 0xc5, 0x4c, 0x48, 0x3f, 0xce, 0xec, 0xa6, 0x63, 0x8c, 0x9b,
+ 0x74, 0x0b, 0x20, 0xc2, 0xae, 0x5c, 0x67, 0xcc, 0xde, 0x75, 0x8c, 0xb1, 0x49, 0xf5, 0x59, 0x05,
+ 0x15, 0x22, 0x51, 0x41, 0x4d, 0xc7, 0x18, 0xef, 0x52, 0x53, 0x88, 0xe4, 0x3c, 0xc0, 0x43, 0x68,
+ 0x67, 0x3c, 0xbd, 0x54, 0x78, 0x4b, 0x27, 0xd3, 0x52, 0xd7, 0xf3, 0x00, 0x07, 0x60, 0xca, 0x34,
+ 0x8b, 0x2e, 0xed, 0x76, 0x91, 0xa3, 0xbe, 0xe0, 0x18, 0x76, 0x03, 0x26, 0xa4, 0x6d, 0x39, 0xc6,
+ 0xad, 0x29, 0x6a, 0x0f, 0xf7, 0x47, 0xe8, 0xcd, 0x44, 0xf8, 0x7d, 0xbe, 0x10, 0x97, 0x3c, 0x5a,
+ 0x30, 0x3c, 0x81, 0x96, 0x96, 0x10, 0xba, 0xe8, 0xee, 0xe4, 0xb0, 0xc6, 0x9d, 0x89, 0xf0, 0x07,
+ 0x65, 0xfb, 0x26, 0x12, 0x92, 0x96, 0x6e, 0x68, 0x43, 0x3b, 0x61, 0xf2, 0x65, 0xca, 0x5f, 0xd8,
+ 0x3b, 0x8e, 0x31, 0xb6, 0x68, 0x75, 0x75, 0x7f, 0x86, 0x7b, 0x33, 0x11, 0x3e, 0x4b, 0xc4, 0x87,
+ 0x10, 0x3f, 0xd5, 0xe2, 0x94, 0x85, 0x91, 0x90, 0x8c, 0xd3, 0x8b, 0xb3, 0xff, 0x2d, 0xee, 0x9e,
+ 0x40, 0x77, 0x26, 0xc2, 0x0b, 0xd5, 0xc7, 0x24, 0x92, 0xe8, 0x40, 0x8f, 0xbd, 0x92, 0xdc, 0x9f,
+ 0xc7, 0xab, 0x79, 0x92, 0xc7, 0x5a, 0xc5, 0xa4, 0xa0, 0xb1, 0xd9, 0xea, 0xdb, 0x3c, 0x76, 0x7f,
+ 0x33, 0x80, 0xd4, 0x18, 0x94, 0x65, 0xcb, 0x35, 0x3e, 0x86, 0x16, 0xe3, 0x3c, 0x16, 0x61, 0x19,
+ 0xb6, 0x5f, 0x0b, 0xfb, 0xb5, 0x9a, 0x2f, 0x95, 0x66, 0xe9, 0x82, 0x47, 0x00, 0xc5, 0x33, 0x26,
+ 0x01, 0x7b, 0xa5, 0x4b, 0x32, 0x69, 0x47, 0xbf, 0xa4, 0x02, 0xf0, 0x09, 0x74, 0xaa, 0x14, 0x84,
+ 0xdd, 0x7c, 0xcf, 0x78, 0x59, 0x65, 0x56, 0xc2, 0xfd, 0xcb, 0x00, 0xd0, 0x8d, 0x58, 0xe5, 0x4c,
+ 0x48, 0xfc, 0x1c, 0x2c, 0x5e, 0xf6, 0xa4, 0xcc, 0xe7, 0xe0, 0xcd, 0x36, 0x54, 0x1d, 0xf3, 0x1a,
+ 0x74, 0xe3, 0x89, 0xa7, 0xf0, 0x91, 0xee, 0xc9, 0x9c, 0x17, 0x32, 0x3a, 0xb3, 0xee, 0x64, 0x78,
+ 0x93, 0xaa, 0x8d, 0xba, 0x91, 0x5e, 0x83, 0xf6, 0x34, 0xa5, 0x0a, 0xfc, 0x25, 0x74, 0x0b, 0x89,
+ 0x55, 0xce, 0xf8, 0x5a, 0xcf, 0x7a, 0x77, 0x62, 0xbf, 0x29, 0xf0, 0x9d, 0x32, 0x55, 0x74, 0xd0,
+ 0xee, 0x1a, 0x9a, 0x76, 0xa0, 0x5d, 0x46, 0x76, 0xbf, 0x00, 0x4b, 0x87, 0x52, 0xad, 0xfd, 0x14,
+ 0xda, 0x8c, 0xeb, 0xfd, 0xbc, 0xab, 0xb7, 0x33, 0x11, 0xba, 0x79, 0xb9, 0xbb, 0xd3, 0x34, 0x58,
+ 0xe3, 0x93, 0x8d, 0x62, 0x49, 0xdd, 0x7f, 0x67, 0x2d, 0x5e, 0x83, 0x56, 0x7e, 0xf8, 0x18, 0x4c,
+ 0xae, 0xc2, 0x96, 0xc5, 0xf7, 0x6f, 0x12, 0xb2, 0xe5, 0xda, 0x6b, 0xd0, 0xc2, 0x67, 0x6a, 0x41,
+ 0x8b, 0xb3, 0x15, 0x67, 0xd9, 0xa3, 0x3f, 0x9a, 0xd0, 0x56, 0xe3, 0xa5, 0x96, 0xb7, 0x0f, 0x7b,
+ 0x2f, 0xca, 0xf3, 0x79, 0xf2, 0x8b, 0xbf, 0x8c, 0x02, 0xd2, 0xa8, 0x83, 0xd4, 0x7f, 0xf9, 0xd4,
+ 0x97, 0x3e, 0x31, 0xf0, 0x10, 0xfa, 0x15, 0x78, 0x96, 0xc6, 0x71, 0x9a, 0x68, 0x7d, 0xb2, 0x83,
+ 0x03, 0x20, 0x95, 0xa1, 0x9a, 0x33, 0x62, 0xe1, 0x03, 0xd8, 0xbf, 0x89, 0x16, 0x84, 0x4e, 0x9d,
+ 0x50, 0xbd, 0x2d, 0x01, 0xdc, 0x87, 0xfb, 0x15, 0xea, 0x31, 0x9f, 0xcb, 0x05, 0xf3, 0x25, 0xe9,
+ 0xe1, 0x01, 0x60, 0x05, 0x6f, 0x1f, 0x83, 0xdc, 0xc3, 0x8f, 0xe1, 0xf0, 0x6d, 0xbc, 0x88, 0xb0,
+ 0x87, 0x36, 0x0c, 0xb6, 0x11, 0xb6, 0x23, 0x40, 0x08, 0x1e, 0xc1, 0x83, 0x77, 0x59, 0x0a, 0xe2,
+ 0xfd, 0x7a, 0x91, 0xb5, 0x45, 0x25, 0x58, 0x6f, 0xc9, 0x45, 0xbe, 0x58, 0x46, 0xe2, 0x39, 0x19,
+ 0xd4, 0x53, 0xde, 0x7c, 0x8e, 0xc8, 0x41, 0x5d, 0xa4, 0xf6, 0x29, 0x21, 0x76, 0xbd, 0x96, 0x67,
+ 0x49, 0x35, 0xca, 0x64, 0x58, 0xd7, 0xd1, 0xb5, 0xa8, 0x86, 0x91, 0x87, 0x38, 0x84, 0x83, 0xb7,
+ 0xe0, 0x22, 0xd1, 0xa3, 0xc9, 0xef, 0x06, 0x58, 0x45, 0xe6, 0x17, 0x67, 0xf8, 0x15, 0x98, 0xda,
+ 0x01, 0x6f, 0x9d, 0xde, 0xe1, 0xd1, 0x6d, 0x96, 0x62, 0x6e, 0x9f, 0x42, 0xbb, 0x5a, 0x8b, 0xf7,
+ 0xac, 0xd0, 0x1d, 0x2a, 0xd3, 0x4f, 0xfe, 0xbc, 0x1a, 0x19, 0xaf, 0xaf, 0x46, 0xc6, 0x3f, 0x57,
+ 0x23, 0xe3, 0xd7, 0xeb, 0x51, 0xe3, 0xf5, 0xf5, 0xa8, 0xf1, 0xf7, 0xf5, 0xa8, 0xe1, 0x35, 0x7f,
+ 0xea, 0x1e, 0x9f, 0x6c, 0xb8, 0x8b, 0x96, 0xfe, 0x79, 0x7d, 0xf6, 0x5f, 0x00, 0x00, 0x00, 0xff,
+ 0xff, 0x27, 0x28, 0x5d, 0xb5, 0x00, 0x07, 0x00, 0x00,
}
func (m *BHMsgHead) Marshal() (dAtA []byte, err error) {
@@ -983,6 +1000,16 @@
}
i += n2
}
+ if m.Network {
+ dAtA[i] = 0x10
+ i++
+ if m.Network {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
+ }
return i, nil
}
@@ -1010,6 +1037,16 @@
return 0, err3
}
i += n3
+ }
+ if m.Network {
+ dAtA[i] = 0x10
+ i++
+ if m.Network {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
}
return i, nil
}
@@ -1317,6 +1354,9 @@
l = m.Topics.Size()
n += 1 + l + sovBhomeMsg(uint64(l))
}
+ if m.Network {
+ n += 2
+ }
return n
}
@@ -1329,6 +1369,9 @@
if m.Topics != nil {
l = m.Topics.Size()
n += 1 + l + sovBhomeMsg(uint64(l))
+ }
+ if m.Network {
+ n += 2
}
return n
}
@@ -1831,6 +1874,26 @@
return err
}
iNdEx = postIndex
+ case 2:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.Network = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipBhomeMsg(dAtA[iNdEx:])
@@ -1920,6 +1983,26 @@
return err
}
iNdEx = postIndex
+ case 2:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Network", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.Network = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipBhomeMsg(dAtA[iNdEx:])
diff --git a/proto/source/bhome_msg/bhome_msg_api.pb.go b/proto/source/bhome_msg/bhome_msg_api.pb.go
index 2a565f0..8a62e34 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"`
+ Service *MsgTopicList `protobuf:"bytes,3,opt,name=service,proto3" json:"service,omitempty"`
+ LocalSub *MsgTopicList `protobuf:"bytes,4,opt,name=local_sub,json=localSub,proto3" json:"local_sub,omitempty"`
+ NetSub *MsgTopicList `protobuf:"bytes,5,opt,name=net_sub,json=netSub,proto3" json:"net_sub,omitempty"`
}
func (m *MsgQueryProcReply_Info) Reset() { *m = MsgQueryProcReply_Info{} }
@@ -831,9 +833,23 @@
return false
}
-func (m *MsgQueryProcReply_Info) GetTopics() *MsgTopicList {
+func (m *MsgQueryProcReply_Info) GetService() *MsgTopicList {
if m != nil {
- return m.Topics
+ return m.Service
+ }
+ return nil
+}
+
+func (m *MsgQueryProcReply_Info) GetLocalSub() *MsgTopicList {
+ if m != nil {
+ return m.LocalSub
+ }
+ return nil
+}
+
+func (m *MsgQueryProcReply_Info) GetNetSub() *MsgTopicList {
+ if m != nil {
+ return m.NetSub
}
return nil
}
@@ -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,
+ // 640 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x6f, 0x6b, 0x13, 0x4f,
+ 0x10, 0xee, 0x25, 0x97, 0x7f, 0x73, 0xd7, 0x96, 0xdf, 0xb6, 0xfc, 0x1a, 0x0b, 0xc6, 0xf4, 0x40,
+ 0x7a, 0x50, 0x8c, 0x1a, 0xa5, 0x0a, 0xa2, 0x60, 0x45, 0x48, 0xc1, 0x94, 0xba, 0x55, 0x04, 0xdf,
+ 0x1c, 0x77, 0xb9, 0xed, 0x75, 0x21, 0x77, 0x7b, 0xdd, 0xdd, 0x14, 0x8a, 0x5f, 0xc2, 0x8f, 0xe5,
+ 0xcb, 0xbe, 0xf4, 0xa5, 0xa4, 0xf4, 0x7b, 0xc8, 0x4e, 0x92, 0xb3, 0xd5, 0xb6, 0xb4, 0x7d, 0xb7,
+ 0xb3, 0xf3, 0x3c, 0xcf, 0x0c, 0x33, 0x3c, 0x03, 0x4b, 0xd1, 0x81, 0x48, 0x59, 0x90, 0xaa, 0x24,
+ 0x08, 0x73, 0xde, 0xc9, 0xa5, 0xd0, 0x82, 0x34, 0x8a, 0xcf, 0xd5, 0x45, 0x26, 0xa5, 0x90, 0xe6,
+ 0x39, 0xc9, 0x79, 0x01, 0x34, 0xb6, 0x7a, 0x6f, 0xe3, 0x58, 0x32, 0xa5, 0xc8, 0x12, 0x54, 0xd2,
+ 0xc3, 0x80, 0xc7, 0x4d, 0xab, 0x6d, 0xf9, 0x36, 0xb5, 0xd3, 0xc3, 0xed, 0x98, 0xdc, 0x83, 0x7a,
+ 0x18, 0xa9, 0x20, 0x8c, 0x63, 0xd9, 0x2c, 0xb5, 0x2d, 0xbf, 0x4c, 0x6b, 0x61, 0xa4, 0x0c, 0x85,
+ 0x2c, 0x40, 0x89, 0xe7, 0xcd, 0x72, 0xdb, 0xf2, 0x5d, 0x5a, 0xe2, 0x39, 0x21, 0x60, 0xe7, 0x42,
+ 0xea, 0xa6, 0xdd, 0xb6, 0xfc, 0x0a, 0xc5, 0xb7, 0xf7, 0x0d, 0xea, 0xbb, 0x52, 0x0c, 0xb6, 0xb3,
+ 0x7d, 0x41, 0x56, 0xa0, 0x96, 0x4b, 0x31, 0x98, 0x55, 0x70, 0x69, 0xd5, 0x84, 0xdb, 0xb1, 0x21,
+ 0x66, 0x61, 0xca, 0x50, 0xdf, 0xa5, 0xf8, 0x26, 0x0f, 0xc0, 0xc9, 0x47, 0xd1, 0x90, 0x0f, 0x02,
+ 0x9e, 0xed, 0x8b, 0x69, 0x15, 0x98, 0x7c, 0xa1, 0xda, 0x1a, 0xb8, 0xb9, 0xe4, 0x47, 0xa1, 0x66,
+ 0x13, 0x84, 0x8d, 0x08, 0x67, 0xfa, 0x67, 0x20, 0xde, 0x23, 0x70, 0xfb, 0x2a, 0xf9, 0x24, 0x72,
+ 0x3e, 0xf8, 0xc0, 0x95, 0x26, 0xf7, 0x01, 0xb4, 0x09, 0x82, 0x21, 0x57, 0xba, 0x69, 0xb5, 0xcb,
+ 0xbe, 0x4b, 0x1b, 0x7a, 0x96, 0xf6, 0x36, 0x01, 0xfa, 0x2a, 0xd9, 0x35, 0x25, 0xd4, 0x01, 0x59,
+ 0x86, 0x0a, 0xa6, 0xa6, 0xbd, 0x4e, 0x02, 0xd3, 0x6a, 0x1c, 0xea, 0x70, 0xd6, 0xaa, 0x79, 0x7b,
+ 0xaf, 0x61, 0xa1, 0xaf, 0x92, 0x77, 0x22, 0x4d, 0x45, 0x46, 0x59, 0x3e, 0x3c, 0x26, 0x1b, 0x50,
+ 0x65, 0x52, 0xa6, 0x2a, 0x41, 0xb2, 0xd3, 0x5d, 0xea, 0x14, 0x3b, 0xe8, 0xbc, 0x37, 0x2b, 0xe8,
+ 0xab, 0x84, 0x4e, 0x21, 0xde, 0x2b, 0x58, 0x34, 0x21, 0x3b, 0x1c, 0x31, 0xa5, 0xb1, 0xd9, 0x5b,
+ 0xd4, 0xfe, 0x02, 0xcb, 0x7f, 0x91, 0x6f, 0xdf, 0xc1, 0xa5, 0xc2, 0x9b, 0xe0, 0xa0, 0x70, 0xc2,
+ 0x95, 0x66, 0x92, 0xac, 0x83, 0x6d, 0x96, 0x75, 0x89, 0xda, 0x6c, 0xbd, 0x14, 0x01, 0xde, 0x4b,
+ 0x98, 0xef, 0xab, 0xe4, 0x73, 0x26, 0x6f, 0xcd, 0x7c, 0x81, 0xdb, 0xea, 0xb1, 0x50, 0xea, 0x88,
+ 0x85, 0xfa, 0xe6, 0xc4, 0x87, 0x58, 0xf2, 0xe3, 0x88, 0xc9, 0xe3, 0x6b, 0xc6, 0xe7, 0x9d, 0x59,
+ 0x40, 0x2e, 0xe0, 0xee, 0x30, 0xa9, 0x1d, 0x70, 0x33, 0x11, 0x33, 0xb4, 0x03, 0x53, 0xaa, 0x59,
+ 0x6a, 0x97, 0x7d, 0xa7, 0xbb, 0x71, 0x8e, 0xf2, 0x6f, 0x85, 0xce, 0x56, 0x6f, 0x47, 0xc4, 0x6c,
+ 0xea, 0x32, 0xea, 0x64, 0x7f, 0x82, 0x55, 0x0a, 0xf3, 0x17, 0xb2, 0x57, 0x7b, 0xc4, 0x07, 0xbb,
+ 0xf0, 0xa0, 0xd3, 0x5d, 0x3e, 0x57, 0xb1, 0x30, 0x30, 0x45, 0x84, 0xb7, 0x8e, 0x73, 0xc4, 0x26,
+ 0xcc, 0xa0, 0xae, 0x94, 0xf4, 0xce, 0x4a, 0xf0, 0xdf, 0x79, 0xe4, 0x1d, 0xe6, 0xf1, 0x06, 0x1a,
+ 0xa8, 0x8d, 0x86, 0x9a, 0x0c, 0x63, 0xed, 0x92, 0x61, 0x14, 0xea, 0x1d, 0x5c, 0x5b, 0xdd, 0x70,
+ 0x8c, 0xe5, 0x56, 0xc7, 0x16, 0xd8, 0xe8, 0xe6, 0x9b, 0x2e, 0x9b, 0xfc, 0x0f, 0x55, 0x91, 0x0d,
+ 0x79, 0x36, 0xb9, 0x16, 0x75, 0x3a, 0x8d, 0xc8, 0x53, 0xa8, 0x29, 0x26, 0x8f, 0xf8, 0x80, 0xe1,
+ 0xad, 0x70, 0xba, 0x2b, 0x17, 0xfb, 0x28, 0xae, 0x00, 0x9d, 0xe1, 0xc8, 0x73, 0x68, 0x0c, 0xc5,
+ 0x20, 0x1c, 0x06, 0x6a, 0x14, 0xe1, 0xf9, 0xb8, 0x86, 0x54, 0x47, 0xe4, 0xde, 0x28, 0x22, 0x4f,
+ 0xa0, 0x96, 0x31, 0x8d, 0x9c, 0xca, 0xf5, 0x9c, 0x6a, 0xc6, 0xf4, 0xde, 0x28, 0xda, 0x5a, 0xff,
+ 0x31, 0x6e, 0x59, 0x27, 0xe3, 0x96, 0xf5, 0x6b, 0xdc, 0xb2, 0xbe, 0x9f, 0xb6, 0xe6, 0x4e, 0x4e,
+ 0x5b, 0x73, 0x3f, 0x4f, 0x5b, 0x73, 0xbd, 0xf2, 0x57, 0xa7, 0xf3, 0xb8, 0x60, 0x47, 0x55, 0x3c,
+ 0xca, 0xcf, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x71, 0x22, 0x26, 0xc9, 0xc7, 0x05, 0x00, 0x00,
}
func (m *BHAddress) Marshal() (dAtA []byte, err error) {
@@ -1411,15 +1429,35 @@
}
i++
}
- if m.Topics != nil {
+ if m.Service != nil {
dAtA[i] = 0x1a
i++
- i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.Topics.Size()))
- n10, err10 := m.Topics.MarshalTo(dAtA[i:])
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.Service.Size()))
+ n10, err10 := m.Service.MarshalTo(dAtA[i:])
if err10 != nil {
return 0, err10
}
i += n10
+ }
+ if m.LocalSub != nil {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.LocalSub.Size()))
+ n11, err11 := m.LocalSub.MarshalTo(dAtA[i:])
+ if err11 != nil {
+ return 0, err11
+ }
+ i += n11
+ }
+ if m.NetSub != nil {
+ dAtA[i] = 0x2a
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.NetSub.Size()))
+ n12, err12 := m.NetSub.MarshalTo(dAtA[i:])
+ if err12 != nil {
+ return 0, err12
+ }
+ i += n12
}
return i, nil
}
@@ -1692,8 +1730,16 @@
if m.Online {
n += 2
}
- if m.Topics != nil {
- l = m.Topics.Size()
+ if m.Service != nil {
+ l = m.Service.Size()
+ n += 1 + l + sovBhomeMsgApi(uint64(l))
+ }
+ if m.LocalSub != nil {
+ l = m.LocalSub.Size()
+ n += 1 + l + sovBhomeMsgApi(uint64(l))
+ }
+ if m.NetSub != nil {
+ l = m.NetSub.Size()
n += 1 + l + sovBhomeMsgApi(uint64(l))
}
return n
@@ -3474,7 +3520,7 @@
m.Online = bool(v != 0)
case 3:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Topics", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Service", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@@ -3501,10 +3547,82 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- if m.Topics == nil {
- m.Topics = &MsgTopicList{}
+ if m.Service == nil {
+ m.Service = &MsgTopicList{}
}
- if err := m.Topics.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ if err := m.Service.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field LocalSub", 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.LocalSub == nil {
+ m.LocalSub = &MsgTopicList{}
+ }
+ if err := m.LocalSub.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ case 5:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field NetSub", 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.NetSub == nil {
+ m.NetSub = &MsgTopicList{}
+ }
+ if err := m.NetSub.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
--
Gitblit v1.8.0