protobuf for kcp config

proxy/blackhole/config_json.go

@@ -21,9 +21,10 @@ func (this *Config) UnmarshalJSON(data []byte) error {
 
 	this.Response = new(NoneResponse)
 	if jsonConfig.Response != nil {
-		loader := loader.NewJSONConfigLoader(loader.ConfigCreatorCache{}, "type", "")
-		loader.RegisterCreator("none", func() interface{} { return new(NoneResponse) })
-		loader.RegisterCreator("http", func() interface{} { return new(HTTPResponse) })
+		cache := loader.ConfigCreatorCache{}
+		loader := loader.NewJSONConfigLoader(cache, "type", "")
+		cache.RegisterCreator("none", func() interface{} { return new(NoneResponse) })
+		cache.RegisterCreator("http", func() interface{} { return new(HTTPResponse) })
 		response, _, err := loader.Load(jsonConfig.Response)
 		if err != nil {
 			return errors.New("Blackhole: Failed to parse response config: " + err.Error())

proxy/registry/config_cache.go

@@ -3,16 +3,19 @@ package registry
 import "v2ray.com/core/common/loader"
 
 var (
-	inboundConfigCache  loader.ConfigLoader
-	outboundConfigCache loader.ConfigLoader
+	inboundConfigCreatorCache = loader.ConfigCreatorCache{}
+	inboundConfigCache        loader.ConfigLoader
+
+	outboundConfigCreatorCache = loader.ConfigCreatorCache{}
+	outboundConfigCache        loader.ConfigLoader
 )
 
 func RegisterInboundConfig(protocol string, creator loader.ConfigCreator) error {
-	return inboundConfigCache.RegisterCreator(protocol, creator)
+	return inboundConfigCreatorCache.RegisterCreator(protocol, creator)
 }
 
 func RegisterOutboundConfig(protocol string, creator loader.ConfigCreator) error {
-	return outboundConfigCache.RegisterCreator(protocol, creator)
+	return outboundConfigCreatorCache.RegisterCreator(protocol, creator)
 }
 
 func CreateInboundConfig(protocol string, data []byte) (interface{}, error) {

proxy/registry/config_cache_json.go

@@ -7,6 +7,6 @@ import (
 )
 
 func init() {
-	inboundConfigCache = loader.NewJSONConfigLoader(loader.ConfigCreatorCache{}, "protocol", "settings")
-	outboundConfigCache = loader.NewJSONConfigLoader(loader.ConfigCreatorCache{}, "protocol", "settings")
+	inboundConfigCache = loader.NewJSONConfigLoader(inboundConfigCreatorCache, "protocol", "settings")
+	outboundConfigCache = loader.NewJSONConfigLoader(outboundConfigCreatorCache, "protocol", "settings")
 }

transport/internet/authenticator.go

@@ -1,8 +1,14 @@
 package internet
 
 import (
+	"errors"
+
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/alloc"
+	"v2ray.com/core/common/loader"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes"
 )
 
 type Authenticator interface {
@@ -12,14 +18,39 @@ type Authenticator interface {
 }
 
 type AuthenticatorFactory interface {
-	Create(AuthenticatorConfig) Authenticator
+	Create(interface{}) Authenticator
+}
+
+func (this *AuthenticatorConfig) GetInternalConfig() (interface{}, error) {
+	return configCache.CreateConfig(this.Name)
 }
 
-type AuthenticatorConfig interface {
+func NewAuthenticatorConfig(name string, config interface{}) (*AuthenticatorConfig, error) {
+	pbMsg, ok := config.(proto.Message)
+	if !ok {
+		return nil, errors.New("Internet|Authenticator: Failed to convert config into proto message.")
+	}
+	anyConfig, err := ptypes.MarshalAny(pbMsg)
+	if err != nil {
+		return nil, err
+	}
+	return &AuthenticatorConfig{
+		Name:     name,
+		Settings: anyConfig,
+	}, nil
+}
+
+func (this *AuthenticatorConfig) CreateAuthenticator() (Authenticator, error) {
+	config, err := this.GetInternalConfig()
+	if err != nil {
+		return nil, err
+	}
+	return CreateAuthenticator(this.Name, config)
 }
 
 var (
 	authenticatorCache = make(map[string]AuthenticatorFactory)
+	configCache        = loader.ConfigCreatorCache{}
 )
 
 func RegisterAuthenticator(name string, factory AuthenticatorFactory) error {
@@ -30,7 +61,11 @@ func RegisterAuthenticator(name string, factory AuthenticatorFactory) error {
 	return nil
 }
 
-func CreateAuthenticator(name string, config AuthenticatorConfig) (Authenticator, error) {
+func RegisterAuthenticatorConfig(name string, configCreator loader.ConfigCreator) error {
+	return configCache.RegisterCreator(name, configCreator)
+}
+
+func CreateAuthenticator(name string, config interface{}) (Authenticator, error) {
 	factory, found := authenticatorCache[name]
 	if !found {
 		return nil, common.ErrObjectNotFound

transport/internet/authenticator.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package com.v2ray.core.transport.internet;
+option go_package = "internet";
+
+import "google/protobuf/any.proto";
+
+message AuthenticatorConfig {
+  string name = 1;
+  google.protobuf.Any settings = 2;
+}

transport/internet/authenticator_json.go

@@ -7,13 +7,13 @@ import (
 )
 
 func CreateAuthenticatorConfig(rawConfig []byte) (string, interface{}, error) {
-	config, name, err := configCache.Load(rawConfig)
+	config, name, err := configLoader.Load(rawConfig)
 	if err != nil {
 		return name, nil, err
 	}
 	return name, config, nil
 }
 
-func init() {
-	configCache = loader.NewJSONConfigLoader(loader.ConfigCreatorCache{}, "type", "")
-}
+var (
+	configLoader = loader.NewJSONConfigLoader(loader.ConfigCreatorCache{}, "type", "")
+)

transport/internet/authenticators/noop/config.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+package com.v2ray.core.transport.internet.authenticators.noop;
+option go_package = "noop";
+
+message Config {}

transport/internet/authenticators/noop/noop.go

@@ -17,12 +17,11 @@ func (this NoOpAuthenticator) Seal(payload *alloc.Buffer) {}
 
 type NoOpAuthenticatorFactory struct{}
 
-func (this NoOpAuthenticatorFactory) Create(config internet.AuthenticatorConfig) internet.Authenticator {
+func (this NoOpAuthenticatorFactory) Create(config interface{}) internet.Authenticator {
 	return NoOpAuthenticator{}
 }
 
-type NoOpAuthenticatorConfig struct{}
-
 func init() {
 	internet.RegisterAuthenticator("none", NoOpAuthenticatorFactory{})
+	internet.RegisterAuthenticatorConfig("none", func() interface{} { return &Config{} })
 }

transport/internet/authenticators/srtp/config.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package com.v2ray.core.transport.internet.authenticators.srtp;
+option go_package = "srtp";
+
+message Config {
+  uint32 version = 1;
+	bool padding = 2;
+	bool extension   = 3;
+	uint32 csrc_count = 4;
+	bool marker     = 5;
+	uint32 payload_type = 6;
+}