From 9a7d389f15367a360c81e9e3626d114f53237676 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Wed, 4 Jan 2017 14:43:52 +0100 Subject: [PATCH] proto fixes --- common/net/network.pb.go | 19 ++++++++++--------- tools/genproto/main.go | 11 +++++++++-- tools/geoip/geoip.pb.go | 8 +++++--- tools/geoip/geoip.proto | 3 +++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/common/net/network.pb.go b/common/net/network.pb.go index 709541ad..47d205bb 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -68,19 +68,20 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/common/net/network.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 221 bytes of a gzipped FileDescriptorProto + // 225 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2f, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0xcf, 0x4b, 0x2d, 0x01, 0xe1, 0xf2, 0xfc, 0xa2, 0x6c, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x51, 0x98, 0xc2, 0xa2, 0x54, 0x3d, 0x88, 0x22, 0xbd, 0xbc, 0xd4, 0x12, 0x25, 0x77, 0x2e, 0x6e, 0x3f, 0x88, 0x3a, 0x9f, 0xcc, 0xe2, 0x12, 0x21, 0x0b, 0x2e, 0x76, 0xa8, 0x36, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x3e, 0x23, 0x39, 0x3d, 0xac, 0xfa, 0xf4, 0xa0, 0x9a, 0x82, 0x60, 0xca, - 0xb5, 0x7c, 0xb8, 0xd8, 0xa1, 0x62, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x79, 0xd9, 0x79, 0xf9, 0xe5, - 0x79, 0x02, 0x0c, 0x42, 0x5c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, 0x01, 0x02, 0x8c, 0x42, - 0xec, 0x5c, 0xcc, 0x20, 0x06, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, 0x0c, 0x62, 0x78, 0x3b, - 0x07, 0x08, 0xb0, 0x08, 0xf1, 0x72, 0x71, 0x86, 0xa7, 0x26, 0x05, 0xe7, 0x27, 0x67, 0xa7, 0x96, - 0x08, 0xb0, 0x3a, 0xb9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0x62, 0xb7, 0xdb, 0x89, 0x07, 0x6a, 0x51, - 0x00, 0xc8, 0x63, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0xab, 0x98, 0x44, 0xc3, 0x8c, 0x82, 0x12, 0x2b, - 0xf5, 0x9c, 0x41, 0x4a, 0x9d, 0x21, 0x4a, 0xfd, 0x52, 0x4b, 0x92, 0xd8, 0xc0, 0x9e, 0x37, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x18, 0xab, 0xfe, 0x3a, 0x27, 0x01, 0x00, 0x00, + 0xb5, 0x02, 0xb8, 0xd8, 0xa1, 0x62, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x79, 0xd9, 0x79, 0xf9, 0xe5, + 0x79, 0x02, 0x0c, 0x42, 0x7c, 0x5c, 0x6c, 0x41, 0x89, 0xe5, 0x21, 0xce, 0x01, 0x02, 0x8c, 0x52, + 0x4c, 0x1c, 0x8c, 0x42, 0xec, 0x5c, 0xcc, 0x20, 0x0e, 0x13, 0x88, 0x11, 0xea, 0x12, 0x20, 0xc0, + 0x0c, 0x62, 0x78, 0x3b, 0x07, 0x08, 0xb0, 0x08, 0xf1, 0x72, 0x71, 0x86, 0xa7, 0x26, 0x05, 0xe7, + 0x27, 0x67, 0xa7, 0x96, 0x08, 0xb0, 0x3a, 0xb9, 0x71, 0x49, 0x26, 0xe7, 0xe7, 0x62, 0xb7, 0xdf, + 0x89, 0x07, 0x6a, 0x59, 0x00, 0xc8, 0x73, 0x51, 0xcc, 0x79, 0xa9, 0x25, 0xab, 0x98, 0x44, 0xc3, + 0x8c, 0x82, 0x12, 0x2b, 0xf5, 0x9c, 0x41, 0x4a, 0x9d, 0x21, 0x4a, 0xfd, 0x52, 0x4b, 0x92, 0xd8, + 0xc0, 0x01, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x45, 0xf9, 0x86, 0x63, 0x2b, 0x01, 0x00, + 0x00, } diff --git a/tools/genproto/main.go b/tools/genproto/main.go index 9d5fe104..2cabcef3 100644 --- a/tools/genproto/main.go +++ b/tools/genproto/main.go @@ -19,12 +19,19 @@ var protocMap = map[string]string{ "linux": filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", ".dev", "protoc", "linux", "protoc"), } +func sdkPath(reporoot, lang string) string { + path := filepath.Join(reporoot, ".dev", "sdk", lang) + os.MkdirAll(path, os.ModePerm) + return path +} + func main() { protofiles := make(map[string][]string) protoc := protocMap[runtime.GOOS] gosrc := filepath.Join(os.Getenv("GOPATH"), "src") + reporoot := filepath.Join(gosrc, "v2ray.com", "core") - filepath.Walk(filepath.Join(gosrc, "v2ray.com", "core"), func(path string, info os.FileInfo, err error) error { + filepath.Walk(reporoot, func(path string, info os.FileInfo, err error) error { if err != nil { fmt.Println(err) return err @@ -57,7 +64,7 @@ func main() { } } - err := filepath.Walk(filepath.Join(gosrc, "v2ray.com", "core"), func(path string, info os.FileInfo, err error) error { + err := filepath.Walk(reporoot, func(path string, info os.FileInfo, err error) error { if err != nil { fmt.Println(err) return err diff --git a/tools/geoip/geoip.pb.go b/tools/geoip/geoip.pb.go index d9f46fb3..4da57fff 100644 --- a/tools/geoip/geoip.pb.go +++ b/tools/geoip/geoip.pb.go @@ -39,7 +39,7 @@ func init() { func init() { proto.RegisterFile("v2ray.com/core/tools/geoip/geoip.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 155 bytes of a gzipped FileDescriptorProto + // 189 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x52, 0x2b, 0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x2f, 0xc9, 0xcf, 0xcf, 0x29, 0xd6, 0x4f, 0x4f, 0xcd, 0xcf, 0x2c, 0x80, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x62, @@ -48,6 +48,8 @@ var fileDescriptor0 = []byte{ 0x4a, 0xf6, 0x5c, 0x7c, 0xce, 0xf9, 0xa5, 0x79, 0x25, 0x45, 0x95, 0x9e, 0x01, 0x41, 0x89, 0x79, 0xe9, 0xa9, 0x42, 0xba, 0x5c, 0xcc, 0x99, 0x05, 0xc5, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0xd2, 0x7a, 0x48, 0xe6, 0x27, 0x16, 0x14, 0xe8, 0x41, 0xcc, 0xd0, 0x73, 0xf6, 0x74, 0x09, 0x0a, - 0x02, 0xa9, 0x73, 0x62, 0x8f, 0x62, 0x05, 0xdb, 0x98, 0xc4, 0x06, 0x36, 0xd0, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0xf8, 0x02, 0xe8, 0xc0, 0xba, 0x00, 0x00, 0x00, + 0x02, 0xa9, 0x73, 0xf2, 0xe0, 0x92, 0x4a, 0xce, 0xcf, 0xd5, 0xc3, 0xee, 0x0c, 0x27, 0x2e, 0x77, + 0x10, 0x15, 0x00, 0xb2, 0x2a, 0x8a, 0x15, 0x2c, 0xb4, 0x8a, 0x49, 0x2c, 0xcc, 0x28, 0x28, 0xb1, + 0x52, 0xcf, 0x19, 0xa4, 0x36, 0x04, 0xac, 0x16, 0xac, 0x28, 0x89, 0x0d, 0xec, 0x22, 0x63, 0x40, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x42, 0x52, 0x54, 0xfb, 0x00, 0x00, 0x00, } diff --git a/tools/geoip/geoip.proto b/tools/geoip/geoip.proto index 3b92e9e3..499171e4 100644 --- a/tools/geoip/geoip.proto +++ b/tools/geoip/geoip.proto @@ -1,7 +1,10 @@ syntax = "proto3"; package v2ray.core.tools.geoip; +option csharp_namespace = "V2Ray.Core.Tools.Geoip"; option go_package = "geoip"; +option java_package = "com.v2ray.core.tools.geoip"; +option java_outer_classname = "GeoipProto"; import "v2ray.com/core/app/router/config.proto";