Skip to content

Commit ea7dc66

Browse files
committed
byte array instead of clice in domain struct
1 parent 1d6b9c8 commit ea7dc66

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

cmd/genkeys/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func main() {
4545
fmt.Println("Pub:", hex.EncodeToString(newKey.pub))
4646
c := &core.Core{}
4747
var bytes [ed25519.PublicKeySize]byte
48-
addr := c.AddrForDomain(types.Domain{Key: bytes[:], Name: newKey.pub})
48+
addr := c.AddrForDomain(types.Domain{Key: bytes[:], Name: [32]byte(newKey.pub)})
4949
fmt.Println("IP:", net.IP(addr[:]).String())
5050
}
5151
}

cmd/mesh/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func run(sigCh chan os.Signal) {
164164

165165
getNodeKey := func() types.Domain {
166166
name := cfg.Domain
167-
return types.Domain{Key: publicKey, Name: []byte(name)}
167+
return types.Domain{Key: publicKey, Name: [ed25519.PublicKeySize]byte([]byte(name))}
168168
}
169169

170170
switch {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/RiV-chain/RiV-mesh
22

33
go 1.21
44

5-
replace github.com/Arceliar/ironwood => github.com/RiV-chain/ironwood v0.0.0-20231220103331-37a8ba431a4e
5+
replace github.com/Arceliar/ironwood => github.com/RiV-chain/ironwood v0.0.0-20231220110601-a30286562e6e
66

77
replace github.com/mikispag/dns-over-tls-forwarder => github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3
88

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d h1:UK9fsWbWqwIQkMCz
44
github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d/go.mod h1:BCnxhRf47C/dy/e/D2pmB8NkB3dQVIrkD98b220rx5Q=
55
github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3 h1:gz71d+oEAMXYUYw54JKT4A6CxniQx6B9J0G5CYJeLok=
66
github.com/RiV-chain/dns-over-tls-forwarder v0.0.0-20230828114909-c2cd9f8d79d3/go.mod h1:V2Irj3BjF2tLZ3xXp6TMQCu0I+eJWQPEktbLMHQN8XA=
7-
github.com/RiV-chain/ironwood v0.0.0-20231220103331-37a8ba431a4e h1:RLKFjAHKnaCXQUyVdiBWf3VULWLRea6UW849QJbNODY=
8-
github.com/RiV-chain/ironwood v0.0.0-20231220103331-37a8ba431a4e/go.mod h1:O9iIMM9iVSXUIKNcrjossDuuXLwoGNuLSDXqjtTBHJk=
7+
github.com/RiV-chain/ironwood v0.0.0-20231220110601-a30286562e6e h1:JLsGxvmxpuijrprn5U7gdvS97ruA8WE4FkpRS6w+l50=
8+
github.com/RiV-chain/ironwood v0.0.0-20231220110601-a30286562e6e/go.mod h1:O9iIMM9iVSXUIKNcrjossDuuXLwoGNuLSDXqjtTBHJk=
99
github.com/apernet/quic-go v0.40.1-0.20231112225043-e7f3af208dee h1:S3r63crMLzbjjVJjiR+l6oS7Dzli1mYpxXNNlVc/qCc=
1010
github.com/apernet/quic-go v0.40.1-0.20231112225043-e7f3af208dee/go.mod h1:9i0/jnY+4NvJA/wdatko2/I8iRf5R0bvZQ6fbk76tRA=
1111
github.com/bits-and-blooms/bitset v1.3.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=

src/core/address.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (c *Core) AddrForDomain(domain iwt.Domain) *Address {
7373
if len(domain.Key) != ed25519.PublicKeySize {
7474
return nil
7575
}
76-
addr, err := encodeToIPv6(c.GetPrefix(), domain.Name)
76+
addr, err := encodeToIPv6(c.GetPrefix(), domain.Name[:])
7777
if err != nil {
7878
c.log.Errorln(err)
7979
return nil

src/core/version.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ func (m *version_metadata) decode(r io.Reader, password []byte) error {
132132
copy(m.domain.Key, bs[:ed25519.PublicKeySize])
133133

134134
case metaDomainName:
135-
m.domain.Name = make(ed25519.PublicKey, ed25519.PublicKeySize)
136-
copy(m.domain.Name, bs[:ed25519.PublicKeySize])
135+
var n [ed25519.PublicKeySize]byte
136+
copy(n[:], bs[:ed25519.PublicKeySize])
137+
m.domain.Name = n
137138

138139
case metaPriority:
139140
m.priority = bs[0]

0 commit comments

Comments
 (0)