From 330f78f3334bcdcdb4cc2ab2dbf66604e0224d71 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 16:21:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/valib/bhshmq
---
proto/source/bhome_msg/bhome_msg.pb.go | 253 +++++++++++++++++++++++++++++++-------------------
1 files changed, 156 insertions(+), 97 deletions(-)
diff --git a/proto/source/bhome_msg/bhome_msg.pb.go b/proto/source/bhome_msg/bhome_msg.pb.go
index a983806..ddc80ee 100644
--- a/proto/source/bhome_msg/bhome_msg.pb.go
+++ b/proto/source/bhome_msg/bhome_msg.pb.go
@@ -109,6 +109,7 @@
SsnId uint64 `protobuf:"varint,5,opt,name=ssn_id,json=ssnId,proto3" json:"ssn_id,omitempty"`
ProcId []byte `protobuf:"bytes,6,opt,name=proc_id,json=procId,proto3" json:"proc_id,omitempty"`
Topic []byte `protobuf:"bytes,7,opt,name=topic,proto3" json:"topic,omitempty"`
+ Dest *BHAddress `protobuf:"bytes,8,opt,name=dest,proto3" json:"dest,omitempty"`
}
func (m *BHMsgHead) Reset() { *m = BHMsgHead{} }
@@ -189,6 +190,13 @@
func (m *BHMsgHead) GetTopic() []byte {
if m != nil {
return m.Topic
+ }
+ return nil
+}
+
+func (m *BHMsgHead) GetDest() *BHAddress {
+ if m != nil {
+ return m.Dest
}
return nil
}
@@ -824,55 +832,56 @@
func init() { proto.RegisterFile("bhome_msg.proto", fileDescriptor_88ce6d52215a3d3f) }
var fileDescriptor_88ce6d52215a3d3f = []byte{
- // 770 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xda, 0x58,
- 0x14, 0xb6, 0x43, 0xcc, 0xe3, 0xc0, 0x84, 0x9b, 0xcb, 0xcb, 0x61, 0x02, 0x42, 0x6c, 0x06, 0x25,
- 0xa3, 0x44, 0x61, 0x66, 0x31, 0xd2, 0x2c, 0xda, 0x90, 0x54, 0x32, 0x52, 0xa9, 0xa8, 0xdb, 0x6c,
- 0xba, 0x41, 0x26, 0xbe, 0x72, 0xac, 0xe2, 0x07, 0xf7, 0xda, 0x6d, 0xf8, 0x17, 0x6d, 0xff, 0x51,
- 0x37, 0x55, 0x37, 0x95, 0xb2, 0xec, 0xb2, 0x4a, 0xfe, 0x48, 0x75, 0xaf, 0x6d, 0x70, 0xde, 0xaa,
- 0xba, 0x33, 0xdf, 0x79, 0x7c, 0xdf, 0xf9, 0x7c, 0x8e, 0x81, 0xf2, 0xf4, 0xcc, 0x73, 0xc8, 0xc4,
- 0x61, 0xd6, 0x9e, 0x4f, 0xbd, 0xc0, 0xc3, 0x85, 0x25, 0xd0, 0xac, 0x2c, 0x1f, 0x27, 0x86, 0x6f,
- 0x47, 0xf1, 0x66, 0x99, 0x50, 0xea, 0xd1, 0x55, 0x41, 0xf7, 0x8b, 0x0c, 0x85, 0x81, 0x36, 0x62,
- 0x96, 0x46, 0x0c, 0x13, 0xd7, 0x20, 0xcb, 0xf3, 0x6d, 0x53, 0x95, 0x3b, 0x72, 0xaf, 0xa4, 0x2b,
- 0x0e, 0xb3, 0x86, 0x26, 0xde, 0x01, 0x85, 0x7a, 0x61, 0x40, 0xd4, 0xb5, 0x4e, 0xa6, 0x57, 0xec,
- 0x57, 0xf7, 0x56, 0xb4, 0x03, 0xed, 0xd0, 0x34, 0x29, 0x61, 0x4c, 0x8f, 0x52, 0xf0, 0x36, 0x14,
- 0x02, 0xdb, 0x21, 0x2c, 0x30, 0x1c, 0x5f, 0xcd, 0x74, 0xe4, 0x5e, 0x46, 0x5f, 0x01, 0x18, 0xc3,
- 0x7a, 0xb0, 0xf0, 0x89, 0xba, 0xde, 0x91, 0x7b, 0x8a, 0x2e, 0x9e, 0x39, 0x29, 0x63, 0x2e, 0x27,
- 0x55, 0x3a, 0x72, 0x6f, 0x5d, 0x57, 0x18, 0x73, 0x87, 0x26, 0x6e, 0x40, 0xce, 0xa7, 0xde, 0x29,
- 0xc7, 0xb3, 0x42, 0x4c, 0x96, 0xff, 0x1c, 0x9a, 0xb8, 0x0a, 0x4a, 0xe0, 0xf9, 0xf6, 0xa9, 0x9a,
- 0x8b, 0x34, 0x8a, 0x1f, 0xdd, 0x27, 0x50, 0x1a, 0x31, 0xeb, 0x55, 0x38, 0x65, 0xa7, 0xd4, 0x9e,
- 0x12, 0xbc, 0x0f, 0x59, 0x11, 0x60, 0x62, 0x94, 0x62, 0xbf, 0x91, 0x12, 0x3d, 0x62, 0xd6, 0x6b,
- 0x1e, 0x7b, 0x6e, 0xb3, 0x40, 0x8f, 0xd3, 0xba, 0x87, 0xb0, 0x31, 0x62, 0xd6, 0x89, 0xcb, 0x7e,
- 0xb7, 0x85, 0x4e, 0x2c, 0x9b, 0x05, 0x84, 0xea, 0xe3, 0xa3, 0x5f, 0x6f, 0xb1, 0x0f, 0xc5, 0x11,
- 0xb3, 0xc6, 0x7c, 0x52, 0xd7, 0x0e, 0x70, 0x07, 0x4a, 0xe4, 0x3c, 0xa0, 0xc6, 0xc4, 0x99, 0x4f,
- 0xdc, 0xd0, 0x11, 0x5d, 0x14, 0x1d, 0x04, 0x36, 0x9a, 0xbf, 0x08, 0x9d, 0xee, 0x47, 0x19, 0x50,
- 0xaa, 0x42, 0x27, 0xfe, 0x6c, 0x81, 0x77, 0x21, 0x4b, 0x28, 0x75, 0x98, 0x15, 0xd3, 0x56, 0x52,
- 0xb4, 0xcf, 0xf8, 0x06, 0x70, 0x99, 0x71, 0x0a, 0x6e, 0x01, 0x44, 0x46, 0xbb, 0x26, 0x39, 0x57,
- 0xd7, 0x04, 0x43, 0x41, 0x78, 0xcd, 0x01, 0x7c, 0x00, 0x85, 0x44, 0x02, 0x53, 0x33, 0x0f, 0x2c,
- 0x40, 0x3e, 0x56, 0xc5, 0xba, 0xdf, 0x64, 0x00, 0x61, 0xc4, 0x3c, 0x24, 0x2c, 0xc0, 0xff, 0x42,
- 0x9e, 0xc6, 0x9e, 0xc4, 0x7a, 0xea, 0xd7, 0x6d, 0x48, 0x1c, 0xd3, 0x24, 0x7d, 0x99, 0x89, 0x0f,
- 0xe1, 0x0f, 0xe1, 0xc9, 0x84, 0x46, 0x6d, 0x84, 0xb2, 0x62, 0xbf, 0x79, 0xb3, 0x54, 0x04, 0x85,
- 0x91, 0x9a, 0xa4, 0x97, 0x44, 0x49, 0x42, 0xfc, 0x3f, 0x14, 0xa3, 0x16, 0xf3, 0x90, 0xd0, 0x85,
- 0xd8, 0xc6, 0x62, 0x5f, 0xbd, 0xde, 0xe0, 0x25, 0x0f, 0x25, 0xe5, 0x20, 0xd2, 0x05, 0x34, 0x28,
- 0x40, 0x2e, 0x66, 0xee, 0xfe, 0x07, 0x79, 0x41, 0xc5, 0xad, 0xfd, 0x1b, 0x72, 0x84, 0x8a, 0x0b,
- 0x7a, 0xcc, 0xdb, 0x11, 0xb3, 0xba, 0x61, 0x7c, 0x5d, 0x03, 0xcf, 0x5c, 0xe0, 0x83, 0x65, 0xc7,
- 0xb8, 0xb4, 0x76, 0xe7, 0x2c, 0x9a, 0xa4, 0x27, 0x79, 0x78, 0x17, 0x14, 0xca, 0x69, 0xe3, 0xe1,
- 0x2b, 0x37, 0x0b, 0xfc, 0xd9, 0x42, 0x93, 0xf4, 0x28, 0x67, 0x90, 0x87, 0x2c, 0x25, 0x73, 0x4a,
- 0xfc, 0x9d, 0xcf, 0x19, 0xc8, 0xf1, 0xf5, 0xe2, 0xe7, 0x55, 0x81, 0xf2, 0xdb, 0xf8, 0x79, 0xe8,
- 0xbe, 0x33, 0x66, 0xb6, 0x89, 0xa4, 0x34, 0xa8, 0x1b, 0xef, 0x8f, 0x8d, 0xc0, 0x40, 0x32, 0x6e,
- 0x40, 0x25, 0x01, 0x8f, 0x3c, 0xc7, 0xf1, 0x5c, 0xd1, 0x1f, 0xad, 0xe1, 0x2a, 0xa0, 0x24, 0x90,
- 0xec, 0x19, 0xca, 0xe3, 0x2d, 0xa8, 0xdd, 0x44, 0xa3, 0x82, 0x42, 0xba, 0x20, 0x79, 0xb7, 0x08,
- 0x70, 0x0d, 0x36, 0x13, 0x54, 0x23, 0x06, 0x0d, 0xa6, 0xc4, 0x08, 0x50, 0x09, 0xd7, 0x01, 0x27,
- 0xf0, 0xea, 0x65, 0xa0, 0x0d, 0xfc, 0x27, 0x34, 0x6e, 0xe3, 0x11, 0x43, 0x19, 0xab, 0x50, 0x5d,
- 0x31, 0xac, 0x56, 0x00, 0x21, 0xdc, 0x82, 0xad, 0xbb, 0x22, 0x51, 0xe1, 0x66, 0x7a, 0xc8, 0xd4,
- 0xa1, 0x22, 0x9c, 0xb6, 0x64, 0x1c, 0x4e, 0x67, 0x36, 0x3b, 0x43, 0xd5, 0xb4, 0xe4, 0xe5, 0xa7,
- 0x05, 0xd5, 0xd3, 0x4d, 0x52, 0x1f, 0x0c, 0xa4, 0xa6, 0x67, 0x39, 0x71, 0x93, 0x55, 0x46, 0xcd,
- 0x74, 0x1f, 0x31, 0x0b, 0x37, 0x0c, 0x6d, 0xe3, 0x26, 0xd4, 0x6f, 0xc1, 0x91, 0xd0, 0x56, 0xff,
- 0x93, 0x0c, 0xf9, 0x48, 0xf9, 0xf8, 0x08, 0x3f, 0x05, 0x45, 0x24, 0xe0, 0x7b, 0xb7, 0xb7, 0xd9,
- 0xba, 0x2f, 0x12, 0xed, 0xed, 0x31, 0xe4, 0x92, 0xb3, 0x78, 0xe0, 0x84, 0x1e, 0xe9, 0x32, 0xf8,
- 0xeb, 0xeb, 0x65, 0x5b, 0xbe, 0xb8, 0x6c, 0xcb, 0x3f, 0x2e, 0xdb, 0xf2, 0x87, 0xab, 0xb6, 0x74,
- 0x71, 0xd5, 0x96, 0xbe, 0x5f, 0xb5, 0x25, 0x2d, 0xf3, 0xa6, 0xb8, 0xb7, 0xbf, 0xac, 0x9d, 0x66,
- 0xc5, 0xdf, 0xcb, 0x3f, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x68, 0xaa, 0xf4, 0xdd, 0xa2, 0x06,
+ // 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,
}
@@ -936,6 +945,16 @@
i = encodeVarintBhomeMsg(dAtA, i, uint64(len(m.Topic)))
i += copy(dAtA[i:], m.Topic)
}
+ if m.Dest != nil {
+ dAtA[i] = 0x42
+ i++
+ i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Dest.Size()))
+ n1, err1 := m.Dest.MarshalTo(dAtA[i:])
+ if err1 != nil {
+ return 0, err1
+ }
+ i += n1
+ }
return i, nil
}
@@ -958,11 +977,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Topics.Size()))
- n1, err1 := m.Topics.MarshalTo(dAtA[i:])
- if err1 != nil {
- return 0, err1
+ n2, err2 := m.Topics.MarshalTo(dAtA[i:])
+ if err2 != nil {
+ return 0, err2
}
- i += n1
+ i += n2
}
return i, nil
}
@@ -986,11 +1005,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Topics.Size()))
- n2, err2 := m.Topics.MarshalTo(dAtA[i:])
- if err2 != nil {
- return 0, err2
+ n3, err3 := m.Topics.MarshalTo(dAtA[i:])
+ if err3 != nil {
+ return 0, err3
}
- i += n2
+ i += n3
}
return i, nil
}
@@ -1014,11 +1033,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Topics.Size()))
- n3, err3 := m.Topics.MarshalTo(dAtA[i:])
- if err3 != nil {
- return 0, err3
+ n4, err4 := m.Topics.MarshalTo(dAtA[i:])
+ if err4 != nil {
+ return 0, err4
}
- i += n3
+ i += n4
}
return i, nil
}
@@ -1065,11 +1084,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Errmsg.Size()))
- n4, err4 := m.Errmsg.MarshalTo(dAtA[i:])
- if err4 != nil {
- return 0, err4
+ n5, err5 := m.Errmsg.MarshalTo(dAtA[i:])
+ if err5 != nil {
+ return 0, err5
}
- i += n4
+ i += n5
}
if m.ProcIndex != 0 {
dAtA[i] = 0x10
@@ -1107,11 +1126,11 @@
var l int
_ = l
if m.Request != nil {
- nn5, err5 := m.Request.MarshalTo(dAtA[i:])
- if err5 != nil {
- return 0, err5
+ nn6, err6 := m.Request.MarshalTo(dAtA[i:])
+ if err6 != nil {
+ return 0, err6
}
- i += nn5
+ i += nn6
}
return i, nil
}
@@ -1122,11 +1141,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Register.Size()))
- n6, err6 := m.Register.MarshalTo(dAtA[i:])
- if err6 != nil {
- return 0, err6
+ n7, err7 := m.Register.MarshalTo(dAtA[i:])
+ if err7 != nil {
+ return 0, err7
}
- i += n6
+ i += n7
}
return i, nil
}
@@ -1136,11 +1155,11 @@
dAtA[i] = 0x12
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.TopicRequest.Size()))
- n7, err7 := m.TopicRequest.MarshalTo(dAtA[i:])
- if err7 != nil {
- return 0, err7
+ n8, err8 := m.TopicRequest.MarshalTo(dAtA[i:])
+ if err8 != nil {
+ return 0, err8
}
- i += n7
+ i += n8
}
return i, nil
}
@@ -1150,11 +1169,11 @@
dAtA[i] = 0x1a
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.TopicQuery.Size()))
- n8, err8 := m.TopicQuery.MarshalTo(dAtA[i:])
- if err8 != nil {
- return 0, err8
+ n9, err9 := m.TopicQuery.MarshalTo(dAtA[i:])
+ if err9 != nil {
+ return 0, err9
}
- i += n8
+ i += n9
}
return i, nil
}
@@ -1177,11 +1196,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.ErrMsg.Size()))
- n9, err9 := m.ErrMsg.MarshalTo(dAtA[i:])
- if err9 != nil {
- return 0, err9
+ n10, err10 := m.ErrMsg.MarshalTo(dAtA[i:])
+ if err10 != nil {
+ return 0, err10
}
- i += n9
+ i += n10
}
return i, nil
}
@@ -1202,11 +1221,11 @@
var l int
_ = l
if m.Reqrep != nil {
- nn10, err10 := m.Reqrep.MarshalTo(dAtA[i:])
- if err10 != nil {
- return 0, err10
+ nn11, err11 := m.Reqrep.MarshalTo(dAtA[i:])
+ if err11 != nil {
+ return 0, err11
}
- i += nn10
+ i += nn11
}
return i, nil
}
@@ -1217,11 +1236,11 @@
dAtA[i] = 0xa
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Request.Size()))
- n11, err11 := m.Request.MarshalTo(dAtA[i:])
- if err11 != nil {
- return 0, err11
+ n12, err12 := m.Request.MarshalTo(dAtA[i:])
+ if err12 != nil {
+ return 0, err12
}
- i += n11
+ i += n12
}
return i, nil
}
@@ -1231,11 +1250,11 @@
dAtA[i] = 0x12
i++
i = encodeVarintBhomeMsg(dAtA, i, uint64(m.Reply.Size()))
- n12, err12 := m.Reply.MarshalTo(dAtA[i:])
- if err12 != nil {
- return 0, err12
+ n13, err13 := m.Reply.MarshalTo(dAtA[i:])
+ if err13 != nil {
+ return 0, err13
}
- i += n12
+ i += n13
}
return i, nil
}
@@ -1279,6 +1298,10 @@
}
l = len(m.Topic)
if l > 0 {
+ n += 1 + l + sovBhomeMsg(uint64(l))
+ }
+ if m.Dest != nil {
+ l = m.Dest.Size()
n += 1 + l + sovBhomeMsg(uint64(l))
}
return n
@@ -1683,6 +1706,42 @@
m.Topic = []byte{}
}
iNdEx = postIndex
+ case 8:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Dest", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthBhomeMsg
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthBhomeMsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.Dest == nil {
+ m.Dest = &BHAddress{}
+ }
+ if err := m.Dest.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipBhomeMsg(dAtA[iNdEx:])
--
Gitblit v1.8.0