mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 21:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

add -peer switch

Browse source
This commit is contained in:
Neil Alexander 2020-06-09 16:12:48 +01:00
parent 512377d45b
commit 263fea7aed
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@ import (
var ( var (
instanceName = flag.String("name", "dendrite-p2p-ygg", "the name of this P2P demo instance") instanceName = flag.String("name", "dendrite-p2p-ygg", "the name of this P2P demo instance")
instancePort = flag.Int("port", 8008, "the port that the client API will listen on") instancePort = flag.Int("port", 8008, "the port that the client API will listen on")
instancePeer = flag.String("peer", "", "an internet Yggdrasil peer to connect to")
) )
type yggroundtripper struct { type yggroundtripper struct {
@ -95,7 +96,7 @@ func main() {
}, },
} }
ygg, err := yggconn.Setup(*instanceName) ygg, err := yggconn.Setup(*instanceName, *instancePeer)
if err != nil { if err != nil {
panic(err) panic(err)
} }

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

@ -32,7 +32,7 @@ type Node struct {
incoming chan *yamux.Stream incoming chan *yamux.Stream
} }
func Setup(instanceName string) (*Node, error) { func Setup(instanceName, instancePeer string) (*Node, error) {
n := &Node{ n := &Node{
core: &yggdrasil.Core{}, core: &yggdrasil.Core{},
config: yggdrasilconfig.GenerateConfig(), config: yggdrasilconfig.GenerateConfig(),
@ -71,6 +71,11 @@ func Setup(instanceName string) (*Node, error) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
if instancePeer != "" {
if err = n.core.AddPeer(instancePeer, ""); err != nil {
panic(err)
}
}
if err = n.admin.Init(n.core, n.state, n.log, nil); err != nil { if err = n.admin.Init(n.core, n.state, n.log, nil); err != nil {
panic(err) panic(err)
} }