tunnel: fix panic on send to closed writeCh during disconnect
When the server disconnects, Close() was closing both stopCh and writeCh. The TAP→Server goroutine could race and send to the closed writeCh, causing a panic. Fix: don't close writeCh in Close(), let writeLoop exit via stopCh instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
51824b830e
commit
3bafe683cb
1 changed files with 10 additions and 7 deletions
|
|
@ -50,20 +50,23 @@ func NewTunnel(sess *Session) *Tunnel {
|
||||||
// writeLoop is the single goroutine that writes to the connection.
|
// writeLoop is the single goroutine that writes to the connection.
|
||||||
// All writes are serialized through writeCh — no mutex needed.
|
// All writes are serialized through writeCh — no mutex needed.
|
||||||
func (t *Tunnel) writeLoop() {
|
func (t *Tunnel) writeLoop() {
|
||||||
for buf := range t.writeCh {
|
for {
|
||||||
|
select {
|
||||||
|
case buf := <-t.writeCh:
|
||||||
if _, err := t.sess.Conn.Write(buf); err != nil {
|
if _, err := t.sess.Conn.Write(buf); err != nil {
|
||||||
t.writeErr = err
|
t.writeErr = err
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case <-t.stopCh:
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close stops the keepalive goroutine and closes the underlying connection.
|
// Close stops the keepalive goroutine and closes the underlying connection.
|
||||||
|
// The writeCh is not closed here — writeLoop exits when the connection write fails.
|
||||||
func (t *Tunnel) Close() error {
|
func (t *Tunnel) Close() error {
|
||||||
t.stopped.Do(func() {
|
t.stopped.Do(func() { close(t.stopCh) })
|
||||||
close(t.stopCh)
|
|
||||||
close(t.writeCh)
|
|
||||||
})
|
|
||||||
return t.sess.Conn.Close()
|
return t.sess.Conn.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue