Skip to content

Commit

Permalink
go generate
Browse files Browse the repository at this point in the history
  • Loading branch information
DarienRaymond committed Jul 24, 2017
1 parent cdfec69 commit 08a72b7
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 23 deletions.
2 changes: 1 addition & 1 deletion common/buf/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func (r *BytesToBufferReader) Read() (MultiBuffer, error) {

mb := NewMultiBuffer()
mb.Write(r.buffer[:nBytes])
return mb, nil
return mb, nil
}

type readerAdpater struct {
Expand Down
53 changes: 32 additions & 21 deletions config.pb.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ type Config struct {
App []*v2ray_core_common_serial.TypedMessage `protobuf:"bytes,4,rep,name=app" json:"app,omitempty"`
// Transport settings.
Transport *v2ray_core_transport.Config `protobuf:"bytes,5,opt,name=transport" json:"transport,omitempty"`
// Configuration for extensions. The config may not work if corresponding extension is not loaded into V2Ray.
// V2Ray will ignore such config during initialization.
Extension []*v2ray_core_common_serial.TypedMessage `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
}

func (m *Config) Reset() { *m = Config{} }
Expand Down Expand Up @@ -85,6 +88,13 @@ func (m *Config) GetTransport() *v2ray_core_transport.Config {
return nil
}

func (m *Config) GetExtension() []*v2ray_core_common_serial.TypedMessage {
if m != nil {
return m.Extension
}
return nil
}

func init() {
proto.RegisterType((*Config)(nil), "v2ray.core.Config")
proto.RegisterEnum("v2ray.core.ConfigFormat", ConfigFormat_name, ConfigFormat_value)
Expand All @@ -93,25 +103,26 @@ func init() {
func init() { proto.RegisterFile("v2ray.com/core/config.proto", fileDescriptor0) }

var fileDescriptor0 = []byte{
// 319 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x5f, 0x4b, 0xf3, 0x30,
0x14, 0xc6, 0xdf, 0x6e, 0x7d, 0x67, 0x3d, 0x1b, 0x32, 0x72, 0x35, 0xa6, 0x17, 0x43, 0xd8, 0x18,
0x82, 0xa9, 0xd4, 0x1b, 0xf1, 0xd2, 0x81, 0x7f, 0x06, 0xba, 0x31, 0xc5, 0x0b, 0x6f, 0x24, 0xeb,
0xb2, 0x31, 0x58, 0x72, 0x42, 0x9a, 0x89, 0xfd, 0x28, 0x7e, 0x05, 0x3f, 0xa5, 0xb4, 0x69, 0xbb,
0x76, 0xe2, 0x55, 0x20, 0xe7, 0xf9, 0xfd, 0x72, 0xf2, 0xc0, 0xf1, 0x47, 0xa0, 0x59, 0x4c, 0x43,
0x14, 0x7e, 0x88, 0x9a, 0xfb, 0x21, 0xca, 0xe5, 0x7a, 0x45, 0x95, 0x46, 0x83, 0x04, 0xf2, 0xa1,
0xe6, 0xdd, 0xe1, 0x5e, 0x90, 0x29, 0xe5, 0x2b, 0x8d, 0x9f, 0xb1, 0x60, 0xb2, 0x42, 0x75, 0x2f,
0x7e, 0x29, 0x85, 0x40, 0xe9, 0x47, 0x5c, 0xaf, 0xd9, 0xc6, 0x37, 0xb1, 0xe2, 0x8b, 0x77, 0xc1,
0xa3, 0x88, 0xad, 0x78, 0x46, 0xf4, 0xf7, 0x08, 0xa3, 0x99, 0x8c, 0x14, 0x6a, 0x53, 0x11, 0x9f,
0x7e, 0xd5, 0xa0, 0x31, 0x4a, 0x2f, 0xc8, 0x1d, 0x1c, 0xac, 0xe5, 0x1c, 0xb7, 0x72, 0xd1, 0x71,
0x7a, 0xf5, 0x61, 0x33, 0x38, 0xa7, 0xbb, 0x5d, 0x29, 0x53, 0x8a, 0xe6, 0xbb, 0xd1, 0x07, 0x9b,
0xbb, 0x67, 0x72, 0xb1, 0xe1, 0xda, 0xf2, 0xb3, 0x9c, 0x26, 0x63, 0xf0, 0x70, 0x6b, 0xac, 0xa9,
0x96, 0x9a, 0xe8, 0x9f, 0xa6, 0x49, 0x16, 0xac, 0xaa, 0x0a, 0x9e, 0x5c, 0x41, 0x9d, 0x29, 0xd5,
0x71, 0x53, 0xcd, 0xa0, 0xac, 0xb1, 0x15, 0x50, 0x5b, 0x01, 0x7d, 0x49, 0x2a, 0x78, 0xb4, 0x0d,
0xcc, 0x12, 0x84, 0x5c, 0xc3, 0x61, 0xf1, 0xe7, 0xce, 0xff, 0x9e, 0x33, 0x6c, 0x06, 0x27, 0x65,
0xbe, 0x18, 0xd2, 0xec, 0xd1, 0x5d, 0x7c, 0xec, 0x7a, 0xf5, 0xb6, 0x7b, 0x36, 0x80, 0x96, 0x1d,
0xdd, 0xa2, 0x16, 0xcc, 0x90, 0x16, 0x78, 0xd3, 0xa4, 0xb4, 0xf9, 0x76, 0xd9, 0xfe, 0x47, 0x3c,
0x70, 0xc7, 0xcf, 0x93, 0xa7, 0xb6, 0x73, 0xd3, 0x87, 0xa3, 0x10, 0x45, 0xc9, 0x3d, 0x75, 0xde,
0xdc, 0xe4, 0xfc, 0xae, 0xc1, 0x6b, 0x30, 0x63, 0x31, 0x1d, 0xa1, 0xe6, 0xf3, 0x46, 0xda, 0xf8,
0xe5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xbe, 0x63, 0xd9, 0x1f, 0x02, 0x00, 0x00,
// 336 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xcd, 0x4a, 0xf3, 0x40,
0x18, 0x85, 0xbf, 0xb4, 0xf9, 0x6a, 0xfa, 0xb6, 0x48, 0x99, 0x55, 0xa8, 0x2e, 0x8a, 0xd0, 0x52,
0x04, 0x27, 0x12, 0x37, 0xe2, 0xd2, 0x8a, 0x3f, 0x05, 0x6d, 0xa9, 0xe2, 0xc2, 0x8d, 0x4c, 0xd3,
0x69, 0x09, 0x74, 0xe6, 0x1d, 0x26, 0x53, 0x69, 0x6e, 0xc9, 0x9b, 0xf2, 0x56, 0x24, 0x99, 0xfe,
0xa5, 0xe2, 0xc2, 0x55, 0x20, 0x73, 0x9e, 0xe7, 0x4c, 0x4e, 0xe0, 0xe8, 0x23, 0xd4, 0x2c, 0xa5,
0x11, 0x8a, 0x20, 0x42, 0xcd, 0x83, 0x08, 0xe5, 0x34, 0x9e, 0x51, 0xa5, 0xd1, 0x20, 0x81, 0xf5,
0xa1, 0xe6, 0xcd, 0xee, 0x5e, 0x90, 0x29, 0x15, 0x28, 0x8d, 0xcb, 0x54, 0x30, 0x59, 0xa0, 0x9a,
0xe7, 0x3f, 0x94, 0x42, 0xa0, 0x0c, 0x12, 0xae, 0x63, 0x36, 0x0f, 0x4c, 0xaa, 0xf8, 0xe4, 0x5d,
0xf0, 0x24, 0x61, 0x33, 0xbe, 0x22, 0xda, 0x7b, 0x84, 0xd1, 0x4c, 0x26, 0x0a, 0xb5, 0x29, 0x88,
0x4f, 0xbe, 0x4a, 0x50, 0xe9, 0xe5, 0x2f, 0xc8, 0x1d, 0x1c, 0xc4, 0x72, 0x8c, 0x0b, 0x39, 0xf1,
0x9d, 0x56, 0xb9, 0x5b, 0x0b, 0xcf, 0xe8, 0xf6, 0xae, 0x94, 0x29, 0x45, 0xd7, 0x77, 0xa3, 0x0f,
0x36, 0x77, 0xcf, 0xe4, 0x64, 0xce, 0xb5, 0xe5, 0x47, 0x6b, 0x9a, 0xf4, 0xc1, 0xc3, 0x85, 0xb1,
0xa6, 0x52, 0x6e, 0xa2, 0xbf, 0x9a, 0x06, 0xab, 0x60, 0x51, 0xb5, 0xe1, 0xc9, 0x25, 0x94, 0x99,
0x52, 0xbe, 0x9b, 0x6b, 0x3a, 0xbb, 0x1a, 0x3b, 0x01, 0xb5, 0x13, 0xd0, 0x97, 0x6c, 0x82, 0x47,
0xbb, 0xc0, 0x28, 0x43, 0xc8, 0x15, 0x54, 0x37, 0xdf, 0xec, 0xff, 0x6f, 0x39, 0xdd, 0x5a, 0x78,
0xbc, 0xcb, 0x6f, 0x0e, 0xe9, 0xaa, 0x74, 0x1b, 0x27, 0x37, 0x50, 0xe5, 0x4b, 0xc3, 0x65, 0x12,
0xa3, 0xf4, 0x2b, 0x7f, 0xea, 0xde, 0x82, 0x7d, 0xd7, 0x2b, 0x37, 0xdc, 0xd3, 0x0e, 0xd4, 0x6d,
0xc1, 0x2d, 0x6a, 0xc1, 0x0c, 0xa9, 0x83, 0x37, 0xcc, 0xa6, 0x1f, 0x2f, 0xa6, 0x8d, 0x7f, 0xc4,
0x03, 0xb7, 0xff, 0x3c, 0x78, 0x6a, 0x38, 0xd7, 0x6d, 0x38, 0x8c, 0x50, 0xec, 0xb4, 0x0c, 0x9d,
0x37, 0x37, 0x7b, 0x7e, 0x96, 0xe0, 0x35, 0x1c, 0xb1, 0x94, 0xf6, 0x50, 0xf3, 0x71, 0x25, 0xff,
0x6f, 0x17, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x62, 0x93, 0x6d, 0x78, 0x65, 0x02, 0x00, 0x00,
}
2 changes: 1 addition & 1 deletion tools/geoip/geoip.generated.go

Large diffs are not rendered by default.

0 comments on commit 08a72b7

Please sign in to comment.