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

小bug

Browse Source
This commit is contained in:
刘河 2019-01-10 21:40:57 +08:00
parent 61768ae0aa
commit f3435ebd40
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/server.go
View File

@ -157,7 +157,8 @@ func InitCsvDb() *Csv {
//get key by host from x //get key by host from x
func GetKeyByHost(host string) (h *HostList, t *ServerConfig, err error) { func GetKeyByHost(host string) (h *HostList, t *ServerConfig, err error) {
for _, v := range CsvDb.Hosts { for _, v := range CsvDb.Hosts {
if strings.Contains(host, v.Host) { s := strings.Split(host, ":")
if s[0] == v.Host {
h = v h = v
t, err = CsvDb.GetTask(v.Vkey) t, err = CsvDb.GetTask(v.Vkey)
return return

5
server/tcp.go
View File

@ -63,6 +63,7 @@ func (s *TunnelModeServer) auth(r *http.Request, c *utils.Conn, u, p string) err
//与客户端建立通道 //与客户端建立通道
func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr string, method string, rb []byte) error { func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr string, method string, rb []byte) error {
reGet:
link, err := s.bridge.GetTunnel(getverifyval(cnf.VerifyKey), cnf.CompressEncode, cnf.CompressDecode, cnf.Crypt, cnf.Mux) link, err := s.bridge.GetTunnel(getverifyval(cnf.VerifyKey), cnf.CompressEncode, cnf.CompressDecode, cnf.Crypt, cnf.Mux)
defer func() { defer func() {
if cnf.Mux { if cnf.Mux {
@ -72,7 +73,7 @@ func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr str
} }
}() }()
if err != nil { if err != nil {
log.Println(err) log.Println("conn to client error:", err)
c.Close() c.Close()
return err return err
} }
@ -80,7 +81,7 @@ func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr str
c.Close() c.Close()
link.Close() link.Close()
log.Println(err) log.Println(err)
return err goto reGet
} }
if flag, err := link.ReadFlag(); err == nil { if flag, err := link.ReadFlag(); err == nil {
if flag == utils.CONN_SUCCESS { if flag == utils.CONN_SUCCESS {