lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-11 13:39:18 -04:00
Code Issues Releases Wiki Activity

Convert point server config to interface for testibility

Browse Source
This commit is contained in:
V2Ray
2015-09-19 15:07:10 +02:00
parent 76cb92f918
commit 729312f3b5
4 changed files with 88 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
point.go
View File

@@ -1,8 +1,6 @@
package core
import (
"io/ioutil"
"github.com/v2ray/v2ray-core/log"
v2net "github.com/v2ray/v2ray-core/net"
)
@@ -35,36 +33,24 @@ type Point struct {
// NewPoint returns a new Point server based on given configuration.
// The server is not started at this point.
func NewPoint(config Config) (*Point, error) {
func NewPoint(config PointConfig) (*Point, error) {
var vpoint = new(Point)
vpoint.port = config.Port
vpoint.port = config.Port()
ichFactory, ok := inboundFactories[config.InboundConfig.Protocol]
ichFactory, ok := inboundFactories[config.InboundConfig().Protocol()]
if !ok {
panic(log.Error("Unknown inbound connection handler factory %s", config.InboundConfig.Protocol))
panic(log.Error("Unknown inbound connection handler factory %s", config.InboundConfig().Protocol()))
}
vpoint.ichFactory = ichFactory
if len(config.InboundConfig.File) > 0 {
ichConfig, err := ioutil.ReadFile(config.InboundConfig.File)
if err != nil {
panic(log.Error("Unable to read config file %v", err))
}
vpoint.ichConfig = ichConfig
}
vpoint.ichConfig = config.InboundConfig().Content()
ochFactory, ok := outboundFactories[config.OutboundConfig.Protocol]
ochFactory, ok := outboundFactories[config.OutboundConfig().Protocol()]
if !ok {
panic(log.Error("Unknown outbound connection handler factory %s", config.OutboundConfig.Protocol))
panic(log.Error("Unknown outbound connection handler factory %s", config.OutboundConfig().Protocol))
}
vpoint.ochFactory = ochFactory
if len(config.OutboundConfig.File) > 0 {
ochConfig, err := ioutil.ReadFile(config.OutboundConfig.File)
if err != nil {
panic(log.Error("Unable to read config file %v", err))
}
vpoint.ochConfig = ochConfig
}
vpoint.ochConfig = config.OutboundConfig().Content()
return vpoint, nil
}