From e395470de3731937d7d8608e31c4e76e560c5f10 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 23 四月 2021 18:43:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/valib/bhshmq
---
proto/source/bhome_msg/bhome_msg_api.pb.go | 147 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 118 insertions(+), 29 deletions(-)
diff --git a/proto/source/bhome_msg/bhome_msg_api.pb.go b/proto/source/bhome_msg/bhome_msg_api.pb.go
index 49c8bf4..965526e 100644
--- a/proto/source/bhome_msg/bhome_msg_api.pb.go
+++ b/proto/source/bhome_msg/bhome_msg_api.pb.go
@@ -24,6 +24,8 @@
type BHAddress struct {
MqId []byte `protobuf:"bytes,1,opt,name=mq_id,json=mqId,proto3" json:"mq_id,omitempty"`
+ Ip []byte `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"`
+ Port int32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"`
}
func (m *BHAddress) Reset() { *m = BHAddress{} }
@@ -64,6 +66,20 @@
return m.MqId
}
return nil
+}
+
+func (m *BHAddress) GetIp() []byte {
+ if m != nil {
+ return m.Ip
+ }
+ return nil
+}
+
+func (m *BHAddress) GetPort() int32 {
+ if m != nil {
+ return m.Port
+ }
+ return 0
}
type ProcInfo struct {
@@ -587,35 +603,37 @@
func init() { proto.RegisterFile("bhome_msg_api.proto", fileDescriptor_a49c9c1f511a168c) }
var fileDescriptor_a49c9c1f511a168c = []byte{
- // 446 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xdd, 0x8a, 0xd3, 0x40,
- 0x14, 0xc7, 0x9b, 0xed, 0xc7, 0xda, 0x93, 0xea, 0xc2, 0xb4, 0x60, 0x10, 0x8c, 0x75, 0x40, 0xb6,
- 0x28, 0x46, 0x58, 0x41, 0x2f, 0xc4, 0x0b, 0x57, 0x84, 0x16, 0x0c, 0xac, 0x41, 0x10, 0xbc, 0x09,
- 0x93, 0xce, 0xec, 0xec, 0x40, 0xa7, 0x93, 0xce, 0x4c, 0x85, 0xc5, 0x97, 0xf0, 0xb1, 0xbc, 0xdc,
- 0x4b, 0x2f, 0xa5, 0x7d, 0x11, 0x99, 0x49, 0x13, 0x3f, 0x58, 0xc5, 0xdd, 0xbb, 0xf3, 0xf1, 0x3b,
- 0xe7, 0xfc, 0x73, 0x4e, 0x06, 0x86, 0xc5, 0x99, 0x92, 0x2c, 0x97, 0x86, 0xe7, 0xa4, 0x14, 0x49,
- 0xa9, 0x95, 0x55, 0xa8, 0xdf, 0x04, 0xef, 0x1c, 0x30, 0xad, 0x95, 0x76, 0x66, 0x95, 0xc3, 0x63,
- 0xe8, 0x1f, 0x4f, 0x5f, 0x51, 0xaa, 0x99, 0x31, 0x68, 0x08, 0x5d, 0xb9, 0xca, 0x05, 0x8d, 0x82,
- 0x71, 0x30, 0x19, 0x64, 0x1d, 0xb9, 0x9a, 0x51, 0xfc, 0x19, 0x6e, 0x9c, 0x68, 0x35, 0x9f, 0x2d,
- 0x4f, 0x15, 0xba, 0x0d, 0xfb, 0xa5, 0x56, 0xf3, 0x9f, 0x48, 0xcf, 0xb9, 0x33, 0x8a, 0x10, 0x74,
- 0x96, 0x44, 0xb2, 0x68, 0xaf, 0x2a, 0x74, 0x36, 0xba, 0x07, 0x61, 0xb9, 0x2e, 0x16, 0x62, 0x9e,
- 0x8b, 0xe5, 0xa9, 0x8a, 0xda, 0x3e, 0x05, 0x55, 0xc8, 0x77, 0xbb, 0x0f, 0x83, 0x52, 0x8b, 0x4f,
- 0xc4, 0xb2, 0x8a, 0xe8, 0x78, 0x22, 0xdc, 0xc5, 0x1c, 0x82, 0x1f, 0xc3, 0x20, 0x35, 0xfc, 0xbd,
- 0x2a, 0xc5, 0xfc, 0xad, 0x30, 0x16, 0xdd, 0x05, 0xb0, 0xce, 0xc9, 0x17, 0xc2, 0xd8, 0x28, 0x18,
- 0xb7, 0x27, 0x83, 0xac, 0x6f, 0xeb, 0x34, 0x7e, 0x06, 0x90, 0x1a, 0x7e, 0xe2, 0x46, 0x98, 0x33,
- 0x34, 0x82, 0xae, 0x4f, 0xed, 0xb4, 0x56, 0x8e, 0x93, 0x4a, 0x89, 0x25, 0xb5, 0x54, 0x67, 0xe3,
- 0x97, 0x70, 0x2b, 0x35, 0xfc, 0xb5, 0x92, 0x52, 0x2d, 0x33, 0x56, 0x2e, 0xce, 0xd1, 0x23, 0xe8,
- 0x31, 0xad, 0xa5, 0xe1, 0xbe, 0x38, 0x3c, 0x1a, 0x26, 0xcd, 0x12, 0x93, 0x37, 0x6e, 0x87, 0xa9,
- 0xe1, 0xd9, 0x0e, 0xc1, 0x2f, 0xe0, 0xc0, 0xb9, 0x6c, 0xb5, 0x66, 0xc6, 0x7a, 0xb1, 0x57, 0x98,
- 0xfd, 0x01, 0x46, 0x7f, 0x14, 0x5f, 0x5d, 0xc1, 0xa5, 0x8d, 0x0b, 0x08, 0x7d, 0x63, 0x2e, 0x8c,
- 0x65, 0x1a, 0x1d, 0x42, 0xc7, 0x1d, 0xeb, 0x92, 0x6e, 0xf5, 0x79, 0x33, 0x0f, 0xa0, 0x87, 0xd0,
- 0x25, 0x94, 0x6a, 0x13, 0xed, 0x8d, 0xdb, 0x93, 0xf0, 0x68, 0xf4, 0x0b, 0xd9, 0xfc, 0x2a, 0x59,
- 0x85, 0xe0, 0xe7, 0xfe, 0x3e, 0x53, 0x46, 0xb4, 0x2d, 0x18, 0xb1, 0xff, 0x3d, 0x04, 0x3f, 0x80,
- 0x9b, 0xa9, 0xe1, 0xef, 0xd6, 0x4c, 0x9f, 0xff, 0x63, 0x61, 0x78, 0x05, 0xe8, 0x37, 0xec, 0x1a,
- 0xab, 0x49, 0x60, 0x9f, 0x54, 0xa2, 0xfd, 0x76, 0xfe, 0xf6, 0x41, 0x35, 0x74, 0x7c, 0xf8, 0x75,
- 0x13, 0x07, 0x17, 0x9b, 0x38, 0xf8, 0xbe, 0x89, 0x83, 0x2f, 0xdb, 0xb8, 0x75, 0xb1, 0x8d, 0x5b,
- 0xdf, 0xb6, 0x71, 0x6b, 0xda, 0xfe, 0x18, 0x26, 0x4f, 0x9a, 0xda, 0xa2, 0xe7, 0x5f, 0xd0, 0xd3,
- 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9e, 0xea, 0x25, 0x91, 0x74, 0x03, 0x00, 0x00,
+ // 465 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x5d, 0x8b, 0x13, 0x31,
+ 0x14, 0xed, 0xf4, 0x6b, 0xed, 0x9d, 0x71, 0x17, 0xd2, 0x82, 0x83, 0xe0, 0x58, 0x03, 0xb2, 0x45,
+ 0x71, 0x84, 0x15, 0xf4, 0x41, 0x7c, 0x70, 0x55, 0x68, 0xc1, 0x81, 0x75, 0x10, 0x04, 0x5f, 0x86,
+ 0x4c, 0x27, 0x9b, 0x0d, 0x34, 0x4d, 0x9a, 0xa4, 0xc2, 0xe2, 0x9f, 0xf0, 0x67, 0xf9, 0xb8, 0x8f,
+ 0x3e, 0x4a, 0xfb, 0x47, 0x24, 0x99, 0xb6, 0x7e, 0xb0, 0x8a, 0xbb, 0x6f, 0xf7, 0xe3, 0xdc, 0x73,
+ 0xcf, 0x9c, 0x3b, 0x81, 0x7e, 0x79, 0x26, 0x05, 0x2d, 0x84, 0x61, 0x05, 0x51, 0x3c, 0x55, 0x5a,
+ 0x5a, 0x89, 0x7a, 0xbb, 0xe2, 0xed, 0x03, 0xaa, 0xb5, 0xd4, 0x2e, 0xac, 0x7b, 0xf8, 0x35, 0xf4,
+ 0x8e, 0xc7, 0x2f, 0xab, 0x4a, 0x53, 0x63, 0x50, 0x1f, 0x3a, 0x62, 0x51, 0xf0, 0x2a, 0x0e, 0x86,
+ 0xc1, 0x28, 0xca, 0xdb, 0x62, 0x31, 0xa9, 0xd0, 0x3e, 0x34, 0xb9, 0x8a, 0x9b, 0xbe, 0xd2, 0xe4,
+ 0x0a, 0x21, 0x68, 0x2b, 0xa9, 0x6d, 0xdc, 0x1a, 0x06, 0xa3, 0x4e, 0xee, 0x63, 0xfc, 0x19, 0x6e,
+ 0x9c, 0x68, 0x39, 0x9d, 0xcc, 0x4f, 0x25, 0xba, 0x05, 0x7b, 0x4a, 0xcb, 0xe9, 0x4f, 0x9a, 0xae,
+ 0x4b, 0x27, 0x95, 0x1b, 0x9c, 0x13, 0x41, 0x37, 0x54, 0x3e, 0x46, 0x77, 0x21, 0x54, 0xcb, 0x72,
+ 0xc6, 0xa7, 0x05, 0x9f, 0x9f, 0x4a, 0xcf, 0x19, 0xe5, 0x50, 0x97, 0x3c, 0xdb, 0x3d, 0x88, 0x94,
+ 0xe6, 0x9f, 0x88, 0xa5, 0x35, 0xa2, 0xed, 0x11, 0xe1, 0xa6, 0xe6, 0x20, 0xf8, 0x11, 0x44, 0x99,
+ 0x61, 0xef, 0xa5, 0xe2, 0xd3, 0xb7, 0xdc, 0x58, 0x74, 0x07, 0xc0, 0xba, 0xa4, 0x98, 0x71, 0x63,
+ 0xe3, 0x60, 0xd8, 0x1a, 0x45, 0x79, 0xcf, 0x6e, 0xdb, 0xf8, 0x29, 0x40, 0x66, 0xd8, 0x89, 0x5b,
+ 0x61, 0xce, 0xd0, 0x00, 0x3a, 0xbe, 0xb5, 0xd1, 0x5a, 0x27, 0x4e, 0x6a, 0x45, 0x2c, 0xd9, 0x4a,
+ 0x75, 0x31, 0x7e, 0x01, 0xfb, 0x99, 0x61, 0xaf, 0xa4, 0x10, 0x72, 0x9e, 0x53, 0x35, 0x3b, 0x47,
+ 0x0f, 0xa1, 0x4b, 0xb5, 0x16, 0x86, 0xf9, 0xe1, 0xf0, 0xa8, 0x9f, 0xee, 0x8c, 0x4e, 0xdf, 0x38,
+ 0x9f, 0x33, 0xc3, 0xf2, 0x0d, 0x04, 0x3f, 0x87, 0x03, 0x97, 0xd2, 0xc5, 0x92, 0x1a, 0xeb, 0xc5,
+ 0x5e, 0x61, 0xf7, 0x07, 0x18, 0xfc, 0x31, 0x7c, 0x75, 0x05, 0x97, 0x12, 0x97, 0x10, 0x7a, 0x62,
+ 0xc6, 0x8d, 0xa5, 0x1a, 0x1d, 0x42, 0xdb, 0x1d, 0xeb, 0x12, 0xb6, 0xed, 0x79, 0x73, 0x0f, 0x40,
+ 0x0f, 0xa0, 0x43, 0xaa, 0x4a, 0x9b, 0xb8, 0x39, 0x6c, 0x8d, 0xc2, 0xa3, 0xc1, 0x2f, 0xc8, 0xdd,
+ 0xef, 0x94, 0xd7, 0x10, 0xfc, 0xcc, 0xdf, 0x67, 0x4c, 0x89, 0xb6, 0x25, 0x25, 0xf6, 0xbf, 0x97,
+ 0xe0, 0xfb, 0x70, 0x33, 0x33, 0xec, 0xdd, 0x92, 0xea, 0xf3, 0x7f, 0x18, 0x86, 0x17, 0x80, 0x7e,
+ 0x83, 0x5d, 0xc3, 0x9a, 0x14, 0xf6, 0x48, 0x2d, 0xda, 0xbb, 0xf3, 0xb7, 0x0f, 0xda, 0x82, 0x8e,
+ 0x0f, 0xbf, 0xae, 0x92, 0xe0, 0x62, 0x95, 0x04, 0xdf, 0x57, 0x49, 0xf0, 0x65, 0x9d, 0x34, 0x2e,
+ 0xd6, 0x49, 0xe3, 0xdb, 0x3a, 0x69, 0x8c, 0x5b, 0x1f, 0xc3, 0xf4, 0xf1, 0x6e, 0xb6, 0xec, 0xfa,
+ 0x57, 0xf6, 0xe4, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x44, 0x99, 0xc0, 0x98, 0x03, 0x00,
+ 0x00,
}
func (m *BHAddress) Marshal() (dAtA []byte, err error) {
@@ -638,6 +656,17 @@
i++
i = encodeVarintBhomeMsgApi(dAtA, i, uint64(len(m.MqId)))
i += copy(dAtA[i:], m.MqId)
+ }
+ if len(m.Ip) > 0 {
+ dAtA[i] = 0x12
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(len(m.Ip)))
+ i += copy(dAtA[i:], m.Ip)
+ }
+ if m.Port != 0 {
+ dAtA[i] = 0x18
+ i++
+ i = encodeVarintBhomeMsgApi(dAtA, i, uint64(m.Port))
}
return i, nil
}
@@ -981,6 +1010,13 @@
if l > 0 {
n += 1 + l + sovBhomeMsgApi(uint64(l))
}
+ l = len(m.Ip)
+ if l > 0 {
+ n += 1 + l + sovBhomeMsgApi(uint64(l))
+ }
+ if m.Port != 0 {
+ n += 1 + sovBhomeMsgApi(uint64(m.Port))
+ }
return n
}
@@ -1219,6 +1255,59 @@
m.MqId = []byte{}
}
iNdEx = postIndex
+ case 2:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Ip", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsgApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthBhomeMsgApi
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Ip = append(m.Ip[:0], dAtA[iNdEx:postIndex]...)
+ if m.Ip == nil {
+ m.Ip = []byte{}
+ }
+ iNdEx = postIndex
+ case 3:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Port", wireType)
+ }
+ m.Port = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowBhomeMsgApi
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Port |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipBhomeMsgApi(dAtA[iNdEx:])
--
Gitblit v1.8.0