protogen update

willisworley · Oct 15, 2016 · be02687 · be02687
1 parent 348893a
commit be02687
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 130 deletions.
diff --git a/app/dns/config.pb.go b/app/dns/config.pb.go
diff --git a/common/net/port.pb.go b/common/net/port.pb.go
diff --git a/proxy/blackhole/config.pb.go b/proxy/blackhole/config.pb.go
diff --git a/proxy/blackhole/config.proto b/proxy/blackhole/config.proto
@@ -5,25 +5,14 @@ option go_package = "blackhole";
 option java_package = "com.v2ray.core.proxy.blackhole";
 option java_outer_classname = "ConfigProto";
 
-import "google/protobuf/any.proto";
+import "v2ray.com/core/common/loader/type.proto";
 
 message NoneResponse {
-
 }
 
 message HTTPResponse {
-
-}
-
-message Response {
-  enum Type {
-    None = 0;
-    HTTP = 1;
-  }
-  Type type = 1;
-  google.protobuf.Any settings = 2;
 }
 
 message Config {
-  Response response = 1;
+  v2ray.core.common.loader.TypedSettings response = 1;
 }
diff --git a/proxy/vmess/outbound/config.pb.go b/proxy/vmess/outbound/config.pb.go
diff --git a/tools/release/proto-gen.sh b/tools/release/proto-gen.sh
@@ -5,7 +5,7 @@ for DIR in $(find ./v2ray.com/core -type d -not -path "*.git*"); do
   TEST_FILES=($DIR/*.proto)
   #echo ${TEST_FILES}
   if [ -f ${TEST_FILES[0]} ]; then
-    protoc --proto_path=. --proto_path=./github.com/google/protobuf/src --go_out=. $DIR/*.proto
+    protoc --proto_path=. --go_out=. $DIR/*.proto
   fi
 done
 popd
diff --git a/transport/internet/tls/config.pb.go b/transport/internet/tls/config.pb.go