github
/
nps
mirror of https://github.com/ehang-io/nps
1
0
Fork 0
Code Issues Releases Wiki Activity

https crypt bug

pull/103/head
刘河 2019-03-25 20:40:22 +08:00
parent ec9439564e
commit 2a5a45a700
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client.go
View File

@ -208,7 +208,7 @@ func (s *TRPClient) srcProcess(src net.Conn) {
src.Close() src.Close()
} else { } else {
logs.Trace("new %s connection with the goal of %s, remote address:%s", lk.ConnType, lk.Host, lk.RemoteAddr) logs.Trace("new %s connection with the goal of %s, remote address:%s", lk.ConnType, lk.Host, lk.RemoteAddr)
conn.CopyWaitGroup(src, targetConn, lk.Crypt, lk.Compress, nil, nil, false) conn.CopyWaitGroup(src, targetConn, lk.Crypt, lk.Compress, nil, nil, false, nil)
} }
} }

6
client/local.go
View File

@ -70,7 +70,7 @@ func processSecret(localTcpConn net.Conn, config *config.CommonConfig, l *config
logs.Error("Local connection server failed ", err.Error()) logs.Error("Local connection server failed ", err.Error())
return return
} }
conn.CopyWaitGroup(remoteConn.Conn, localTcpConn, false, false, nil, nil, false) conn.CopyWaitGroup(remoteConn.Conn, localTcpConn, false, false, nil, nil, false, nil)
} }
func processP2P(localTcpConn net.Conn, config *config.CommonConfig, l *config.LocalServer) { func processP2P(localTcpConn net.Conn, config *config.CommonConfig, l *config.LocalServer) {
@ -91,7 +91,7 @@ func processP2P(localTcpConn net.Conn, config *config.CommonConfig, l *config.Lo
logs.Error(err) logs.Error(err)
return return
} }
conn.CopyWaitGroup(nowConn, localTcpConn, config.Cnf.Crypt, config.Cnf.Compress, nil, nil, false) conn.CopyWaitGroup(nowConn, localTcpConn, config.Cnf.Crypt, config.Cnf.Compress, nil, nil, false, nil)
} }
func newUdpConn(config *config.CommonConfig, l *config.LocalServer) { func newUdpConn(config *config.CommonConfig, l *config.LocalServer) {
@ -124,11 +124,11 @@ func newUdpConn(config *config.CommonConfig, l *config.LocalServer) {
return return
} }
localKcpConn, err := kcp.NewConn(string(rAddr), nil, 150, 3, localConn) localKcpConn, err := kcp.NewConn(string(rAddr), nil, 150, 3, localConn)
conn.SetUdpSession(localKcpConn)
if err != nil { if err != nil {
logs.Error(err) logs.Error(err)
return return
} }
conn.SetUdpSession(localKcpConn)
//写入密钥、provider身份 //写入密钥、provider身份
if _, err := localKcpConn.Write([]byte(crypt.Md5(l.Password))); err != nil { if _, err := localKcpConn.Write([]byte(crypt.Md5(l.Password))); err != nil {
logs.Error(err) logs.Error(err)