From 5383ba55870079076277ee6e83458f6cd7ceee85 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Wed, 24 Sep 2014 16:01:36 +0100
Subject: rename endpoint to better reflect what it is and allow specifying
 multiple uris

---
 synapse/rest/voip.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'synapse/rest')

diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py
index bb0108cbd1..31f3fd100d 100644
--- a/synapse/rest/voip.py
+++ b/synapse/rest/voip.py
@@ -24,13 +24,13 @@ import base64
 
 
 class VoipRestServlet(RestServlet):
-    PATTERN = client_path_pattern("/voip/turnuris$")
+    PATTERN = client_path_pattern("/voip/turnServers$")
 
     @defer.inlineCallbacks
     def on_GET(self, request):
         auth_user = yield self.auth.get_user_by_req(request)
 
-        turnUri = self.hs.config.turn_uri
+        turnUris = self.hs.config.turn_uris
         turnSecret = self.hs.config.turn_shared_secret
         userLifetime = self.hs.config.turn_user_lifetime
         if not turnUri or not turnSecret or not userLifetime:
@@ -49,9 +49,7 @@ class VoipRestServlet(RestServlet):
             'username': username,
             'password': password,
             'ttl': userLifetime / 1000,
-            'uris': [
-                turnUri,
-            ]
+            'uris': turnUris,
         }) )
 
     def on_OPTIONS(self, request):
-- 
cgit 1.4.1