aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-03-16 16:49:10 +0000
committerNeil Alexander <neilalexander@users.noreply.github.com>2022-03-16 16:49:10 +0000
commit047147a3af031f43f19a5e130d24c289716fe612 (patch)
treea046b3291da3b5f855964d2581a8d9c47a25603d /cmd
parente30aa38fb0d4ebe4ccc2adcbcdf3211b9a1d3ec7 (diff)
Update Yggdrasil P2P demo (also remove QUIC dependency)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/dendrite-demo-yggdrasil/yggconn/node.go2
-rw-r--r--cmd/dendrite-demo-yggdrasil/yggconn/session.go4
2 files changed, 2 insertions, 4 deletions
diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/node.go b/cmd/dendrite-demo-yggdrasil/yggconn/node.go
index 002e8071..d93272e2 100644
--- a/cmd/dendrite-demo-yggdrasil/yggconn/node.go
+++ b/cmd/dendrite-demo-yggdrasil/yggconn/node.go
@@ -26,7 +26,6 @@ import (
"os"
"strings"
- "github.com/lucas-clemente/quic-go"
"github.com/matrix-org/gomatrixserverlib"
"github.com/neilalexander/utp"
@@ -44,7 +43,6 @@ type Node struct {
config *yggdrasilconfig.NodeConfig
multicast *yggdrasilmulticast.Multicast
log *gologme.Logger
- listener quic.Listener
utpSocket *utp.Socket
incoming chan net.Conn
}
diff --git a/cmd/dendrite-demo-yggdrasil/yggconn/session.go b/cmd/dendrite-demo-yggdrasil/yggconn/session.go
index b9a523dd..b35b4043 100644
--- a/cmd/dendrite-demo-yggdrasil/yggconn/session.go
+++ b/cmd/dendrite-demo-yggdrasil/yggconn/session.go
@@ -37,12 +37,12 @@ func (n *Node) Accept() (net.Conn, error) {
// Implements net.Listener
func (n *Node) Close() error {
- return n.listener.Close()
+ return n.utpSocket.Close()
}
// Implements net.Listener
func (n *Node) Addr() net.Addr {
- return n.listener.Addr()
+ return n.utpSocket.Addr()
}
// Implements http.Transport.Dial