cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-09-16 18:29:35 +00:00
Code Releases Activity

Fix crash

Browse Source
This commit is contained in:
Neil Alexander 2022-11-12 11:56:50 +00:00
parent 7efd66932f
commit e824c73e21
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/link.go
View File

@ -113,7 +113,9 @@ 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 if errch != nil {
close(errch) // already connected, no error
}
return info, nil return info, nil
} }
options := linkOptions{ options := linkOptions{
@ -122,7 +124,9 @@ 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) if errch != 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
@ -132,7 +136,9 @@ 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) if errch != 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)
@ -208,7 +214,9 @@ func (l *links) call(u *url.URL, sintf string, errch chan<- error) (info linkInf
}() }()
default: default:
close(errch) if errch != nil {
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