protobuf for dokodemo config

common/net/address.go

@@ -188,6 +188,9 @@ func (this *domainAddress) Equals(another Address) bool {
 }
 
 func (this *AddressPB) AsAddress() Address {
+	if this == nil {
+		return nil
+	}
 	switch addr := this.Address.(type) {
 	case *AddressPB_Ip:
 		return IPAddress(addr.Ip)

proxy/dokodemo/config.go

@@ -4,10 +4,6 @@ import (
 	v2net "v2ray.com/core/common/net"
 )
 
-type Config struct {
-	FollowRedirect bool
-	Address        v2net.Address
-	Port           v2net.Port
-	Network        *v2net.NetworkList
-	Timeout        uint32
+func (this *Config) GetPredefinedAddress() v2net.Address {
+	return this.Address.AsAddress()
 }

proxy/dokodemo/config.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package com.v2ray.core.proxy.dokodemo;
+option go_package = "dokodemo";
+
+import "v2ray.com/core/common/net/address.proto";
+import "v2ray.com/core/common/net/network.proto";
+
+message Config {
+  com.v2ray.core.common.net.AddressPB address = 1;
+  uint32 port = 2;
+  com.v2ray.core.common.net.NetworkList network_list = 3;
+  uint32 timeout = 4;
+  bool follow_redirect = 5;
+}

proxy/dokodemo/config_json.go

@@ -23,10 +23,10 @@ func (this *Config) UnmarshalJSON(data []byte) error {
 		return errors.New("Dokodemo: Failed to parse config: " + err.Error())
 	}
 	if rawConfig.Host != nil {
-		this.Address = rawConfig.Host.AsAddress()
+		this.Address = rawConfig.Host
 	}
-	this.Port = rawConfig.PortValue
-	this.Network = rawConfig.NetworkList
+	this.Port = uint32(rawConfig.PortValue)
+	this.NetworkList = rawConfig.NetworkList
 	this.Timeout = rawConfig.TimeoutValue
 	this.FollowRedirect = rawConfig.Redirect
 	return nil

proxy/dokodemo/dokodemo.go

@@ -32,8 +32,8 @@ type DokodemoDoor struct {
 func NewDokodemoDoor(config *Config, space app.Space, meta *proxy.InboundHandlerMeta) *DokodemoDoor {
 	d := &DokodemoDoor{
 		config:  config,
-		address: config.Address,
-		port:    config.Port,
+		address: config.GetPredefinedAddress(),
+		port:    v2net.Port(config.Port),
 		meta:    meta,
 	}
 	space.InitializeApplication(func() error {
@@ -73,13 +73,13 @@ func (this *DokodemoDoor) Start() error {
 	}
 	this.accepting = true
 
-	if this.config.Network.HasNetwork(v2net.Network_TCP) {
+	if this.config.NetworkList.HasNetwork(v2net.Network_TCP) {
 		err := this.ListenTCP()
 		if err != nil {
 			return err
 		}
 	}
-	if this.config.Network.HasNetwork(v2net.Network_UDP) {
+	if this.config.NetworkList.HasNetwork(v2net.Network_UDP) {
 		err := this.ListenUDP()
 		if err != nil {
 			return err

proxy/dokodemo/dokodemo_test.go

@@ -54,10 +54,14 @@ func TestDokodemoTCP(t *testing.T) {
 
 	port := v2net.Port(dice.Roll(20000) + 10000)
 	dokodemo := NewDokodemoDoor(&Config{
-		Address: v2net.LocalHostIP,
-		Port:    tcpServer.Port,
-		Network: v2net.Network_TCP.AsList(),
-		Timeout: 600,
+		Address: &v2net.AddressPB{
+			Address: &v2net.AddressPB_Ip{
+				Ip: v2net.LocalHostIP.IP(),
+			},
+		},
+		Port:        uint32(tcpServer.Port),
+		NetworkList: v2net.Network_TCP.AsList(),
+		Timeout:     600,
 	}, space, &proxy.InboundHandlerMeta{
 		Address: v2net.LocalHostIP,
 		Port:    port,
@@ -124,10 +128,14 @@ func TestDokodemoUDP(t *testing.T) {
 
 	port := v2net.Port(dice.Roll(20000) + 10000)
 	dokodemo := NewDokodemoDoor(&Config{
-		Address: v2net.LocalHostIP,
-		Port:    udpServer.Port,
-		Network: v2net.Network_UDP.AsList(),
-		Timeout: 600,
+		Address: &v2net.AddressPB{
+			Address: &v2net.AddressPB_Ip{
+				Ip: v2net.LocalHostIP.IP(),
+			},
+		},
+		Port:        uint32(udpServer.Port),
+		NetworkList: v2net.Network_UDP.AsList(),
+		Timeout:     600,
 	}, space, &proxy.InboundHandlerMeta{
 		Address: v2net.LocalHostIP,
 		Port:    port,