config loader

config.go

@@ -1,9 +1,6 @@
 package core
 
 import (
-	"io"
-
-	"v2ray.com/core/common"
 	"v2ray.com/core/proxy/registry"
 )
 
@@ -31,16 +28,3 @@ func (this *InboundConnectionConfig) GetAllocationStrategyValue() *AllocationStr
 func (this *InboundConnectionConfig) GetTypedSettings() (interface{}, error) {
 	return registry.MarshalInboundConfig(this.Protocol, this.Settings)
 }
-
-type ConfigLoader func(input io.Reader) (*Config, error)
-
-var (
-	configLoader ConfigLoader
-)
-
-func LoadConfig(input io.Reader) (*Config, error) {
-	if configLoader == nil {
-		return nil, common.ErrBadConfiguration
-	}
-	return configLoader(input)
-}

config.proto

@@ -15,6 +15,11 @@ import "v2ray.com/core/transport/config.proto";
 
 import "google/protobuf/any.proto";
 
+enum ConfigFormat {
+  Protobuf = 0;
+  JSON = 1;
+}
+
 message AllocationStrategyConcurrency {
   uint32 value = 1;
 }

config_loader.go

@@ -0,0 +1,36 @@
+package core
+
+import (
+	"io"
+	"io/ioutil"
+
+	"v2ray.com/core/common"
+
+	"github.com/golang/protobuf/proto"
+)
+
+type ConfigLoader func(input io.Reader) (*Config, error)
+
+var configLoaderCache map[ConfigFormat]ConfigLoader
+
+func RegisterConfigLoader(format ConfigFormat, loader ConfigLoader) error {
+	configLoaderCache[format] = loader
+	return nil
+}
+
+func LoadConfig(format ConfigFormat, input io.Reader) (*Config, error) {
+	loader, found := configLoaderCache[format]
+	if !found {
+		return nil, common.ErrBadConfiguration
+	}
+	return loader(input)
+}
+
+func LoadProtobufConfig(input io.Reader) (*Config, error) {
+	config := new(Config)
+	data, _ := ioutil.ReadAll(input)
+	if err := proto.Unmarshal(data, config); err != nil {
+		return nil, err
+	}
+	return config, nil
+}