sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user: fix dup upstream connections due to race

Browse Source 
Closes: https://todo.sr.ht/~emersion/soju/207
This commit is contained in:
Simon Ser 2023-04-05 12:57:42 +02:00
parent 6cfa908f40
commit ac16729f93
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
user.go
View File

@ -227,6 +227,12 @@ func (net *network) runConn(ctx context.Context) error {
} }
defer uc.Close() defer uc.Close()
// The context is cancelled by the caller when the network is stopped.
go func() {
<-ctx.Done()
uc.Close()
}()
if net.user.srv.Identd != nil { if net.user.srv.Identd != nil {
net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User)) net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User))
defer net.user.srv.Identd.Delete(uc.RemoteAddr().String(), uc.LocalAddr().String()) defer net.user.srv.Identd.Delete(uc.RemoteAddr().String(), uc.LocalAddr().String())
@ -239,9 +245,6 @@ func (net *network) runConn(ctx context.Context) error {
return fmt.Errorf("failed to register: %w", err) return fmt.Errorf("failed to register: %w", err)
} }
// TODO: this is racy with net.stopped. If the network is stopped
// before the user goroutine receives eventUpstreamConnected, the
// connection won't be closed.
net.user.events <- eventUpstreamConnected{uc} net.user.events <- eventUpstreamConnected{uc}
defer func() { defer func() {
net.user.events <- eventUpstreamDisconnected{uc} net.user.events <- eventUpstreamDisconnected{uc}
@ -259,6 +262,12 @@ func (net *network) run() {
return return
} }
ctx, cancel := context.WithCancel(context.TODO())
go func() {
<-net.stopped
cancel()
}()
var lastTry time.Time var lastTry time.Time
backoff := newBackoffer(retryConnectMinDelay, retryConnectMaxDelay, retryConnectJitter) backoff := newBackoffer(retryConnectMinDelay, retryConnectMaxDelay, retryConnectJitter)
for { for {
@ -273,7 +282,7 @@ func (net *network) run() {
} }
lastTry = time.Now() lastTry = time.Now()
if err := net.runConn(context.TODO()); err != nil { if err := net.runConn(ctx); err != nil {
text := err.Error() text := err.Error()
temp := true temp := true
var regErr registrationError var regErr registrationError
@ -299,10 +308,6 @@ func (net *network) stop() {
if !net.isStopped() { if !net.isStopped() {
close(net.stopped) close(net.stopped)
} }
if net.conn != nil {
net.conn.Close()
}
} }
func (net *network) detach(ch *database.Channel) { func (net *network) detach(ch *database.Channel) {