cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 02:30:31 +00:00
Code Releases Activity

Silence error when reconnecting to already connected peer

Browse Source
This commit is contained in:
Neil Alexander 2022-09-24 13:46:22 +01:00
parent 5ad8c33d26
commit 0abfe78858
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/link.go
View File

@ -113,17 +113,19 @@ func (l *links) isConnectedTo(info linkInfo) bool {
func (l *links) call(u *url.URL, sintf string) error { func (l *links) call(u *url.URL, sintf string) error {
info := linkInfoFor(u.Scheme, sintf, u.Host) info := linkInfoFor(u.Scheme, sintf, u.Host)
if l.isConnectedTo(info) { if l.isConnectedTo(info) {
return fmt.Errorf("already connected to this node") return nil
} }
options := linkOptions{ options := linkOptions{
pinnedEd25519Keys: map[keyArray]struct{}{}, pinnedEd25519Keys: map[keyArray]struct{}{},
} }
for _, pubkey := range u.Query()["key"] { for _, pubkey := range u.Query()["key"] {
if sigPub, err := hex.DecodeString(pubkey); err == nil { sigPub, err := hex.DecodeString(pubkey)
var sigPubKey keyArray if err != nil {
copy(sigPubKey[:], sigPub) return fmt.Errorf("pinned key contains invalid hex characters")
options.pinnedEd25519Keys[sigPubKey] = struct{}{}
} }
var sigPubKey keyArray
copy(sigPubKey[:], sigPub)
options.pinnedEd25519Keys[sigPubKey] = struct{}{}
} }
switch info.linkType { switch info.linkType {
case "tcp": case "tcp":