octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/stun: Inline util.OnDone, comment on its purpose (#7308)

Browse Source 
Co-authored-by: greatroar <@>
This commit is contained in:
greatroar 2021-01-27 19:27:00 +01:00 committed by GitHub
parent e19d6e993d
commit 8b86171642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/stun/stun.go
View File

@ -111,7 +111,12 @@ func (s *Service) Serve(ctx context.Context) error {
s.setExternalAddress(nil, "")
}()
util.OnDone(ctx, func() { _ = s.stunConn.Close() })
// Closing s.stunConn unblocks operations that use the connection
// (Discover, Keepalive) and might otherwise block us from returning.
go func() {
<-ctx.Done()
_ = s.stunConn.Close()
}()
timer := time.NewTimer(time.Millisecond)

8
lib/util/utils.go
View File

@ -250,14 +250,6 @@ func AddressUnspecifiedLess(a, b net.Addr) bool {
return aIsUnspecified
}
// OnDone calls fn when ctx is cancelled.
func OnDone(ctx context.Context, fn func()) {
go func() {
<-ctx.Done()
fn()
}()
}
func CallWithContext(ctx context.Context, fn func() error) error {
var err error
done := make(chan struct{})