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

Replace ?ed25519= with ?key= in peering URIs

Browse Source
This commit is contained in:
Neil Alexander 2021-06-11 21:12:27 +01:00
parent f7607557c1
commit acdc3dd3c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/link.go
View File

@ -75,7 +75,7 @@ func (l *links) call(u *url.URL, sintf string) error {
// return fmt.Errorf("peer %s is not correctly formatted (%s)", uri, err) // return fmt.Errorf("peer %s is not correctly formatted (%s)", uri, err)
//} //}
tcpOpts := tcpOptions{} tcpOpts := tcpOptions{}
if pubkeys, ok := u.Query()["ed25519"]; ok && len(pubkeys) > 0 { if pubkeys, ok := u.Query()["key"]; ok && len(pubkeys) > 0 {
tcpOpts.pinnedEd25519Keys = make(map[keyArray]struct{}) tcpOpts.pinnedEd25519Keys = make(map[keyArray]struct{})
for _, pubkey := range pubkeys { for _, pubkey := range pubkeys {
if sigPub, err := hex.DecodeString(pubkey); err == nil { if sigPub, err := hex.DecodeString(pubkey); err == nil {

2
src/multicast/multicast.go
View File

@ -365,7 +365,7 @@ func (m *Multicast) listen() {
}) })
if _, ok := interfaces[from.Zone]; ok { if _, ok := interfaces[from.Zone]; ok {
addr.Zone = "" addr.Zone = ""
pin := fmt.Sprintf("/?ed25519=%s", hex.EncodeToString(key)) pin := fmt.Sprintf("/?key=%s", hex.EncodeToString(key))
u, err := url.Parse("tcp://" + addr.String() + pin) u, err := url.Parse("tcp://" + addr.String() + pin)
if err != nil { if err != nil {
m.log.Debugln("Call from multicast failed, parse error:", addr.String(), err) m.log.Debugln("Call from multicast failed, parse error:", addr.String(), err)