forked from panjf2000/gnet
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
修复windows中,releaseTCP回收后,还在read导致nil的问题
- Loading branch information
Showing
6 changed files
with
341 additions
and
351 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,65 +1,65 @@ | ||
// Copyright 2019 Andy Pan. All rights reserved. | ||
// Copyright 2018 Joshua J Baker. All rights reserved. | ||
// Use of this source code is governed by an MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
//go:build windows | ||
// +build windows | ||
|
||
package gnet | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/luyu6056/tls" | ||
) | ||
|
||
func (svr *server) listenerRun() { | ||
var err error | ||
defer func() { svr.signalShutdown(err) }() | ||
var packet [0x10000]byte | ||
for { | ||
if svr.ln.pconn != nil { | ||
// Read data from UDP socket. | ||
n, addr, e := svr.ln.pconn.ReadFrom(packet[:]) | ||
if e != nil { | ||
err = e | ||
return | ||
} | ||
el := svr.subLoopGroup.next() | ||
c := newUDPConn(el, svr.ln.lnaddr, addr) | ||
c.inboundBuffer.Write(packet[:n]) | ||
el.ch <- &udpIn{c} | ||
} else { | ||
// Accept TCP socket. | ||
conn, e := svr.ln.ln.Accept() | ||
if e != nil { | ||
err = e | ||
return | ||
} | ||
el := svr.subLoopGroup.next() | ||
c := newTCPConn(conn, el) | ||
if svr.tlsconfig != nil { | ||
if err = c.UpgradeTls(svr.tlsconfig); err != nil { | ||
return | ||
} | ||
} | ||
el.ch <- c | ||
go func() { | ||
var packet = make([]byte, 0x10000) | ||
for { | ||
n, err := c.conn.Read(packet) | ||
if err != nil { | ||
_ = c.conn.SetReadDeadline(time.Time{}) | ||
el.ch <- &stderr{c, err} | ||
return | ||
} | ||
|
||
msg := msgbufpool.Get().(*tls.MsgBuffer) | ||
msg.Write(packet[:n]) | ||
el.ch <- &tcpIn{c, msg} | ||
} | ||
}() | ||
} | ||
} | ||
} | ||
// Copyright 2019 Andy Pan. All rights reserved. | ||
// Copyright 2018 Joshua J Baker. All rights reserved. | ||
// Use of this source code is governed by an MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
//go:build windows | ||
// +build windows | ||
|
||
package gnet | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/luyu6056/tls" | ||
) | ||
|
||
func (svr *server) listenerRun() { | ||
var err error | ||
defer func() { svr.signalShutdown(err) }() | ||
var packet [0x10000]byte | ||
for { | ||
if svr.ln.pconn != nil { | ||
// Read data from UDP socket. | ||
n, addr, e := svr.ln.pconn.ReadFrom(packet[:]) | ||
if e != nil { | ||
err = e | ||
return | ||
} | ||
el := svr.subLoopGroup.next() | ||
c := newUDPConn(el, svr.ln.lnaddr, addr) | ||
c.inboundBuffer.Write(packet[:n]) | ||
el.ch <- &udpIn{c} | ||
} else { | ||
// Accept TCP socket. | ||
conn, e := svr.ln.ln.Accept() | ||
if e != nil { | ||
err = e | ||
return | ||
} | ||
el := svr.subLoopGroup.next() | ||
c := newTCPConn(conn, el) | ||
if svr.tlsconfig != nil { | ||
if err = c.UpgradeTls(svr.tlsconfig); err != nil { | ||
return | ||
} | ||
} | ||
el.ch <- c | ||
go func() { | ||
var packet = make([]byte, 0x10000) | ||
for { | ||
n, err := c.conn.Read(packet) | ||
if err != nil { | ||
_ = c.conn.SetReadDeadline(time.Time{}) | ||
el.ch <- tcpClose{c, err} | ||
return | ||
} | ||
|
||
msg := msgbufpool.Get().(*tls.MsgBuffer) | ||
msg.Write(packet[:n]) | ||
el.ch <- &tcpIn{c, msg} | ||
} | ||
}() | ||
} | ||
} | ||
} |
Oops, something went wrong.