cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-12-23 11:05:40 +00:00
Code Releases Activity

Fix con urrent map accesses

Browse Source
This commit is contained in:
Neil Alexander 2023-05-20 18:21:02 +01:00
parent e290e744f4
commit 6e338b6f89
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/link.go
View File

@ -152,7 +152,12 @@ func (l *links) add(u *url.URL, sintf string, linkType linkType) error {
sintf: sintf, sintf: sintf,
linkType: linkType, linkType: linkType,
} }
if state, ok := l._links[info]; ok { var state *link
var ok bool
phony.Block(l, func() {
state, ok = l._links[info]
})
if ok && state != nil {
select { select {
case state.kick <- struct{}{}: case state.kick <- struct{}{}:
default: default:
@ -164,7 +169,7 @@ func (l *links) add(u *url.URL, sintf string, linkType linkType) error {
// in progress (if any), any error details and a context that // in progress (if any), any error details and a context that
// lets the link be cancelled later. // lets the link be cancelled later.
ctx, cancel := context.WithCancel(l.core.ctx) ctx, cancel := context.WithCancel(l.core.ctx)
state := &link{ state = &link{
info: info, info: info,
linkProto: strings.ToUpper(u.Scheme), linkProto: strings.ToUpper(u.Scheme),
ctx: ctx, ctx: ctx,
@ -327,8 +332,12 @@ func (l *links) listen(u *url.URL, sintf string) (*Listener, error) {
_ = conn.Close() _ = conn.Close()
continue continue
} }
state := l._links[info] var state *link
if state == nil { var ok bool
phony.Block(l, func() {
state = l._links[info]
})
if !ok || state == nil {
state = &link{ state = &link{
info: info, info: info,
} }