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

correct initialization in socks server

pull/219/head
v2ray 2016-07-23 11:09:49 +02:00
parent 85d6e1ad13
commit 84a7a2ad61
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy/socks/server.go
View File

@ -38,12 +38,20 @@ type Server struct {
} }
// NewServer creates a new Server object. // NewServer creates a new Server object.
func NewServer(config *Config, packetDispatcher dispatcher.PacketDispatcher, meta *proxy.InboundHandlerMeta) *Server { func NewServer(config *Config, space app.Space, meta *proxy.InboundHandlerMeta) *Server {
return &Server{ s := &Server{
config: config, config: config,
packetDispatcher: packetDispatcher,
meta: meta, meta: meta,
} }
space.InitializeApplication(func() error {
if !space.HasApp(dispatcher.APP_ID) {
log.Error("Socks|Server: Dispatcher is not found in the space.")
return app.ErrMissingApplication
}
s.packetDispatcher = space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher)
return nil
})
return s
} }
// Port implements InboundHandler.Port(). // Port implements InboundHandler.Port().
@ -310,13 +318,7 @@ func (this *ServerFactory) StreamCapability() internet.StreamConnectionType {
} }
func (this *ServerFactory) Create(space app.Space, rawConfig interface{}, meta *proxy.InboundHandlerMeta) (proxy.InboundHandler, error) { func (this *ServerFactory) Create(space app.Space, rawConfig interface{}, meta *proxy.InboundHandlerMeta) (proxy.InboundHandler, error) {
if !space.HasApp(dispatcher.APP_ID) { return NewServer(rawConfig.(*Config), space, meta), nil
return nil, internal.ErrBadConfiguration
}
return NewServer(
rawConfig.(*Config),
space.GetApp(dispatcher.APP_ID).(dispatcher.PacketDispatcher),
meta), nil
} }
func init() { func init() {