lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-04 00:05:21 -05:00
Code Issues Releases Wiki Activity

refine shadowsocks proto

Browse Source
This commit is contained in:
Darien Raymond
2016-09-25 22:07:32 +02:00
parent 5e9017720e
commit ce5bc72f0c
5 changed files with 117 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/shadowsocks/server.go
View File

@@ -23,7 +23,7 @@ import (
type Server struct {
packetDispatcher dispatcher.PacketDispatcher
config *Config
config *ServerConfig
cipher Cipher
cipherKey []byte
meta *proxy.InboundHandlerMeta
@@ -33,7 +33,7 @@ type Server struct {
udpServer *udp.UDPServer
}
func NewServer(config *Config, space app.Space, meta *proxy.InboundHandlerMeta) (*Server, error) {
func NewServer(config *ServerConfig, space app.Space, meta *proxy.InboundHandlerMeta) (*Server, error) {
if config.GetUser() == nil {
return nil, protocol.ErrUserMissing
}
@@ -41,7 +41,7 @@ func NewServer(config *Config, space app.Space, meta *proxy.InboundHandlerMeta)
if _, err := config.GetUser().GetTypedAccount(account); err != nil {
return nil, err
}
cipher := config.GetCipher()
cipher := account.GetCipher()
s := &Server{
config: config,
meta: meta,
@@ -283,7 +283,7 @@ func (this *ServerFactory) Create(space app.Space, rawConfig interface{}, meta *
if !space.HasApp(dispatcher.APP_ID) {
return nil, common.ErrBadConfiguration
}
return NewServer(rawConfig.(*Config), space, meta)
return NewServer(rawConfig.(*ServerConfig), space, meta)
}
func init() {