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

remove json packages in app folder

Browse Source
This commit is contained in:
Darien Raymond
2016-01-17 15:20:49 +00:00
parent 48f1d34ca5
commit ae8121e633
31 changed files with 423 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ package mocks
import (
"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"
@@ -88,7 +87,7 @@ func (this *OutboundDetourConfig) Tag() string {
type Config struct {
PortValue v2net.Port
LogConfigValue *LogConfig
RouterConfigValue *routertesting.RouterConfig
RouterConfigValue *router.Config
InboundConfigValue *ConnectionConfig
OutboundConfigValue *ConnectionConfig
InboundDetoursValue []*InboundDetourConfig
@@ -106,7 +105,7 @@ func (config *Config) LogConfig() point.LogConfig {
return config.LogConfigValue
}
func (this *Config) RouterConfig() router.Config {
func (this *Config) RouterConfig() *router.Config {
if this.RouterConfigValue == nil {
return nil
}