mirrors/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-16 02:42:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix panic when using socks5 plugin with encryption and compression, fix #446

Browse Source
This commit is contained in:
fatedier
2018-01-18 00:45:11 +08:00
parent 5b08201e5d
commit 338d5bae37
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
models/plugin/socks5.go
View File

@ -43,16 +43,9 @@ func NewSocks5Plugin(params map[string]string) (p Plugin, err error) {
return
}
func (sp *Socks5Plugin) Handle(conn io.ReadWriteCloser) {
func (sp *Socks5Plugin) Handle(conn io.ReadWriteCloser, realConn frpNet.Conn) {
defer conn.Close()
var wrapConn frpNet.Conn
if realConn, ok := conn.(frpNet.Conn); ok {
wrapConn = realConn
} else {
wrapConn = frpNet.WrapReadWriteCloserToConn(conn, realConn)
}
wrapConn := frpNet.WrapReadWriteCloserToConn(conn, realConn)
sp.Server.ServeConn(wrapConn)
}