|
@ -27,7 +27,6 @@ type NetAddress struct { |
|
|
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` |
|
|
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` |
|
|
IP string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` |
|
|
IP string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` |
|
|
Port uint32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"` |
|
|
Port uint32 `protobuf:"varint,3,opt,name=port,proto3" json:"port,omitempty"` |
|
|
Str string `protobuf:"bytes,4,opt,name=str,proto3" json:"str,omitempty"` |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func (m *NetAddress) Reset() { *m = NetAddress{} } |
|
|
func (m *NetAddress) Reset() { *m = NetAddress{} } |
|
@ -84,13 +83,6 @@ func (m *NetAddress) GetPort() uint32 { |
|
|
return 0 |
|
|
return 0 |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func (m *NetAddress) GetStr() string { |
|
|
|
|
|
if m != nil { |
|
|
|
|
|
return m.Str |
|
|
|
|
|
} |
|
|
|
|
|
return "" |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
type ProtocolVersion struct { |
|
|
type ProtocolVersion struct { |
|
|
P2P uint64 `protobuf:"varint,1,opt,name=p2p,proto3" json:"p2p,omitempty"` |
|
|
P2P uint64 `protobuf:"varint,1,opt,name=p2p,proto3" json:"p2p,omitempty"` |
|
|
Block uint64 `protobuf:"varint,2,opt,name=block,proto3" json:"block,omitempty"` |
|
|
Block uint64 `protobuf:"varint,2,opt,name=block,proto3" json:"block,omitempty"` |
|
@ -313,38 +305,37 @@ func init() { |
|
|
func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } |
|
|
func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } |
|
|
|
|
|
|
|
|
var fileDescriptor_c8a29e659aeca578 = []byte{ |
|
|
var fileDescriptor_c8a29e659aeca578 = []byte{ |
|
|
// 488 bytes of a gzipped FileDescriptorProto
|
|
|
|
|
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x3d, 0x8f, 0xda, 0x40, |
|
|
|
|
|
|
|
|
// 479 bytes of a gzipped FileDescriptorProto
|
|
|
|
|
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x3d, 0x8f, 0xda, 0x40, |
|
|
0x10, 0xc5, 0xc6, 0x7c, 0xdc, 0x10, 0x8e, 0xcb, 0x0a, 0x45, 0x3e, 0x0a, 0x1b, 0xa1, 0x14, 0x54, |
|
|
0x10, 0xc5, 0xc6, 0x7c, 0xdc, 0x10, 0x8e, 0xcb, 0x0a, 0x45, 0x3e, 0x0a, 0x1b, 0xa1, 0x14, 0x54, |
|
|
0x20, 0x11, 0xa5, 0x48, 0x97, 0x10, 0x1a, 0x9a, 0x3b, 0x6b, 0x15, 0xa5, 0x48, 0x83, 0xc0, 0xbb, |
|
|
|
|
|
0x07, 0x2b, 0xcc, 0xee, 0x6a, 0xbd, 0x97, 0x90, 0x7f, 0x91, 0x9f, 0x75, 0xe5, 0x95, 0xa9, 0xac, |
|
|
|
|
|
0xc8, 0x94, 0xf9, 0x13, 0xd1, 0xae, 0x7d, 0x89, 0x0f, 0xa5, 0x9b, 0xf7, 0x66, 0xc6, 0x6f, 0xfc, |
|
|
|
|
|
0xf4, 0x16, 0x06, 0x9a, 0x72, 0x42, 0xd5, 0x81, 0x71, 0x3d, 0x95, 0x33, 0x39, 0xd5, 0xdf, 0x25, |
|
|
|
|
|
0x4d, 0x27, 0x52, 0x09, 0x2d, 0xd0, 0xe5, 0xbf, 0xde, 0x44, 0xce, 0xe4, 0xa0, 0xbf, 0x15, 0x5b, |
|
|
|
|
|
0x61, 0x5b, 0x53, 0x53, 0x15, 0x53, 0xa3, 0x0d, 0xc0, 0x0d, 0xd5, 0x1f, 0x08, 0x51, 0x34, 0x4d, |
|
|
|
|
|
0xd1, 0x2b, 0x70, 0x19, 0xf1, 0x9d, 0xa1, 0x33, 0xbe, 0x98, 0x37, 0xf3, 0x2c, 0x74, 0x97, 0x0b, |
|
|
|
|
|
0xec, 0x32, 0x62, 0x79, 0xe9, 0xbb, 0x15, 0x3e, 0xc2, 0x2e, 0x93, 0x08, 0x81, 0x27, 0x85, 0xd2, |
|
|
|
|
|
0x7e, 0x7d, 0xe8, 0x8c, 0xbb, 0xd8, 0xd6, 0xe8, 0x0a, 0xea, 0xa9, 0x56, 0xbe, 0x67, 0x86, 0xb1, |
|
|
|
|
|
0x29, 0x47, 0x9f, 0xa0, 0x17, 0x19, 0xb1, 0x58, 0x24, 0x9f, 0xa9, 0x4a, 0x99, 0xe0, 0xe8, 0x1a, |
|
|
|
|
|
0xea, 0x72, 0x26, 0xad, 0x92, 0x37, 0x6f, 0xe5, 0x59, 0x58, 0x8f, 0x66, 0x11, 0x36, 0x1c, 0xea, |
|
|
|
|
|
0x43, 0x63, 0x93, 0x88, 0x78, 0x6f, 0xe5, 0x3c, 0x5c, 0x00, 0xf3, 0xd5, 0xb5, 0x94, 0x56, 0xc8, |
|
|
|
|
|
0xc3, 0xa6, 0x1c, 0xfd, 0x76, 0xa1, 0xb7, 0xa0, 0x77, 0xeb, 0xfb, 0x44, 0xdf, 0x08, 0x42, 0x97, |
|
|
|
|
|
0xfc, 0x4e, 0xa0, 0x08, 0xae, 0x64, 0xa9, 0xb4, 0xfa, 0x5a, 0x48, 0x59, 0x8d, 0xce, 0x2c, 0x9c, |
|
|
|
|
|
0x3c, 0xb7, 0x63, 0x72, 0x76, 0xd1, 0xdc, 0x7b, 0xc8, 0xc2, 0x1a, 0xee, 0xc9, 0xb3, 0x43, 0xdf, |
|
|
|
|
|
0x41, 0x8f, 0x14, 0x22, 0x2b, 0x2e, 0x08, 0x5d, 0x31, 0x52, 0xda, 0xf0, 0x32, 0xcf, 0xc2, 0x6e, |
|
|
|
|
|
0x55, 0x7f, 0x81, 0xbb, 0xa4, 0x02, 0x09, 0x0a, 0xa1, 0x93, 0xb0, 0x54, 0x53, 0xbe, 0x5a, 0x13, |
|
|
|
|
|
0xa2, 0xec, 0xe9, 0x17, 0x18, 0x0a, 0xca, 0x18, 0x8e, 0x7c, 0x68, 0x71, 0xaa, 0xbf, 0x09, 0xb5, |
|
|
|
|
|
0x2f, 0xdd, 0x7a, 0x82, 0xa6, 0xf3, 0x74, 0x7e, 0xa3, 0xe8, 0x94, 0x10, 0x0d, 0xa0, 0x1d, 0xef, |
|
|
|
|
|
0xd6, 0x9c, 0xd3, 0x24, 0xf5, 0x9b, 0x43, 0x67, 0xfc, 0x02, 0xff, 0xc5, 0x66, 0xeb, 0x20, 0x38, |
|
|
|
|
|
0xdb, 0x53, 0xe5, 0xb7, 0x8a, 0xad, 0x12, 0xa2, 0xf7, 0xd0, 0x10, 0x7a, 0x47, 0x95, 0xdf, 0xb6, |
|
|
|
|
|
0x66, 0xbc, 0x3e, 0x37, 0xe3, 0xcc, 0xc7, 0x5b, 0x33, 0x5b, 0x3a, 0x52, 0x2c, 0x8e, 0x36, 0xd0, |
|
|
|
|
|
0xff, 0xdf, 0x10, 0xba, 0x86, 0xb6, 0x3e, 0xae, 0x18, 0x27, 0xf4, 0x58, 0xe4, 0x06, 0xb7, 0xf4, |
|
|
|
|
|
0x71, 0x69, 0x20, 0x9a, 0x42, 0x47, 0xc9, 0xd8, 0xfe, 0x3c, 0x4d, 0xd3, 0xd2, 0xb6, 0xcb, 0x3c, |
|
|
|
|
|
0x0b, 0x01, 0x47, 0x1f, 0xcb, 0xc4, 0x61, 0x50, 0x32, 0x2e, 0xeb, 0xf9, 0xed, 0x43, 0x1e, 0x38, |
|
|
|
|
|
0x8f, 0x79, 0xe0, 0xfc, 0xca, 0x03, 0xe7, 0xc7, 0x29, 0xa8, 0x3d, 0x9e, 0x82, 0xda, 0xcf, 0x53, |
|
|
|
|
|
0x50, 0xfb, 0xf2, 0x76, 0xcb, 0xf4, 0xee, 0x7e, 0x33, 0x89, 0xc5, 0x61, 0x5a, 0x89, 0x7c, 0x35, |
|
|
|
|
|
0xfd, 0x36, 0xd8, 0xcf, 0x9f, 0xc3, 0xa6, 0x69, 0xd9, 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, |
|
|
|
|
|
0xd8, 0x1a, 0xd5, 0x03, 0x27, 0x03, 0x00, 0x00, |
|
|
|
|
|
|
|
|
0x20, 0x39, 0x4a, 0x91, 0x2e, 0x21, 0x34, 0x34, 0x77, 0xd6, 0x2a, 0x4a, 0x91, 0xc6, 0x02, 0xef, |
|
|
|
|
|
0x1e, 0xac, 0x30, 0xbb, 0xab, 0xf5, 0x5e, 0x42, 0xfe, 0x45, 0x7e, 0xd6, 0x95, 0x57, 0xa6, 0xb2, |
|
|
|
|
|
0x22, 0x53, 0xe6, 0x4f, 0x44, 0x5e, 0xfb, 0x12, 0x1f, 0x4a, 0x37, 0x6f, 0xbe, 0xde, 0xcc, 0xd3, |
|
|
|
|
|
0x83, 0x91, 0xa6, 0x9c, 0x50, 0x75, 0x60, 0x5c, 0xcf, 0x65, 0x20, 0xe7, 0xfa, 0xbb, 0xa4, 0xe9, |
|
|
|
|
|
0x4c, 0x2a, 0xa1, 0x05, 0xba, 0xfc, 0x57, 0x9b, 0xc9, 0x40, 0x8e, 0x86, 0x5b, 0xb1, 0x15, 0xa6, |
|
|
|
|
|
0x34, 0x2f, 0xa2, 0xb2, 0x6b, 0x12, 0x02, 0xdc, 0x50, 0xfd, 0x81, 0x10, 0x45, 0xd3, 0x14, 0xbd, |
|
|
|
|
|
0x02, 0x9b, 0x11, 0xd7, 0x1a, 0x5b, 0xd3, 0x8b, 0x45, 0x3b, 0xcf, 0x7c, 0x7b, 0xb5, 0xc4, 0x36, |
|
|
|
|
|
0x23, 0x26, 0x2f, 0x5d, 0xbb, 0x96, 0x0f, 0xb1, 0xcd, 0x24, 0x42, 0xe0, 0x48, 0xa1, 0xb4, 0xdb, |
|
|
|
|
|
0x1c, 0x5b, 0xd3, 0x3e, 0x36, 0xf1, 0xe4, 0x13, 0x0c, 0xc2, 0x62, 0x75, 0x2c, 0x92, 0xcf, 0x54, |
|
|
|
|
|
0xa5, 0x4c, 0x70, 0x74, 0x0d, 0x4d, 0x19, 0x48, 0xb3, 0xd7, 0x59, 0x74, 0xf2, 0xcc, 0x6f, 0x86, |
|
|
|
|
|
0x41, 0x88, 0x8b, 0x1c, 0x1a, 0x42, 0x6b, 0x93, 0x88, 0x78, 0x6f, 0x96, 0x3b, 0xb8, 0x04, 0xe8, |
|
|
|
|
|
0x0a, 0x9a, 0x6b, 0x29, 0xcd, 0x5a, 0x07, 0x17, 0xe1, 0xe4, 0xb7, 0x0d, 0x83, 0x25, 0xbd, 0x5b, |
|
|
|
|
|
0xdf, 0x27, 0xfa, 0x46, 0x10, 0xba, 0xe2, 0x77, 0x02, 0x85, 0x70, 0x25, 0x2b, 0xa6, 0xe8, 0x6b, |
|
|
|
|
|
0x49, 0x65, 0x38, 0x7a, 0x81, 0x3f, 0x7b, 0xfe, 0xfc, 0xec, 0xec, 0xa2, 0x85, 0xf3, 0x90, 0xf9, |
|
|
|
|
|
0x0d, 0x3c, 0x90, 0x67, 0x87, 0xbe, 0x83, 0x01, 0x29, 0x49, 0x22, 0x2e, 0x08, 0x8d, 0x18, 0xa9, |
|
|
|
|
|
0x9e, 0x7e, 0x99, 0x67, 0x7e, 0xbf, 0xce, 0xbf, 0xc4, 0x7d, 0x52, 0x83, 0x04, 0xf9, 0xd0, 0x4b, |
|
|
|
|
|
0x58, 0xaa, 0x29, 0x8f, 0xd6, 0x84, 0x28, 0x73, 0xfa, 0x05, 0x86, 0x32, 0x55, 0xc8, 0x8b, 0x5c, |
|
|
|
|
|
0xe8, 0x70, 0xaa, 0xbf, 0x09, 0xb5, 0x77, 0x1d, 0x53, 0x7c, 0x82, 0x45, 0xe5, 0xe9, 0xfc, 0x56, |
|
|
|
|
|
0x59, 0xa9, 0x20, 0x1a, 0x41, 0x37, 0xde, 0xad, 0x39, 0xa7, 0x49, 0xea, 0xb6, 0xc7, 0xd6, 0xf4, |
|
|
|
|
|
0x05, 0xfe, 0x8b, 0x8b, 0xa9, 0x83, 0xe0, 0x6c, 0x4f, 0x95, 0xdb, 0x29, 0xa7, 0x2a, 0x88, 0xde, |
|
|
|
|
|
0x43, 0x4b, 0xe8, 0x1d, 0x55, 0x6e, 0xd7, 0x88, 0xf1, 0xfa, 0x5c, 0x8c, 0x33, 0x1d, 0x6f, 0x8b, |
|
|
|
|
|
0xde, 0x4a, 0x91, 0x72, 0x70, 0xb2, 0x81, 0xe1, 0xff, 0x9a, 0xd0, 0x35, 0x74, 0xf5, 0x31, 0x62, |
|
|
|
|
|
0x9c, 0xd0, 0x63, 0xe9, 0x12, 0xdc, 0xd1, 0xc7, 0x55, 0x01, 0xd1, 0x1c, 0x7a, 0x4a, 0xc6, 0xe6, |
|
|
|
|
|
0x79, 0x9a, 0xa6, 0x95, 0x6c, 0x97, 0x79, 0xe6, 0x03, 0x0e, 0x3f, 0x56, 0xfe, 0xc2, 0xa0, 0x64, |
|
|
|
|
|
0x5c, 0xc5, 0x8b, 0xdb, 0x87, 0xdc, 0xb3, 0x1e, 0x73, 0xcf, 0xfa, 0x95, 0x7b, 0xd6, 0x8f, 0x93, |
|
|
|
|
|
0xd7, 0x78, 0x3c, 0x79, 0x8d, 0x9f, 0x27, 0xaf, 0xf1, 0xe5, 0xed, 0x96, 0xe9, 0xdd, 0xfd, 0x66, |
|
|
|
|
|
0x16, 0x8b, 0xc3, 0xbc, 0x66, 0xf0, 0xba, 0xd7, 0x8d, 0x8d, 0x9f, 0x9b, 0x7f, 0xd3, 0x36, 0xd9, |
|
|
|
|
|
0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xb3, 0x68, 0x97, 0x15, 0x03, 0x00, 0x00, |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func (m *NetAddress) Marshal() (dAtA []byte, err error) { |
|
|
func (m *NetAddress) Marshal() (dAtA []byte, err error) { |
|
@ -367,13 +358,6 @@ func (m *NetAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { |
|
|
_ = i |
|
|
_ = i |
|
|
var l int |
|
|
var l int |
|
|
_ = l |
|
|
_ = l |
|
|
if len(m.Str) > 0 { |
|
|
|
|
|
i -= len(m.Str) |
|
|
|
|
|
copy(dAtA[i:], m.Str) |
|
|
|
|
|
i = encodeVarintTypes(dAtA, i, uint64(len(m.Str))) |
|
|
|
|
|
i-- |
|
|
|
|
|
dAtA[i] = 0x22 |
|
|
|
|
|
} |
|
|
|
|
|
if m.Port != 0 { |
|
|
if m.Port != 0 { |
|
|
i = encodeVarintTypes(dAtA, i, uint64(m.Port)) |
|
|
i = encodeVarintTypes(dAtA, i, uint64(m.Port)) |
|
|
i-- |
|
|
i-- |
|
@ -584,10 +568,6 @@ func (m *NetAddress) Size() (n int) { |
|
|
if m.Port != 0 { |
|
|
if m.Port != 0 { |
|
|
n += 1 + sovTypes(uint64(m.Port)) |
|
|
n += 1 + sovTypes(uint64(m.Port)) |
|
|
} |
|
|
} |
|
|
l = len(m.Str) |
|
|
|
|
|
if l > 0 { |
|
|
|
|
|
n += 1 + l + sovTypes(uint64(l)) |
|
|
|
|
|
} |
|
|
|
|
|
return n |
|
|
return n |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -781,38 +761,6 @@ func (m *NetAddress) Unmarshal(dAtA []byte) error { |
|
|
break |
|
|
break |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
case 4: |
|
|
|
|
|
if wireType != 2 { |
|
|
|
|
|
return fmt.Errorf("proto: wrong wireType = %d for field Str", wireType) |
|
|
|
|
|
} |
|
|
|
|
|
var stringLen uint64 |
|
|
|
|
|
for shift := uint(0); ; shift += 7 { |
|
|
|
|
|
if shift >= 64 { |
|
|
|
|
|
return ErrIntOverflowTypes |
|
|
|
|
|
} |
|
|
|
|
|
if iNdEx >= l { |
|
|
|
|
|
return io.ErrUnexpectedEOF |
|
|
|
|
|
} |
|
|
|
|
|
b := dAtA[iNdEx] |
|
|
|
|
|
iNdEx++ |
|
|
|
|
|
stringLen |= uint64(b&0x7F) << shift |
|
|
|
|
|
if b < 0x80 { |
|
|
|
|
|
break |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
intStringLen := int(stringLen) |
|
|
|
|
|
if intStringLen < 0 { |
|
|
|
|
|
return ErrInvalidLengthTypes |
|
|
|
|
|
} |
|
|
|
|
|
postIndex := iNdEx + intStringLen |
|
|
|
|
|
if postIndex < 0 { |
|
|
|
|
|
return ErrInvalidLengthTypes |
|
|
|
|
|
} |
|
|
|
|
|
if postIndex > l { |
|
|
|
|
|
return io.ErrUnexpectedEOF |
|
|
|
|
|
} |
|
|
|
|
|
m.Str = string(dAtA[iNdEx:postIndex]) |
|
|
|
|
|
iNdEx = postIndex |
|
|
|
|
|
default: |
|
|
default: |
|
|
iNdEx = preIndex |
|
|
iNdEx = preIndex |
|
|
skippy, err := skipTypes(dAtA[iNdEx:]) |
|
|
skippy, err := skipTypes(dAtA[iNdEx:]) |
|
|