aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendrite-demo-yggdrasil/yggconn/node.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/dendrite-demo-yggdrasil/yggconn/node.go')
-rw-r--r--cmd/dendrite-demo-yggdrasil/yggconn/node.go206
1 files changed, 53 insertions, 153 deletions
diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go
index 9c286dfb..002e8071 100644
--- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go
+++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go
@@ -17,7 +17,6 @@ package yggconn
import (
"context"
"crypto/ed25519"
- "crypto/tls"
"encoding/hex"
"encoding/json"
"fmt"
@@ -26,60 +25,48 @@ import (
"net"
"os"
"strings"
- "sync"
- "time"
"github.com/lucas-clemente/quic-go"
- "github.com/matrix-org/dendrite/cmd/dendrite-demo-yggdrasil/convert"
"github.com/matrix-org/gomatrixserverlib"
- "go.uber.org/atomic"
+ "github.com/neilalexander/utp"
+ ironwoodtypes "github.com/Arceliar/ironwood/types"
yggdrasilconfig "github.com/yggdrasil-network/yggdrasil-go/src/config"
+ yggdrasilcore "github.com/yggdrasil-network/yggdrasil-go/src/core"
+ yggdrasildefaults "github.com/yggdrasil-network/yggdrasil-go/src/defaults"
yggdrasilmulticast "github.com/yggdrasil-network/yggdrasil-go/src/multicast"
- "github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil"
gologme "github.com/gologme/log"
)
type Node struct {
- core *yggdrasil.Core
- config *yggdrasilconfig.NodeConfig
- state *yggdrasilconfig.NodeState
- multicast *yggdrasilmulticast.Multicast
- log *gologme.Logger
- listener quic.Listener
- tlsConfig *tls.Config
- quicConfig *quic.Config
- sessions sync.Map // string -> *session
- sessionCount atomic.Uint32
- sessionFunc func(address string)
- coords sync.Map // string -> yggdrasil.Coords
- incoming chan QUICStream
- NewSession func(remote gomatrixserverlib.ServerName)
+ core *yggdrasilcore.Core
+ config *yggdrasilconfig.NodeConfig
+ multicast *yggdrasilmulticast.Multicast
+ log *gologme.Logger
+ listener quic.Listener
+ utpSocket *utp.Socket
+ incoming chan net.Conn
}
-func (n *Node) Dialer(_, address string) (net.Conn, error) {
+func (n *Node) DialerContext(ctx context.Context, _, address string) (net.Conn, error) {
tokens := strings.Split(address, ":")
raw, err := hex.DecodeString(tokens[0])
if err != nil {
return nil, fmt.Errorf("hex.DecodeString: %w", err)
}
- converted := convert.Ed25519PublicKeyToCurve25519(ed25519.PublicKey(raw))
- convhex := hex.EncodeToString(converted)
- return n.Dial("curve25519", convhex)
+ pk := make(ironwoodtypes.Addr, ed25519.PublicKeySize)
+ copy(pk, raw[:])
+ return n.utpSocket.DialAddrContext(ctx, pk)
}
-func (n *Node) DialerContext(ctx context.Context, network, address string) (net.Conn, error) {
- return n.Dialer(network, address)
-}
-
-func Setup(instanceName, storageDirectory string) (*Node, error) {
+func Setup(instanceName, storageDirectory, peerURI string) (*Node, error) {
n := &Node{
- core: &yggdrasil.Core{},
- config: yggdrasilconfig.GenerateConfig(),
+ core: &yggdrasilcore.Core{},
+ config: yggdrasildefaults.GenerateConfig(),
multicast: &yggdrasilmulticast.Multicast{},
log: gologme.New(os.Stdout, "YGG ", log.Flags()),
- incoming: make(chan QUICStream),
+ incoming: make(chan net.Conn),
}
yggfile := fmt.Sprintf("%s/%s-yggdrasil.conf", storageDirectory, instanceName)
@@ -93,24 +80,11 @@ func Setup(instanceName, storageDirectory string) (*Node, error) {
}
}
- n.core.SetCoordChangeCallback(func(old, new yggdrasil.Coords) {
- fmt.Println("COORDINATE CHANGE!")
- fmt.Println("Old:", old)
- fmt.Println("New:", new)
- n.sessions.Range(func(k, v interface{}) bool {
- if s, ok := v.(*session); ok {
- fmt.Println("Killing session", k)
- s.kill()
- }
- return true
- })
- })
-
n.config.Peers = []string{}
+ if peerURI != "" {
+ n.config.Peers = append(n.config.Peers, peerURI)
+ }
n.config.AdminListen = "none"
- n.config.MulticastInterfaces = []string{}
- n.config.EncryptionPrivateKey = hex.EncodeToString(n.EncryptionPrivateKey())
- n.config.EncryptionPublicKey = hex.EncodeToString(n.EncryptionPublicKey())
j, err := json.MarshalIndent(n.config, "", " ")
if err != nil {
@@ -123,34 +97,22 @@ func Setup(instanceName, storageDirectory string) (*Node, error) {
n.log.EnableLevel("error")
n.log.EnableLevel("warn")
n.log.EnableLevel("info")
- n.state, err = n.core.Start(n.config, n.log)
+ if err = n.core.Start(n.config, n.log); err != nil {
+ panic(err)
+ }
+ n.utpSocket, err = utp.NewSocketFromPacketConnNoClose(n.core)
if err != nil {
panic(err)
}
- if err = n.multicast.Init(n.core, n.state, n.log, nil); err != nil {
+ if err = n.multicast.Init(n.core, n.config, n.log, nil); err != nil {
panic(err)
}
if err = n.multicast.Start(); err != nil {
panic(err)
}
- n.tlsConfig = n.generateTLSConfig()
- n.quicConfig = &quic.Config{
- MaxIncomingStreams: 0,
- MaxIncomingUniStreams: 0,
- KeepAlive: true,
- MaxIdleTimeout: time.Minute * 30,
- HandshakeTimeout: time.Second * 15,
- }
- copy(n.quicConfig.StatelessResetKey, n.EncryptionPublicKey())
-
- n.log.Println("Public curve25519:", n.core.EncryptionPublicKey())
- n.log.Println("Public ed25519:", n.core.SigningPublicKey())
-
- go func() {
- time.Sleep(time.Second)
- n.listenFromYgg()
- }()
+ n.log.Println("Public key:", n.core.PublicKey())
+ go n.listenFromYgg()
return n, nil
}
@@ -163,64 +125,33 @@ func (n *Node) Stop() {
}
func (n *Node) DerivedServerName() string {
- return hex.EncodeToString(n.SigningPublicKey())
+ return hex.EncodeToString(n.PublicKey())
}
-func (n *Node) DerivedSessionName() string {
- return hex.EncodeToString(n.EncryptionPublicKey())
-}
-
-func (n *Node) EncryptionPublicKey() []byte {
- edkey := n.SigningPublicKey()
- return convert.Ed25519PublicKeyToCurve25519(edkey)
-}
-
-func (n *Node) EncryptionPrivateKey() []byte {
- edkey := n.SigningPrivateKey()
- return convert.Ed25519PrivateKeyToCurve25519(edkey)
-}
-
-func (n *Node) SigningPublicKey() ed25519.PublicKey {
- pubBytes, _ := hex.DecodeString(n.config.SigningPublicKey)
- return ed25519.PublicKey(pubBytes)
-}
-
-func (n *Node) SigningPrivateKey() ed25519.PrivateKey {
- privBytes, _ := hex.DecodeString(n.config.SigningPrivateKey)
- return ed25519.PrivateKey(privBytes)
+func (n *Node) PrivateKey() ed25519.PrivateKey {
+ sk := make(ed25519.PrivateKey, ed25519.PrivateKeySize)
+ sb, err := hex.DecodeString(n.config.PrivateKey)
+ if err == nil {
+ copy(sk, sb[:])
+ } else {
+ panic(err)
+ }
+ return sk
}
-func (n *Node) SetSessionFunc(f func(address string)) {
- n.sessionFunc = f
+func (n *Node) PublicKey() ed25519.PublicKey {
+ return n.core.PublicKey()
}
func (n *Node) PeerCount() int {
- return len(n.core.GetPeers()) - 1
-}
-
-func (n *Node) SessionCount() int {
- return int(n.sessionCount.Load())
+ return len(n.core.GetPeers())
}
func (n *Node) KnownNodes() []gomatrixserverlib.ServerName {
- nodemap := map[string]struct{}{
- //"b5ae50589e50991dd9dd7d59c5c5f7a4521e8da5b603b7f57076272abc58b374": {},
+ nodemap := map[string]struct{}{}
+ for _, peer := range n.core.GetPeers() {
+ nodemap[hex.EncodeToString(peer.Key)] = struct{}{}
}
- for _, peer := range n.core.GetSwitchPeers() {
- nodemap[hex.EncodeToString(peer.SigPublicKey[:])] = struct{}{}
- }
- n.sessions.Range(func(_, v interface{}) bool {
- session, ok := v.(quic.Session)
- if !ok {
- return true
- }
- if len(session.ConnectionState().PeerCertificates) != 1 {
- return true
- }
- subjectName := session.ConnectionState().PeerCertificates[0].Subject.CommonName
- nodemap[subjectName] = struct{}{}
- return true
- })
var nodes []gomatrixserverlib.ServerName
for node := range nodemap {
nodes = append(nodes, gomatrixserverlib.ServerName(node))
@@ -229,53 +160,22 @@ func (n *Node) KnownNodes() []gomatrixserverlib.ServerName {
}
func (n *Node) SetMulticastEnabled(enabled bool) {
- if enabled {
- n.config.MulticastInterfaces = []string{".*"}
- } else {
- n.config.MulticastInterfaces = []string{}
- }
- n.multicast.UpdateConfig(n.config)
- if !enabled {
- n.DisconnectMulticastPeers()
- }
+ // TODO: There's no dynamic reconfiguration in Yggdrasil v0.4
+ // so we need a solution for this.
}
func (n *Node) DisconnectMulticastPeers() {
- for _, sp := range n.core.GetSwitchPeers() {
- if !strings.HasPrefix(sp.Endpoint, "fe80") {
- continue
- }
- if err := n.core.DisconnectPeer(sp.Port); err != nil {
- n.log.Printf("Failed to disconnect port %d: %s", sp.Port, err)
- }
- }
+ // TODO: There's no dynamic reconfiguration in Yggdrasil v0.4
+ // so we need a solution for this.
}
func (n *Node) DisconnectNonMulticastPeers() {
- for _, sp := range n.core.GetSwitchPeers() {
- if strings.HasPrefix(sp.Endpoint, "fe80") {
- continue
- }
- if err := n.core.DisconnectPeer(sp.Port); err != nil {
- n.log.Printf("Failed to disconnect port %d: %s", sp.Port, err)
- }
- }
+ // TODO: There's no dynamic reconfiguration in Yggdrasil v0.4
+ // so we need a solution for this.
}
func (n *Node) SetStaticPeer(uri string) error {
- n.config.Peers = []string{}
- n.core.UpdateConfig(n.config)
- n.DisconnectNonMulticastPeers()
- if uri != "" {
- n.log.Infoln("Adding static peer", uri)
- if err := n.core.AddPeer(uri, ""); err != nil {
- n.log.Warnln("Adding static peer failed:", err)
- return err
- }
- if err := n.core.CallPeer(uri, ""); err != nil {
- n.log.Warnln("Calling static peer failed:", err)
- return err
- }
- }
+ // TODO: There's no dynamic reconfiguration in Yggdrasil v0.4
+ // so we need a solution for this.
return nil
}
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-27 19:58:38 +0000