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

Code optimization

Browse Source
This commit is contained in:
刘河
2019-03-29 10:41:57 +08:00
parent 4b0aebd6a5
commit cc6d053b6d
32 changed files with 357 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mux/mux.go
View File

@@ -59,16 +59,9 @@ func (s *Mux) NewConn() (*conn, error) {
return nil, errors.New("the mux has closed")
}
conn := NewConn(s.getId(), s)
raw := bytes.NewBuffer([]byte{})
if err := binary.Write(raw, binary.LittleEndian, MUX_NEW_CONN); err != nil {
return nil, err
}
if err := binary.Write(raw, binary.LittleEndian, conn.connId); err != nil {
return nil, err
}
//it must be set before send
s.connMap.Set(conn.connId, conn)
if _, err := s.conn.Write(raw.Bytes()); err != nil {
if err := s.sendInfo(MUX_NEW_CONN, conn.connId, nil); err != nil {
return nil, err
}
//set a timer timeout 30 second

6
lib/mux/mux_test.go
View File

@@ -25,14 +25,14 @@ func TestNewMux(t *testing.T) {
client()
time.Sleep(time.Second * 3)
go func() {
m2 := NewMux(conn2)
m2 := NewMux(conn2, "tcp")
for {
c, err := m2.Accept()
if err != nil {
log.Fatalln(err)
}
go func(c net.Conn) {
c2, err := net.Dial("tcp", "10.1.50.196:4000")
c2, err := net.Dial("tcp", "127.0.0.1:8082")
if err != nil {
log.Fatalln(err)
}
@@ -45,7 +45,7 @@ func TestNewMux(t *testing.T) {
}()
go func() {
m1 := NewMux(conn1)
m1 := NewMux(conn1, "tcp")
l, err := net.Listen("tcp", "127.0.0.1:7777")
if err != nil {
log.Fatalln(err)