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

New functions

Browse Source
This commit is contained in:
刘河
2019-02-24 13:17:43 +08:00
parent 750ecb824a
commit db43405237
20 changed files with 287 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/conn/conn.go
View File

@@ -7,7 +7,6 @@ import (
"errors"
"github.com/cnlh/nps/lib/common"
"github.com/cnlh/nps/lib/config"
"github.com/cnlh/nps/lib/crypt"
"github.com/cnlh/nps/lib/file"
"github.com/cnlh/nps/lib/pool"
"github.com/cnlh/nps/lib/rate"
@@ -347,7 +346,7 @@ func (s *Conn) GetConfigInfo() (c *file.Client, err error) {
return
} else {
arr := strings.Split(string(b), common.CONN_DATA_SEQ)
c = file.NewClient(crypt.GetRandomString(16), true, false)
c = file.NewClient("", true, false)
c.Cnf.U = arr[0]
c.Cnf.P = arr[1]
c.Cnf.Crypt = common.GetBoolByStr(arr[2])

4
lib/conn/link.go
View File

@@ -35,6 +35,7 @@ type Link struct {
MsgCh chan []byte
MsgConn *Conn
StatusCh chan bool
FinishUse bool
}
func NewLink(id int, connType string, host string, en, de int, crypt bool, c *Conn, flow *file.Flow, udpListener *net.UDPConn, rate *rate.Rate, UdpRemoteAddr *net.UDPAddr) *Link {
@@ -61,6 +62,7 @@ func (s *Link) Run(flow bool) {
select {
case content := <-s.MsgCh:
if len(content) == len(common.IO_EOF) && string(content) == common.IO_EOF {
s.FinishUse = true
if s.Conn != nil {
s.Conn.Close()
}
@@ -81,8 +83,8 @@ func (s *Link) Run(flow bool) {
return
}
s.MsgConn.WriteWriteSuccess(s.Id)
pool.PutBufPoolCopy(content)
}
pool.PutBufPoolCopy(content)
}
}
}()