Merge branch 'master' into develop

2014-10-24 10:57:38 +01:00 · 2014-10-24 10:57:38 +01:00 · be6d41ffe5
parent 53f69bf089 51edfeb3d0
commit be6d41ffe5
1 changed files with 1 additions and 1 deletions
--- a/synapse/rest/voip.py
+++ b/synapse/rest/voip.py
@ -36,7 +36,7 @@ class VoipRestServlet(RestServlet):
        if not turnUris or not turnSecret or not userLifetime:
            defer.returnValue( (200, {}) )

-        expiry = self.hs.get_clock().time_msec() + userLifetime
+        expiry = (self.hs.get_clock().time_msec() + userLifetime) / 1000
        username = "%d:%s" % (expiry, auth_user.to_string())
         
        mac = hmac.new(turnSecret, msg=username, digestmod=hashlib.sha1)