github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-09-04 21:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
刘河
2019-11-30 13:13:39 +08:00
parent b6a9001d43 e429b17e63
commit 870287421f
34 changed files with 2415 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/bridge.go
View File

@@ -312,7 +312,7 @@ func (s *Bridge) GetConnByClientId(clientId int) (target net.Conn, err error) {
func (s *Bridge) SendLinkInfo(clientId int, link *conn.Link, t *file.Tunnel) (target net.Conn, err error) {
//if the proxy type is local
if link.LocalProxy {
target, err = net.Dial(link.ConnType, link.Host)
target, err = net.Dial("tcp", link.Host)
return
}
if v, ok := s.Client.Load(clientId); ok {
@@ -504,6 +504,7 @@ loop:
tl.Password = t.Password
tl.LocalPath = t.LocalPath
tl.StripPre = t.StripPre
tl.MultiAccount = t.MultiAccount
if !client.HasTunnel(tl) {
if err := file.GetDb().NewTask(tl); err != nil {
logs.Notice("Add task error ", err.Error())