lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 14:05:26 -05:00
Code Issues Releases Wiki Activity

configuration for connection reuse

Browse Source
This commit is contained in:
v2ray
2016-06-02 01:49:25 +02:00
parent 6ce7b1d532
commit a86cd36ad2
9 changed files with 124 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/point/config_json.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/v2ray/v2ray-core/app/router"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/transport"
)
const (
@@ -30,6 +31,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
OutboundConfig *ConnectionConfig `json:"outbound"`
InboundDetours []*InboundDetourConfig `json:"inboundDetour"`
OutboundDetours []*OutboundDetourConfig `json:"outboundDetour"`
Transport *transport.Config `json:"transport"`
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
@@ -57,6 +59,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
}
}
this.DNSConfig = jsonConfig.DNSConfig
this.TransportConfig = jsonConfig.Transport
return nil
}