diff --git a/app/dispatcher/config.pb.go b/app/dispatcher/config.pb.go index 7d370a54f..90116721d 100644 --- a/app/dispatcher/config.pb.go +++ b/app/dispatcher/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/app/dispatcher/config.proto -// DO NOT EDIT! - -/* -Package dispatcher is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/app/dispatcher/config.proto - -It has these top-level messages: - Config -*/ package dispatcher import proto "github.com/golang/protobuf/proto" diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go index 9af84e09e..b5e8273f7 100644 --- a/app/dns/config.pb.go +++ b/app/dns/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/app/dns/config.proto -// DO NOT EDIT! - -/* -Package dns is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/app/dns/config.proto - -It has these top-level messages: - Config -*/ package dns import proto "github.com/golang/protobuf/proto" diff --git a/app/proxyman/config.pb.go b/app/proxyman/config.pb.go index f5d1764e9..5cae4c375 100644 --- a/app/proxyman/config.pb.go +++ b/app/proxyman/config.pb.go @@ -1,17 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/app/proxyman/config.proto -// DO NOT EDIT! - -/* -Package proxyman is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/app/proxyman/config.proto - -It has these top-level messages: - InboundConfig - OutboundConfig -*/ package proxyman import proto "github.com/golang/protobuf/proto" diff --git a/app/router/config.pb.go b/app/router/config.pb.go index 364cb9e35..205f4836f 100644 --- a/app/router/config.pb.go +++ b/app/router/config.pb.go @@ -1,19 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/app/router/config.proto -// DO NOT EDIT! - -/* -Package router is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/app/router/config.proto - -It has these top-level messages: - Domain - CIDR - RoutingRule - Config -*/ package router import proto "github.com/golang/protobuf/proto" diff --git a/app/web/config.pb.go b/app/web/config.pb.go index e2f77a2a7..527e24c7d 100644 --- a/app/web/config.pb.go +++ b/app/web/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/app/web/config.proto -// DO NOT EDIT! - -/* -Package web is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/app/web/config.proto - -It has these top-level messages: - FileServer - Server - Config -*/ package web import proto "github.com/golang/protobuf/proto" diff --git a/common/log/config.pb.go b/common/log/config.pb.go index 7701a9ad2..c6f05a872 100644 --- a/common/log/config.pb.go +++ b/common/log/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/log/config.proto -// DO NOT EDIT! - -/* -Package log is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/common/log/config.proto - -It has these top-level messages: - Config -*/ package log import proto "github.com/golang/protobuf/proto" diff --git a/common/net/address.pb.go b/common/net/address.pb.go index 648c1ade6..9d01a9963 100644 --- a/common/net/address.pb.go +++ b/common/net/address.pb.go @@ -1,22 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/net/address.proto -// DO NOT EDIT! - -/* -Package net is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/common/net/address.proto - v2ray.com/core/common/net/destination.proto - v2ray.com/core/common/net/network.proto - v2ray.com/core/common/net/port.proto - -It has these top-level messages: - IPOrDomain - Endpoint - NetworkList - PortRange -*/ package net import proto "github.com/golang/protobuf/proto" diff --git a/common/net/destination.pb.go b/common/net/destination.pb.go index a67863f41..cdbc5948b 100644 --- a/common/net/destination.pb.go +++ b/common/net/destination.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/net/destination.proto -// DO NOT EDIT! - package net import proto "github.com/golang/protobuf/proto" diff --git a/common/net/network.pb.go b/common/net/network.pb.go index 2fe454615..709541ad1 100644 --- a/common/net/network.pb.go +++ b/common/net/network.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/net/network.proto -// DO NOT EDIT! - package net import proto "github.com/golang/protobuf/proto" diff --git a/common/net/port.pb.go b/common/net/port.pb.go index 96eec1ae7..7be620b5c 100644 --- a/common/net/port.pb.go +++ b/common/net/port.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/net/port.proto -// DO NOT EDIT! - package net import proto "github.com/golang/protobuf/proto" diff --git a/common/protocol/command.pb.go b/common/protocol/command.pb.go index e4da9a0a4..27394947c 100644 --- a/common/protocol/command.pb.go +++ b/common/protocol/command.pb.go @@ -1,22 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/protocol/command.proto -// DO NOT EDIT! - -/* -Package protocol is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/common/protocol/command.proto - v2ray.com/core/common/protocol/headers.proto - v2ray.com/core/common/protocol/server_spec.proto - v2ray.com/core/common/protocol/user.proto - -It has these top-level messages: - AlternativeOutboundConfig - SecurityConfig - ServerEndpoint - User -*/ package protocol import proto "github.com/golang/protobuf/proto" diff --git a/common/protocol/headers.pb.go b/common/protocol/headers.pb.go index d91dd43a0..e0696f842 100644 --- a/common/protocol/headers.pb.go +++ b/common/protocol/headers.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/protocol/headers.proto -// DO NOT EDIT! - package protocol import proto "github.com/golang/protobuf/proto" diff --git a/common/protocol/server_spec.pb.go b/common/protocol/server_spec.pb.go index 7a6e0d1f3..8762dcb9f 100644 --- a/common/protocol/server_spec.pb.go +++ b/common/protocol/server_spec.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/protocol/server_spec.proto -// DO NOT EDIT! - package protocol import proto "github.com/golang/protobuf/proto" diff --git a/common/protocol/user.pb.go b/common/protocol/user.pb.go index 9b28549c1..f7cb40120 100644 --- a/common/protocol/user.pb.go +++ b/common/protocol/user.pb.go @@ -1,7 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/protocol/user.proto -// DO NOT EDIT! - package protocol import proto "github.com/golang/protobuf/proto" diff --git a/common/serial/typed_message.pb.go b/common/serial/typed_message.pb.go index 939ac9dca..1b37ac8ce 100644 --- a/common/serial/typed_message.pb.go +++ b/common/serial/typed_message.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/common/serial/typed_message.proto -// DO NOT EDIT! - -/* -Package serial is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/common/serial/typed_message.proto - -It has these top-level messages: - TypedMessage -*/ package serial import proto "github.com/golang/protobuf/proto" diff --git a/config.pb.go b/config.pb.go index bad7225a1..658153ece 100644 --- a/config.pb.go +++ b/config.pb.go @@ -1,21 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/config.proto -// DO NOT EDIT! - -/* -Package core is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/config.proto - -It has these top-level messages: - AllocationStrategyConcurrency - AllocationStrategyRefresh - AllocationStrategy - InboundConnectionConfig - OutboundConnectionConfig - Config -*/ package core import proto "github.com/golang/protobuf/proto" diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go index 6496bd5f1..fc976355f 100644 --- a/proxy/blackhole/config.pb.go +++ b/proxy/blackhole/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/blackhole/config.proto -// DO NOT EDIT! - -/* -Package blackhole is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/blackhole/config.proto - -It has these top-level messages: - NoneResponse - HTTPResponse - Config -*/ package blackhole import proto "github.com/golang/protobuf/proto" diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go index 021bfd4fe..16401a380 100644 --- a/proxy/dokodemo/config.pb.go +++ b/proxy/dokodemo/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/dokodemo/config.proto -// DO NOT EDIT! - -/* -Package dokodemo is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/dokodemo/config.proto - -It has these top-level messages: - Config -*/ package dokodemo import proto "github.com/golang/protobuf/proto" diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go index afe40c22f..3b0d21513 100644 --- a/proxy/freedom/config.pb.go +++ b/proxy/freedom/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/freedom/config.proto -// DO NOT EDIT! - -/* -Package freedom is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/freedom/config.proto - -It has these top-level messages: - Config -*/ package freedom import proto "github.com/golang/protobuf/proto" diff --git a/proxy/http/config.pb.go b/proxy/http/config.pb.go index d0fc8e8b6..da73a3ec8 100644 --- a/proxy/http/config.pb.go +++ b/proxy/http/config.pb.go @@ -1,17 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/http/config.proto -// DO NOT EDIT! - -/* -Package http is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/http/config.proto - -It has these top-level messages: - ServerConfig - ClientConfig -*/ package http import proto "github.com/golang/protobuf/proto" diff --git a/proxy/shadowsocks/config.pb.go b/proxy/shadowsocks/config.pb.go index 6cb904740..660186c12 100644 --- a/proxy/shadowsocks/config.pb.go +++ b/proxy/shadowsocks/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/shadowsocks/config.proto -// DO NOT EDIT! - -/* -Package shadowsocks is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/shadowsocks/config.proto - -It has these top-level messages: - Account - ServerConfig - ClientConfig -*/ package shadowsocks import proto "github.com/golang/protobuf/proto" diff --git a/proxy/socks/config.pb.go b/proxy/socks/config.pb.go index c4db89188..7674d371e 100644 --- a/proxy/socks/config.pb.go +++ b/proxy/socks/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/socks/config.proto -// DO NOT EDIT! - -/* -Package socks is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/socks/config.proto - -It has these top-level messages: - Account - ServerConfig - ClientConfig -*/ package socks import proto "github.com/golang/protobuf/proto" diff --git a/proxy/vmess/account.pb.go b/proxy/vmess/account.pb.go index e3f598ca1..d7a0005d5 100644 --- a/proxy/vmess/account.pb.go +++ b/proxy/vmess/account.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/vmess/account.proto -// DO NOT EDIT! - -/* -Package vmess is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/vmess/account.proto - -It has these top-level messages: - Account -*/ package vmess import proto "github.com/golang/protobuf/proto" diff --git a/proxy/vmess/inbound/config.pb.go b/proxy/vmess/inbound/config.pb.go index 377c85e2a..68dae1dea 100644 --- a/proxy/vmess/inbound/config.pb.go +++ b/proxy/vmess/inbound/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/vmess/inbound/config.proto -// DO NOT EDIT! - -/* -Package inbound is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/vmess/inbound/config.proto - -It has these top-level messages: - DetourConfig - DefaultConfig - Config -*/ package inbound import proto "github.com/golang/protobuf/proto" diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go index 712cc7a30..77fd9a765 100644 --- a/proxy/vmess/outbound/config.pb.go +++ b/proxy/vmess/outbound/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/proxy/vmess/outbound/config.proto -// DO NOT EDIT! - -/* -Package outbound is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/proxy/vmess/outbound/config.proto - -It has these top-level messages: - Config -*/ package outbound import proto "github.com/golang/protobuf/proto" diff --git a/tools/genproto/main.go b/tools/genproto/main.go index 1fb9a5eac..9d5fe1047 100644 --- a/tools/genproto/main.go +++ b/tools/genproto/main.go @@ -3,7 +3,9 @@ package main import ( + "bytes" "fmt" + "io/ioutil" "os" "os/exec" "path/filepath" @@ -54,4 +56,35 @@ func main() { fmt.Println(err) } } + + err := filepath.Walk(filepath.Join(gosrc, "v2ray.com", "core"), func(path string, info os.FileInfo, err error) error { + if err != nil { + fmt.Println(err) + return err + } + + if info.IsDir() { + return nil + } + + if !strings.HasSuffix(info.Name(), ".pb.go") { + return nil + } + + content, err := ioutil.ReadFile(path) + if err != nil { + return err + } + pos := bytes.Index(content, []byte("\npackage")) + if pos > 0 { + if err := ioutil.WriteFile(path, content[pos+1:], info.Mode()); err != nil { + return err + } + } + + return nil + }) + if err != nil { + panic(err) + } } diff --git a/tools/geoip/geoip.pb.go b/tools/geoip/geoip.pb.go index cce57a533..d9f46fb30 100644 --- a/tools/geoip/geoip.pb.go +++ b/tools/geoip/geoip.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/tools/geoip/geoip.proto -// DO NOT EDIT! - -/* -Package geoip is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/tools/geoip/geoip.proto - -It has these top-level messages: - CountryIPRange -*/ package geoip import proto "github.com/golang/protobuf/proto" diff --git a/transport/config.pb.go b/transport/config.pb.go index a86e8442e..f3d9018b1 100644 --- a/transport/config.pb.go +++ b/transport/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/config.proto -// DO NOT EDIT! - -/* -Package transport is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/config.proto - -It has these top-level messages: - Config -*/ package transport import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go index 7cff76e39..825ba8ca9 100644 --- a/transport/internet/config.pb.go +++ b/transport/internet/config.pb.go @@ -1,18 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/config.proto -// DO NOT EDIT! - -/* -Package internet is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/config.proto - -It has these top-level messages: - NetworkSettings - StreamConfig - ProxyConfig -*/ package internet import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/headers/http/config.pb.go b/transport/internet/headers/http/config.pb.go index c7ab3dd8f..48775adcb 100644 --- a/transport/internet/headers/http/config.pb.go +++ b/transport/internet/headers/http/config.pb.go @@ -1,22 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/headers/http/config.proto -// DO NOT EDIT! - -/* -Package http is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/headers/http/config.proto - -It has these top-level messages: - Header - Version - Method - RequestConfig - Status - ResponseConfig - Config -*/ package http import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/headers/noop/config.pb.go b/transport/internet/headers/noop/config.pb.go index b88ba2318..c44cf304f 100644 --- a/transport/internet/headers/noop/config.pb.go +++ b/transport/internet/headers/noop/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/headers/noop/config.proto -// DO NOT EDIT! - -/* -Package noop is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/headers/noop/config.proto - -It has these top-level messages: - Config -*/ package noop import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/headers/srtp/config.pb.go b/transport/internet/headers/srtp/config.pb.go index 243776b61..f7ff95baa 100644 --- a/transport/internet/headers/srtp/config.pb.go +++ b/transport/internet/headers/srtp/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/headers/srtp/config.proto -// DO NOT EDIT! - -/* -Package srtp is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/headers/srtp/config.proto - -It has these top-level messages: - Config -*/ package srtp import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/headers/utp/config.pb.go b/transport/internet/headers/utp/config.pb.go index 258f02584..2dea5a128 100644 --- a/transport/internet/headers/utp/config.pb.go +++ b/transport/internet/headers/utp/config.pb.go @@ -1,16 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/headers/utp/config.proto -// DO NOT EDIT! - -/* -Package utp is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/headers/utp/config.proto - -It has these top-level messages: - Config -*/ package utp import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/kcp/config.pb.go b/transport/internet/kcp/config.pb.go index 5cca8d8f3..d64637a89 100644 --- a/transport/internet/kcp/config.pb.go +++ b/transport/internet/kcp/config.pb.go @@ -1,23 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/kcp/config.proto -// DO NOT EDIT! - -/* -Package kcp is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/kcp/config.proto - -It has these top-level messages: - MTU - TTI - UplinkCapacity - DownlinkCapacity - WriteBuffer - ReadBuffer - ConnectionReuse - Config -*/ package kcp import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/tcp/config.pb.go b/transport/internet/tcp/config.pb.go index 35319925f..ccbebd029 100644 --- a/transport/internet/tcp/config.pb.go +++ b/transport/internet/tcp/config.pb.go @@ -1,17 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/tcp/config.proto -// DO NOT EDIT! - -/* -Package tcp is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/tcp/config.proto - -It has these top-level messages: - ConnectionReuse - Config -*/ package tcp import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go index e13efaeeb..b9fa52356 100644 --- a/transport/internet/tls/config.pb.go +++ b/transport/internet/tls/config.pb.go @@ -1,17 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/tls/config.proto -// DO NOT EDIT! - -/* -Package tls is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/tls/config.proto - -It has these top-level messages: - Certificate - Config -*/ package tls import proto "github.com/golang/protobuf/proto" diff --git a/transport/internet/websocket/config.pb.go b/transport/internet/websocket/config.pb.go index 72a1bfeb3..e81729fc8 100644 --- a/transport/internet/websocket/config.pb.go +++ b/transport/internet/websocket/config.pb.go @@ -1,17 +1,3 @@ -// Code generated by protoc-gen-go. -// source: v2ray.com/core/transport/internet/websocket/config.proto -// DO NOT EDIT! - -/* -Package websocket is a generated protocol buffer package. - -It is generated from these files: - v2ray.com/core/transport/internet/websocket/config.proto - -It has these top-level messages: - ConnectionReuse - Config -*/ package websocket import proto "github.com/golang/protobuf/proto"