lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-06-06 02:59:27 -04:00
Code Issues Releases Wiki Activity

refine app settings in v2ray config

Browse Source
This commit is contained in:
Darien Raymond
2016-10-16 16:04:30 +02:00
parent e33b7df34c
commit e866ff24a4
6 changed files with 129 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
v2ray.go
View File

@@ -4,9 +4,7 @@ import (
"v2ray.com/core/app"
"v2ray.com/core/app/dispatcher"
dispatchers "v2ray.com/core/app/dispatcher/impl"
"v2ray.com/core/app/dns"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/app/router"
"v2ray.com/core/common"
"v2ray.com/core/common/log"
"v2ray.com/core/proxy"
@@ -21,8 +19,7 @@ type Point struct {
outboundHandlers []proxy.OutboundHandler
taggedOutboundHandlers map[string]proxy.OutboundHandler
router *router.Router
space app.Space
space app.Space
}
// NewPoint returns a new Point server based on given configuration.
@@ -38,23 +35,21 @@ func NewPoint(pConfig *Config) (*Point, error) {
return nil, err
}
vpoint.space = app.NewSpace()
space := app.NewSpace()
vpoint.space = space
vpoint.space.BindApp(proxyman.APP_ID_INBOUND_MANAGER, vpoint)
outboundHandlerManager := proxyman.NewDefaultOutboundHandlerManager()
vpoint.space.BindApp(proxyman.APP_ID_OUTBOUND_MANAGER, outboundHandlerManager)
dnsConfig := pConfig.Dns
if dnsConfig != nil {
dnsServer := dns.NewCacheServer(vpoint.space, dnsConfig)
vpoint.space.BindApp(dns.APP_ID, dnsServer)
}
routerConfig := pConfig.Router
if routerConfig != nil {
r := router.NewRouter(routerConfig, vpoint.space)
vpoint.space.BindApp(router.APP_ID, r)
vpoint.router = r
for _, app := range pConfig.App {
settings, err := app.GetInstance()
if err != nil {
return nil, err
}
if err := space.BindFromConfig(app.Type, settings); err != nil {
return nil, err
}
}
vpoint.space.BindApp(dispatcher.APP_ID, dispatchers.NewDefaultDispatcher(vpoint.space))