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

simplify router config

Browse Source
This commit is contained in:
v2ray
2015-12-07 22:47:47 +01:00
parent a7c2425c9c
commit aab774e78f
19 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/point/testing/mocks/config.go
View File

@@ -1,8 +1,8 @@
package mocks
import (
routerconfig "github.com/v2ray/v2ray-core/app/router/config"
routertestingconfig "github.com/v2ray/v2ray-core/app/router/config/testing"
"github.com/v2ray/v2ray-core/app/router"
routertesting "github.com/v2ray/v2ray-core/app/router/testing"
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/shell/point"
@@ -73,7 +73,7 @@ func (this *OutboundDetourConfig) Tag() string {
type Config struct {
PortValue v2net.Port
LogConfigValue *LogConfig
RouterConfigValue *routertestingconfig.RouterConfig
RouterConfigValue *routertesting.RouterConfig
InboundConfigValue *ConnectionConfig
OutboundConfigValue *ConnectionConfig
InboundDetoursValue []*InboundDetourConfig
@@ -91,7 +91,7 @@ func (config *Config) LogConfig() point.LogConfig {
return config.LogConfigValue
}
func (this *Config) RouterConfig() routerconfig.RouterConfig {
func (this *Config) RouterConfig() router.RouterConfig {
if this.RouterConfigValue == nil {
return nil
}