Philipp Hörist pushed to branch master at gajim / gajim

Commits: 61c2259a by Marc Schink at 2017-05-03T10:01:49+02:00 Use account hostname for STUN server discovery

Use the account hostname instead of the target hostname of the _xmpp-client._tcp SRV resource record for STUN server discovery. Otherwise, discovery fails if both hostnames are different.

- - - - - 6e8e5aec by Philipp Hörist at 2017-05-05T22:42:47+02:00 Merge branch 'stun_discovery' into 'master'

Use account hostname for STUN server discovery

See merge request !93 - - - - -

1 changed file:

- src/common/connection.py

Changes:

===================================== src/common/connection.py ===================================== --- 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:

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bc504f90b1c4cfde3ebef4a822fa00a665...