github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

rename

pull/467/head^2
Darien Raymond 2017-02-01 23:05:27 +01:00
parent c8f48fde4d
commit 815e13f302
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
v2ray.go
View File

@ -18,19 +18,19 @@ type Point struct {
// NewPoint returns a new Point server based on given configuration. // NewPoint returns a new Point server based on given configuration.
// The server is not started at this point. // The server is not started at this point.
func NewPoint(pConfig *Config) (*Point, error) { func NewPoint(config *Config) (*Point, error) {
var vpoint = new(Point) var pt = new(Point)
if err := pConfig.Transport.Apply(); err != nil { if err := config.Transport.Apply(); err != nil {
return nil, err return nil, err
} }
space := app.NewSpace() space := app.NewSpace()
ctx := app.ContextWithSpace(context.Background(), space) ctx := app.ContextWithSpace(context.Background(), space)
vpoint.space = space pt.space = space
for _, appSettings := range pConfig.App { for _, appSettings := range config.App {
settings, err := appSettings.GetInstance() settings, err := appSettings.GetInstance()
if err != nil { if err != nil {
return nil, err return nil, err
@ -102,23 +102,23 @@ func NewPoint(pConfig *Config) (*Point, error) {
disp = d.(dispatcher.Interface) disp = d.(dispatcher.Interface)
} }
for _, inbound := range pConfig.Inbound { for _, inbound := range config.Inbound {
if err := inboundHandlerManager.AddHandler(ctx, inbound); err != nil { if err := inboundHandlerManager.AddHandler(ctx, inbound); err != nil {
return nil, err return nil, err
} }
} }
for _, outbound := range pConfig.Outbound { for _, outbound := range config.Outbound {
if err := outboundHandlerManager.AddHandler(ctx, outbound); err != nil { if err := outboundHandlerManager.AddHandler(ctx, outbound); err != nil {
return nil, err return nil, err
} }
} }
if err := vpoint.space.Initialize(); err != nil { if err := pt.space.Initialize(); err != nil {
return nil, err return nil, err
} }
return vpoint, nil return pt, nil
} }
func (v *Point) Close() { func (v *Point) Close() {