MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 19:53:51 +01:00
Code Issues Projects Releases Wiki Activity

Make turn server endpoint return an empty object if no turn servers to

Browse source 
match the normal response. Don't break if the turn_uris option isn't
present.
This commit is contained in:
David Baker 2014-09-25 11:24:49 +02:00
parent 6806caffc7
commit a31bf77776
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/config/voip.py
View file

@ -19,7 +19,7 @@ class VoipConfig(Config):
def __init__(self, args): def __init__(self, args):
super(VoipConfig, self).__init__(args) super(VoipConfig, self).__init__(args)
self.turn_uris = args.turn_uris.split(",") self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
self.turn_shared_secret = args.turn_shared_secret self.turn_shared_secret = args.turn_shared_secret
self.turn_user_lifetime = args.turn_user_lifetime self.turn_user_lifetime = args.turn_user_lifetime

2
synapse/rest/voip.py
View file

@ -34,7 +34,7 @@ class VoipRestServlet(RestServlet):
turnSecret = self.hs.config.turn_shared_secret turnSecret = self.hs.config.turn_shared_secret
userLifetime = self.hs.config.turn_user_lifetime userLifetime = self.hs.config.turn_user_lifetime
if not turnUris or not turnSecret or not userLifetime: if not turnUris or not turnSecret or not userLifetime:
defer.returnValue( (200, {"uris": []}) ) defer.returnValue( (200, {}) )
expiry = self.hs.get_clock().time_msec() + userLifetime expiry = self.hs.get_clock().time_msec() + userLifetime
username = "%d:%s" % (expiry, auth_user.to_string()) username = "%d:%s" % (expiry, auth_user.to_string())