From ff6a307efd7b8df765f8afa6016aa6ed5ed0afc8 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 13 Aug 2020 11:05:22 +0100 Subject: [PATCH] Fix P2P demos --- build/gobind/monolith.go | 4 ++-- cmd/dendrite-demo-libp2p/main.go | 6 +++--- cmd/dendrite-demo-yggdrasil/main.go | 4 ++-- cmd/dendritejs/main.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/gobind/monolith.go b/build/gobind/monolith.go index f45f07b56..9856f9589 100644 --- a/build/gobind/monolith.go +++ b/build/gobind/monolith.go @@ -184,8 +184,8 @@ func (m *DendriteMonolith) Start() { httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) yggRouter := mux.NewRouter() - httpRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) - httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) + yggRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) + yggRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) // Build both ends of a HTTP multiplex. m.httpServer = &http.Server{ diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index 760dd9cfd..9057f4324 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -204,9 +204,9 @@ func main() { httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.Base.ExternalMediaAPIMux) libp2pRouter := mux.NewRouter() - httpRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.Base.ExternalFederationAPIMux) - httpRouter.PathPrefix(httputil.ExternalKeyPathPrefix).Handler(base.Base.ExternalKeyAPIMux) - httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.Base.ExternalMediaAPIMux) + libp2pRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.Base.ExternalFederationAPIMux) + libp2pRouter.PathPrefix(httputil.ExternalKeyPathPrefix).Handler(base.Base.ExternalKeyAPIMux) + libp2pRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.Base.ExternalMediaAPIMux) // Expose the matrix APIs directly rather than putting them under a /api path. go func() { diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 5e734fadc..c50697c23 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -169,8 +169,8 @@ func main() { httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) yggRouter := mux.NewRouter() - httpRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) - httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) + yggRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) + yggRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) // Build both ends of a HTTP multiplex. httpServer := &http.Server{ diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go index 39fb06f4a..5f0f7deb7 100644 --- a/cmd/dendritejs/main.go +++ b/cmd/dendritejs/main.go @@ -248,8 +248,8 @@ func main() { httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) libp2pRouter := mux.NewRouter() - httpRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) - httpRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) + libp2pRouter.PathPrefix(httputil.ExternalFederationPathPrefix).Handler(base.ExternalFederationAPIMux) + libp2pRouter.PathPrefix(httputil.ExternalMediaPathPrefix).Handler(base.ExternalMediaAPIMux) // Expose the matrix APIs via libp2p-js - for federation traffic if node != nil {