diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-24 10:57:38 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-24 10:57:38 +0100 |
| commit | be6d41ffe517d9c40aaa1ad60e2fd7e4f9d7c8b6 (patch) | |
| tree | 9e9c76fbdec89acdbc6d8145f372556b73ca5b83 /synapse | |
| parent | Added pylint config file: ignore missing-docstring messages. (diff) | |
| parent | Coturn's timestamps are in seconds, not milliseconds (diff) | |
| download | synapse-be6d41ffe517d9c40aaa1ad60e2fd7e4f9d7c8b6.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/voip.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py index 2e4627606f..0d0243a249 100644 --- 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) |