yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-29 14:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close errch in early error or already-connected conditions

Browse source
This commit is contained in:
Neil Alexander 2022-11-12 11:27:25 +00:00
parent df75a3a4fe
commit 7f73c0342e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/link.go
View file

@ -113,6 +113,7 @@ func (l *links) isConnectedTo(info linkInfo) bool {
func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInfo, err error) { func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInfo, err error) {
info = linkInfoFor(u.Scheme, sintf, u.Host) info = linkInfoFor(u.Scheme, sintf, u.Host)
if l.isConnectedTo(info) { if l.isConnectedTo(info) {
close(errch) // already connected, no error
return info, nil return info, nil
} }
options := linkOptions{ options := linkOptions{
@ -121,6 +122,7 @@ func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInf
for _, pubkey := range u.Query()["key"] { for _, pubkey := range u.Query()["key"] {
sigPub, err := hex.DecodeString(pubkey) sigPub, err := hex.DecodeString(pubkey)
if err != nil { if err != nil {
close(errch)
return info, fmt.Errorf("pinned key contains invalid hex characters") return info, fmt.Errorf("pinned key contains invalid hex characters")
} }
var sigPubKey keyArray var sigPubKey keyArray
@ -130,6 +132,7 @@ func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInf
if p := u.Query().Get("priority"); p != "" { if p := u.Query().Get("priority"); p != "" {
pi, err := strconv.ParseUint(p, 10, 8) pi, err := strconv.ParseUint(p, 10, 8)
if err != nil { if err != nil {
close(errch)
return info, fmt.Errorf("priority invalid: %w", err) return info, fmt.Errorf("priority invalid: %w", err)
} }
options.priority = uint8(pi) options.priority = uint8(pi)
@ -205,6 +208,7 @@ func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInf
}() }()
default: default:
close(errch)
return info, errors.New("unknown call scheme: " + u.Scheme) return info, errors.New("unknown call scheme: " + u.Scheme)
} }
return info, nil return info, nil