Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Hörist <forenjunkie@chello.at>2017-05-05 23:42:47 +0300
committerPhilipp Hörist <forenjunkie@chello.at>2017-05-05 23:42:47 +0300
commit6e8e5aec51136f07bc788d0766db7960a4472677 (patch)
tree11bb4767a0dd693925f9d16198106efd210639f1 /src
parentbc504f90b1c4cfde3ebef4a822fa00a665830abe (diff)
parent61c2259a9af0eb6220cbf7c1f01696b9c8225978 (diff)
Merge branch 'stun_discovery' into 'master'
Use account hostname for STUN server discovery See merge request !93
Diffstat (limited to 'src')
-rw-r--r--src/common/connection.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/connection.py b/src/common/connection.py
index 5c353facf..efc77bba9 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1917,8 +1917,9 @@ class Connection(CommonConnection, ConnectionHandlers):
self.sm.resuming = False # back to previous state
# Discover Stun server(s)
- gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(
- self.connected_hostname), self._on_stun_resolved)
+ hostname = gajim.config.get_per('accounts', self.name, 'hostname')
+ gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii(hostname),
+ self._on_stun_resolved)
def _on_stun_resolved(self, host, result_array):
if len(result_array) != 0: