lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-25 15:09:09 -04:00
Code Issues Releases Wiki Activity

move network to net

Browse Source
This commit is contained in:
v2ray
2016-01-15 14:34:33 +01:00
parent 393a64820f
commit a403859105
7 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/dokodemo/config.go
View File

@@ -7,6 +7,6 @@ import (
type Config struct {
Address v2net.Address
Port v2net.Port
Network v2net.NetworkList
Network *v2net.NetworkList
Timeout int
}

9
proxy/dokodemo/config_json.go
View File

@@ -6,7 +6,6 @@ import (
"encoding/json"
v2net "github.com/v2ray/v2ray-core/common/net"
v2netjson "github.com/v2ray/v2ray-core/common/net/json"
"github.com/v2ray/v2ray-core/proxy/internal/config"
)
@@ -14,10 +13,10 @@ func init() {
config.RegisterInboundConnectionConfig("dokodemo-door",
func(data []byte) (interface{}, error) {
type DokodemoConfig struct {
Host *v2net.AddressJson `json:"address"`
PortValue v2net.Port `json:"port"`
NetworkList *v2netjson.NetworkList `json:"network"`
TimeoutValue int `json:"timeout"`
Host *v2net.AddressJson `json:"address"`
PortValue v2net.Port `json:"port"`
NetworkList *v2net.NetworkList `json:"network"`
TimeoutValue int `json:"timeout"`
}
rawConfig := new(DokodemoConfig)
if err := json.Unmarshal(data, rawConfig); err != nil {