hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-29 12:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweaks to Dendrite Yggdrasil demo setup

Browse source
This commit is contained in:
Neil Alexander 2020-07-07 14:18:58 +01:00
parent 99ea1f9b48
commit b21fad92e5
5 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/dendrite-demo-yggdrasil/main.go
View file

@ -54,10 +54,11 @@ func main() {
flag.Parse()
internal.SetupPprof()
ygg, err := yggconn.Setup(*instanceName, *instancePeer, ".", true)
ygg, err := yggconn.Setup(*instanceName, ".")
if err != nil {
panic(err)
}
ygg.SetMulticastEnabled(true)
cfg := &config.Dendrite{}
cfg.SetDefaults()

28
cmd/dendrite-demo-yggdrasil/yggconn/node.go
View file

@ -80,7 +80,7 @@ func (n *Node) DialerContext(ctx context.Context, network, address string) (net.
}
// nolint:gocyclo
func Setup(instanceName, instancePeer, storageDirectory string, enableMulticast bool) (*Node, error) {
func Setup(instanceName, storageDirectory string) (*Node, error) {
n := &Node{
core: &yggdrasil.Core{},
config: yggdrasilconfig.GenerateConfig(),
@ -102,17 +102,9 @@ func Setup(instanceName, instancePeer, storageDirectory string, enableMulticast
}
}
if instancePeer != "" {
n.config.Peers = []string{instancePeer}
} else {
n.config.Peers = []string{}
}
n.config.Peers = []string{}
n.config.AdminListen = "none"
if enableMulticast {
n.config.MulticastInterfaces = []string{".*"}
} else {
n.config.MulticastInterfaces = []string{}
}
n.config.MulticastInterfaces = []string{}
n.config.EncryptionPrivateKey = hex.EncodeToString(n.EncryptionPrivateKey())
n.config.EncryptionPublicKey = hex.EncodeToString(n.EncryptionPublicKey())
@ -197,11 +189,9 @@ func (n *Node) PeerCount() int {
func (n *Node) KnownNodes() []gomatrixserverlib.ServerName {
nodemap := map[string]struct{}{}
/*
for _, peer := range n.core.GetSwitchPeers() {
nodemap[hex.EncodeToString(peer.SigningKey[:])] = struct{}{}
}
*/
for _, peer := range n.core.GetSwitchPeers() {
nodemap[hex.EncodeToString(peer.SigningKey[:])] = struct{}{}
}
n.sessions.Range(func(_, v interface{}) bool {
session, ok := v.(quic.Session)
if !ok {
@ -262,7 +252,11 @@ func (n *Node) SetStaticPeer(uri string) error {
if uri != "" {
n.log.Infoln("Adding static peer", uri)
if err := n.core.AddPeer(uri, ""); err != nil {
n.log.Infoln("Adding static peer failed:", err)
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
}
}