copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

SRV now works (hopefully !)

Browse source 
we use a new Client instance for each try
fix a typo in the use of pydns
This commit is contained in:
Yann Leboulanger 2005-11-07 14:04:18 +00:00
parent 1c9f70638d
commit e422a1807d
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/connection.py
View file

@ -1486,13 +1486,6 @@ class Connection:
proxy['password'] = gajim.config.get_per('proxies', p, 'pass') proxy['password'] = gajim.config.get_per('proxies', p, 'pass')
else: else:
proxy = None proxy = None
if gajim.verbose:
con = common.xmpp.Client(hostname, caller = self)
else:
con = common.xmpp.Client(hostname, debug = [], caller = self)
common.xmpp.dispatcher.DefaultTimeout = try_connecting_for_foo_secs
con.UnregisterDisconnectHandler(con.DisconnectHandler)
con.RegisterDisconnectHandler(self._disconnectedReconnCB)
h = hostname h = hostname
p = 5222 p = 5222
@ -1529,7 +1522,7 @@ class Connection:
if len(answers) > 0: if len(answers) > 0:
# ignore the priority and weight for now # ignore the priority and weight for now
for a in answers: for a in answers:
prio, weight, port, host = answers[0]['data'] prio, weight, port, host = a['data']
hosts.append({'host': host, hosts.append({'host': host,
'port': port, 'port': port,
'prio': prio, 'prio': prio,
@ -1544,6 +1537,13 @@ class Connection:
con_type = None con_type = None
while len(hosts) and not con_type: while len(hosts) and not con_type:
if gajim.verbose:
con = common.xmpp.Client(hostname, caller = self)
else:
con = common.xmpp.Client(hostname, debug = [], caller = self)
common.xmpp.dispatcher.DefaultTimeout = try_connecting_for_foo_secs
con.UnregisterDisconnectHandler(con.DisconnectHandler)
host = self.select_next_host(hosts) host = self.select_next_host(hosts)
hosts.remove(host) hosts.remove(host)
con_type = con.connect((host['host'], host['port']), proxy = proxy, con_type = con.connect((host['host'], host['port']), proxy = proxy,
@ -1561,6 +1561,7 @@ class Connection:
_('Check your connection or try again later.'))) _('Check your connection or try again later.')))
return None, '' return None, ''
con.RegisterDisconnectHandler(self._disconnectedReconnCB)
gajim.log.debug(_('Connected to server %s:%s with %s') % (host['host'], gajim.log.debug(_('Connected to server %s:%s with %s') % (host['host'],
host['port'], con_type)) host['port'], con_type))
return con, con_type return con, con_type