From 1fabf18f0e1663a018798ff69ec3962d53056bda Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 25 May 2016 00:29:23 -0700 Subject: [PATCH] INCOMPATIBILITY: move relay url to /v1 This should make it cleaner to add a /v2 in the future. --- src/wormhole/cli/public_relay.py | 2 +- src/wormhole/server/server.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wormhole/cli/public_relay.py b/src/wormhole/cli/public_relay.py index 7d82c66..65c48a7 100644 --- a/src/wormhole/cli/public_relay.py +++ b/src/wormhole/cli/public_relay.py @@ -1,5 +1,5 @@ # This is a relay I run on a personal server. If it gets too expensive to # run, I'll shut it down. -RENDEZVOUS_RELAY = u"ws://wormhole-relay.petmail.org:4000/" +RENDEZVOUS_RELAY = u"ws://wormhole-relay.petmail.org:4000/v1" TRANSIT_RELAY = u"tcp:wormhole-transit-relay.petmail.org:4001" diff --git a/src/wormhole/server/server.py b/src/wormhole/server/server.py index 0e65ee4..faa598f 100644 --- a/src/wormhole/server/server.py +++ b/src/wormhole/server/server.py @@ -48,8 +48,9 @@ class RelayServer(service.MultiService): rendezvous = Rendezvous(db, welcome, blur_usage) rendezvous.setServiceParent(self) # for the pruning timer + root = Root() wsrf = WebSocketRendezvousFactory(None, rendezvous) - root = WebSocketResource(wsrf) + root.putChild(b"v1", WebSocketResource(wsrf)) site = PrivacyEnhancedSite(root) if blur_usage: