Update vprotogen (#366)

* Refine vprotogen
* Regenerate pb.go files

app/log/command/config_grpc.pb.go

@@ -61,7 +61,7 @@ type UnsafeLoggerServiceServer interface {
 	mustEmbedUnimplementedLoggerServiceServer()
 }
 
-func RegisterLoggerServiceServer(s *grpc.Server, srv LoggerServiceServer) {
+func RegisterLoggerServiceServer(s grpc.ServiceRegistrar, srv LoggerServiceServer) {
 	s.RegisterService(&_LoggerService_serviceDesc, srv)
 }
 

app/proxyman/command/command_grpc.pb.go

@@ -131,7 +131,7 @@ type UnsafeHandlerServiceServer interface {
 	mustEmbedUnimplementedHandlerServiceServer()
 }
 
-func RegisterHandlerServiceServer(s *grpc.Server, srv HandlerServiceServer) {
+func RegisterHandlerServiceServer(s grpc.ServiceRegistrar, srv HandlerServiceServer) {
 	s.RegisterService(&_HandlerService_serviceDesc, srv)
 }
 

app/router/command/command_grpc.pb.go

@@ -98,7 +98,7 @@ type UnsafeRoutingServiceServer interface {
 	mustEmbedUnimplementedRoutingServiceServer()
 }
 
-func RegisterRoutingServiceServer(s *grpc.Server, srv RoutingServiceServer) {
+func RegisterRoutingServiceServer(s grpc.ServiceRegistrar, srv RoutingServiceServer) {
 	s.RegisterService(&_RoutingService_serviceDesc, srv)
 }
 

app/stats/command/command_grpc.pb.go

@@ -89,7 +89,7 @@ type UnsafeStatsServiceServer interface {
 	mustEmbedUnimplementedStatsServiceServer()
 }
 
-func RegisterStatsServiceServer(s *grpc.Server, srv StatsServiceServer) {
+func RegisterStatsServiceServer(s grpc.ServiceRegistrar, srv StatsServiceServer) {
 	s.RegisterService(&_StatsService_serviceDesc, srv)
 }
 

infra/vprotogen/main.go

@@ -20,6 +20,11 @@ func main() {
 	}
 
 	GOBIN := common.GetGOBIN()
+	binPath := os.Getenv("PATH")
+	pathSlice := []string{binPath, GOBIN, pwd}
+	binPath = strings.Join(pathSlice, string(os.PathListSeparator))
+	os.Setenv("PATH", binPath)
+
 	EXE := ""
 	if runtime.GOOS == "windows" {
 		EXE = ".exe"
@@ -27,7 +32,7 @@ func main() {
 	protoc := "protoc" + EXE
 
 	if path, err := exec.LookPath(protoc); err != nil {
-		fmt.Println("Make sure that you have `" + protoc + "` in your system or current path, please visit https://github.com/protocolbuffers/protobuf/releases")
+		fmt.Println("Make sure that you have `" + protoc + "` in your system path or current path. To download it, please visit https://github.com/protocolbuffers/protobuf/releases")
 		os.Exit(1)
 	} else {
 		protoc = path
@@ -61,14 +66,13 @@ func main() {
 		for _, relProtoFile := range files {
 			var args []string
 			if core.ProtoFilesUsingProtocGenGoFast[relProtoFile] {
-				args = []string{"--gofast_out", pwd, "--plugin", "protoc-gen-gofast=" + GOBIN + "/protoc-gen-gofast" + EXE}
+				args = []string{"--gofast_out", pwd, "--gofast_opt", "paths=source_relative", "--plugin", "protoc-gen-gofast=" + GOBIN + "/protoc-gen-gofast" + EXE}
 			} else {
-				args = []string{"--go_out", pwd, "--go-grpc_out", pwd, "--plugin", "protoc-gen-go=" + GOBIN + "/protoc-gen-go" + EXE, "--plugin", "protoc-gen-go-grpc=" + GOBIN + "/protoc-gen-go-grpc" + EXE}
+				args = []string{"--go_out", pwd, "--go_opt", "paths=source_relative", "--go-grpc_out", pwd, "--go-grpc_opt", "paths=source_relative", "--plugin", "protoc-gen-go=" + GOBIN + "/protoc-gen-go" + EXE, "--plugin", "protoc-gen-go-grpc=" + GOBIN + "/protoc-gen-go-grpc" + EXE}
 			}
 			args = append(args, relProtoFile)
 			cmd := exec.Command(protoc, args...)
 			cmd.Env = append(cmd.Env, os.Environ()...)
-			cmd.Env = append(cmd.Env, "GOBIN="+GOBIN)
 			output, cmdErr := cmd.CombinedOutput()
 			if len(output) > 0 {
 				fmt.Println(string(output))
@@ -79,82 +83,4 @@ func main() {
 			}
 		}
 	}
-
-	moduleName, gmnErr := common.GetModuleName(pwd)
-	if gmnErr != nil {
-		fmt.Println(gmnErr)
-		os.Exit(1)
-	}
-	modulePath := filepath.Join(strings.Split(moduleName, "/")...)
-
-	pbGoFilesMap := make(map[string][]string)
-	walkErr2 := filepath.Walk(modulePath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			fmt.Println(err)
-			return err
-		}
-
-		if info.IsDir() {
-			return nil
-		}
-
-		dir := filepath.Dir(path)
-		filename := filepath.Base(path)
-		if strings.HasSuffix(filename, ".pb.go") {
-			pbGoFilesMap[dir] = append(pbGoFilesMap[dir], path)
-		}
-
-		return nil
-	})
-	if walkErr2 != nil {
-		fmt.Println(walkErr2)
-		os.Exit(1)
-	}
-
-	var err error
-	for _, srcPbGoFiles := range pbGoFilesMap {
-		for _, srcPbGoFile := range srcPbGoFiles {
-			var dstPbGoFile string
-			dstPbGoFile, err = filepath.Rel(modulePath, srcPbGoFile)
-			if err != nil {
-				fmt.Println(err)
-				continue
-			}
-			err = os.Link(srcPbGoFile, dstPbGoFile)
-			if err != nil {
-				if os.IsNotExist(err) {
-					fmt.Printf("'%s' does not exist\n", srcPbGoFile)
-					continue
-				}
-				if os.IsPermission(err) {
-					fmt.Println(err)
-					continue
-				}
-				if os.IsExist(err) {
-					err = os.Remove(dstPbGoFile)
-					if err != nil {
-						fmt.Printf("Failed to delete file '%s'\n", dstPbGoFile)
-						continue
-					}
-					err = os.Rename(srcPbGoFile, dstPbGoFile)
-					if err != nil {
-						fmt.Printf("Can not move '%s' to '%s'\n", srcPbGoFile, dstPbGoFile)
-					}
-					continue
-				}
-			}
-			err = os.Rename(srcPbGoFile, dstPbGoFile)
-			if err != nil {
-				fmt.Printf("Can not move '%s' to '%s'\n", srcPbGoFile, dstPbGoFile)
-			}
-			continue
-		}
-	}
-
-	if err == nil {
-		err = os.RemoveAll(strings.Split(modulePath, "/")[0])
-		if err != nil {
-			fmt.Println(err)
-		}
-	}
 }

proxy/vless/encoding/addons.pb.go

@@ -1,15 +1,13 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: proxy/vless/encoding/addons.proto
 
-package encoding
+package encoding // import "v2ray.com/core/proxy/vless/encoding"
 
-import (
+import proto "github.com/golang/protobuf/proto"
-	fmt "fmt"
+import fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
+import math "math"
-	io "io"
+
-	math "math"
+import io "io"
-	math_bits "math/bits"
-)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -20,7 +18,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type Addons struct {
 	Flow                 string   `protobuf:"bytes,1,opt,name=Flow,proto3" json:"Flow,omitempty"`
@@ -34,7 +32,7 @@ func (m *Addons) Reset()         { *m = Addons{} }
 func (m *Addons) String() string { return proto.CompactTextString(m) }
 func (*Addons) ProtoMessage()    {}
 func (*Addons) Descriptor() ([]byte, []int) {
-	return fileDescriptor_75ab671b0ca8b1cc, []int{0}
+	return fileDescriptor_addons_715144385dbf650f, []int{0}
 }
 func (m *Addons) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -44,15 +42,15 @@ func (m *Addons) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return xxx_messageInfo_Addons.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
+		n, err := m.MarshalTo(b)
 		if err != nil {
 			return nil, err
 		}
 		return b[:n], nil
 	}
 }
-func (m *Addons) XXX_Merge(src proto.Message) {
+func (dst *Addons) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Addons.Merge(m, src)
+	xxx_messageInfo_Addons.Merge(dst, src)
 }
 func (m *Addons) XXX_Size() int {
 	return m.Size()
@@ -80,29 +78,10 @@ func (m *Addons) GetSeed() []byte {
 func init() {
 	proto.RegisterType((*Addons)(nil), "v2ray.core.proxy.vless.encoding.Addons")
 }
-
-func init() { proto.RegisterFile("proxy/vless/encoding/addons.proto", fileDescriptor_75ab671b0ca8b1cc) }
-
-var fileDescriptor_75ab671b0ca8b1cc = []byte{
-	// 186 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x28, 0xca, 0xaf,
-	0xa8, 0xd4, 0x2f, 0xcb, 0x49, 0x2d, 0x2e, 0xd6, 0x4f, 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b,
-	0xd7, 0x4f, 0x4c, 0x49, 0xc9, 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x2f,
-	0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0x2f, 0x4a, 0xd5, 0x03, 0xab, 0xd6, 0x03, 0xab, 0xd6,
-	0x83, 0xa9, 0x56, 0x32, 0xe0, 0x62, 0x73, 0x04, 0x6b, 0x10, 0x12, 0xe2, 0x62, 0x71, 0xcb, 0xc9,
-	0x2f, 0x97, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x41, 0x62, 0xc1, 0xa9, 0xa9, 0x29,
-	0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x60, 0xb6, 0x53, 0xdd, 0x89, 0x47, 0x72, 0x8c, 0x17,
-	0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x03, 0x97, 0x72, 0x72, 0x7e,
-	0xae, 0x1e, 0x01, 0x8b, 0x02, 0x18, 0xa3, 0x94, 0x61, 0x4a, 0x72, 0xf5, 0x41, 0xca, 0xf4, 0xb1,
-	0xb9, 0x7e, 0x15, 0x93, 0x7c, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0xc8, 0xa0, 0x00, 0xb0,
-	0x41, 0x61, 0x60, 0x83, 0x5c, 0xa1, 0x2a, 0x92, 0xd8, 0xc0, 0x3e, 0x33, 0x06, 0x04, 0x00, 0x00,
-	0xff, 0xff, 0x36, 0x32, 0x14, 0x7c, 0xfe, 0x00, 0x00, 0x00,
-}
-
 func (m *Addons) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
+	n, err := m.MarshalTo(dAtA)
 	if err != nil {
 		return nil, err
 	}
@@ -110,51 +89,38 @@ func (m *Addons) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *Addons) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
+	var i int
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *Addons) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if m.XXX_unrecognized != nil {
+	if len(m.Flow) > 0 {
-		i -= len(m.XXX_unrecognized)
+		dAtA[i] = 0xa
-		copy(dAtA[i:], m.XXX_unrecognized)
+		i++
+		i = encodeVarintAddons(dAtA, i, uint64(len(m.Flow)))
+		i += copy(dAtA[i:], m.Flow)
 	}
 	if len(m.Seed) > 0 {
-		i -= len(m.Seed)
-		copy(dAtA[i:], m.Seed)
-		i = encodeVarintAddons(dAtA, i, uint64(len(m.Seed)))
-		i--
 		dAtA[i] = 0x12
+		i++
+		i = encodeVarintAddons(dAtA, i, uint64(len(m.Seed)))
+		i += copy(dAtA[i:], m.Seed)
 	}
-	if len(m.Flow) > 0 {
+	if m.XXX_unrecognized != nil {
-		i -= len(m.Flow)
+		i += copy(dAtA[i:], m.XXX_unrecognized)
-		copy(dAtA[i:], m.Flow)
-		i = encodeVarintAddons(dAtA, i, uint64(len(m.Flow)))
-		i--
-		dAtA[i] = 0xa
 	}
-	return len(dAtA) - i, nil
+	return i, nil
 }
 
 func encodeVarintAddons(dAtA []byte, offset int, v uint64) int {
-	offset -= sovAddons(v)
-	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
 		v >>= 7
 		offset++
 	}
 	dAtA[offset] = uint8(v)
-	return base
+	return offset + 1
 }
 func (m *Addons) Size() (n int) {
-	if m == nil {
-		return 0
-	}
 	var l int
 	_ = l
 	l = len(m.Flow)
@@ -172,7 +138,14 @@ func (m *Addons) Size() (n int) {
 }
 
 func sovAddons(x uint64) (n int) {
-	return (math_bits.Len64(x|1) + 6) / 7
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
 }
 func sozAddons(x uint64) (n int) {
 	return sovAddons(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -192,7 +165,7 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 			}
 			b := dAtA[iNdEx]
 			iNdEx++
-			wire |= uint64(b&0x7F) << shift
+			wire |= (uint64(b) & 0x7F) << shift
 			if b < 0x80 {
 				break
 			}
@@ -220,7 +193,7 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
+				stringLen |= (uint64(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -230,9 +203,6 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 				return ErrInvalidLengthAddons
 			}
 			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthAddons
-			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -252,7 +222,7 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				byteLen |= int(b&0x7F) << shift
+				byteLen |= (int(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -261,9 +231,6 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 				return ErrInvalidLengthAddons
 			}
 			postIndex := iNdEx + byteLen
-			if postIndex < 0 {
-				return ErrInvalidLengthAddons
-			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -281,9 +248,6 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 			if skippy < 0 {
 				return ErrInvalidLengthAddons
 			}
-			if (iNdEx + skippy) < 0 {
-				return ErrInvalidLengthAddons
-			}
 			if (iNdEx + skippy) > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -300,7 +264,6 @@ func (m *Addons) Unmarshal(dAtA []byte) error {
 func skipAddons(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
-	depth := 0
 	for iNdEx < l {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
@@ -332,8 +295,10 @@ func skipAddons(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
+			return iNdEx, nil
 		case 1:
 			iNdEx += 8
+			return iNdEx, nil
 		case 2:
 			var length int
 			for shift := uint(0); ; shift += 7 {
@@ -350,34 +315,73 @@ func skipAddons(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
+			iNdEx += length
 			if length < 0 {
 				return 0, ErrInvalidLengthAddons
 			}
-			iNdEx += length
+			return iNdEx, nil
 		case 3:
-			depth++
+			for {
-		case 4:
+				var innerWire uint64
-			if depth == 0 {
+				var start int = iNdEx
-				return 0, ErrUnexpectedEndOfGroupAddons
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return 0, ErrIntOverflowAddons
+					}
+					if iNdEx >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := skipAddons(dAtA[start:])
+				if err != nil {
+					return 0, err
+				}
+				iNdEx = start + next
 			}
-			depth--
+			return iNdEx, nil
+		case 4:
+			return iNdEx, nil
 		case 5:
 			iNdEx += 4
+			return iNdEx, nil
 		default:
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
-		if iNdEx < 0 {
-			return 0, ErrInvalidLengthAddons
-		}
-		if depth == 0 {
-			return iNdEx, nil
-		}
 	}
-	return 0, io.ErrUnexpectedEOF
+	panic("unreachable")
 }
 
 var (
-	ErrInvalidLengthAddons        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrInvalidLengthAddons = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowAddons          = fmt.Errorf("proto: integer overflow")
+	ErrIntOverflowAddons   = fmt.Errorf("proto: integer overflow")
-	ErrUnexpectedEndOfGroupAddons = fmt.Errorf("proto: unexpected end of group")
 )
+
+func init() {
+	proto.RegisterFile("proxy/vless/encoding/addons.proto", fileDescriptor_addons_715144385dbf650f)
+}
+
+var fileDescriptor_addons_715144385dbf650f = []byte{
+	// 186 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x28, 0xca, 0xaf,
+	0xa8, 0xd4, 0x2f, 0xcb, 0x49, 0x2d, 0x2e, 0xd6, 0x4f, 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b,
+	0xd7, 0x4f, 0x4c, 0x49, 0xc9, 0xcf, 0x2b, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x2f,
+	0x33, 0x2a, 0x4a, 0xac, 0xd4, 0x4b, 0xce, 0x2f, 0x4a, 0xd5, 0x03, 0xab, 0xd6, 0x03, 0xab, 0xd6,
+	0x83, 0xa9, 0x56, 0x32, 0xe0, 0x62, 0x73, 0x04, 0x6b, 0x10, 0x12, 0xe2, 0x62, 0x71, 0xcb, 0xc9,
+	0x2f, 0x97, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x02, 0xb3, 0x41, 0x62, 0xc1, 0xa9, 0xa9, 0x29,
+	0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x60, 0xb6, 0x53, 0xdd, 0x89, 0x47, 0x72, 0x8c, 0x17,
+	0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe3, 0xb1, 0x1c, 0x03, 0x97, 0x72, 0x72, 0x7e,
+	0xae, 0x1e, 0x01, 0x8b, 0x02, 0x18, 0xa3, 0x94, 0x61, 0x4a, 0x72, 0xf5, 0x41, 0xca, 0xf4, 0xb1,
+	0xb9, 0x7e, 0x15, 0x93, 0x7c, 0x98, 0x51, 0x50, 0x62, 0xa5, 0x9e, 0x33, 0xc8, 0xa0, 0x00, 0xb0,
+	0x41, 0x61, 0x60, 0x83, 0x5c, 0xa1, 0x2a, 0x92, 0xd8, 0xc0, 0x3e, 0x33, 0x06, 0x04, 0x00, 0x00,
+	0xff, 0xff, 0x36, 0x32, 0x14, 0x7c, 0xfe, 0x00, 0x00, 0x00,
+}