Mirrors/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2026-05-21 13:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revise multicast format to include protocol version, discriminator for TLS roots

Browse Source
This commit is contained in:
Neil Alexander
2023-05-21 15:24:31 +01:00
parent 002b984c04
commit 57d9a2399f
5 changed files with 112 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/multicast/advertisement.go
View File

@@ -7,22 +7,33 @@ import (
)
type multicastAdvertisement struct {
PublicKey ed25519.PublicKey
Port uint16
MajorVersion uint16
MinorVersion uint16
PublicKey ed25519.PublicKey
Port uint16
Discriminator []byte
}
func (m *multicastAdvertisement) MarshalBinary() ([]byte, error) {
b := make([]byte, 0, ed25519.PublicKeySize+2)
b := make([]byte, 0, ed25519.PublicKeySize+8+len(m.Discriminator))
b = binary.BigEndian.AppendUint16(b, m.MajorVersion)
b = binary.BigEndian.AppendUint16(b, m.MinorVersion)
b = append(b, m.PublicKey...)
b = binary.BigEndian.AppendUint16(b, m.Port)
b = binary.BigEndian.AppendUint16(b, uint16(len(m.Discriminator)))
b = append(b, m.Discriminator...)
return b, nil
}
func (m *multicastAdvertisement) UnmarshalBinary(b []byte) error {
if len(b) < ed25519.PublicKeySize+2 {
if len(b) < ed25519.PublicKeySize+8 {
return fmt.Errorf("invalid multicast beacon")
}
m.PublicKey = b[:ed25519.PublicKeySize]
m.Port = binary.BigEndian.Uint16(b[ed25519.PublicKeySize:])
m.MajorVersion = binary.BigEndian.Uint16(b[0:2])
m.MinorVersion = binary.BigEndian.Uint16(b[2:4])
m.PublicKey = append(m.PublicKey[:0], b[4:4+ed25519.PublicKeySize]...)
m.Port = binary.BigEndian.Uint16(b[4+ed25519.PublicKeySize : 6+ed25519.PublicKeySize])
dl := binary.BigEndian.Uint16(b[6+ed25519.PublicKeySize : 8+ed25519.PublicKeySize])
m.Discriminator = append(m.Discriminator[:0], b[8+ed25519.PublicKeySize:8+ed25519.PublicKeySize+dl]...)
return nil
}