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

connection.py to take advantage of ssl patch

Browse source
This commit is contained in:
Nikos Kouremenos 2005-06-18 11:37:29 +00:00
parent e325da1e1c
commit 74fd03dc23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/connection.py
View file

@ -625,13 +625,15 @@ class Connection:
h = hostname h = hostname
p = 5222 p = 5222
secur = None # autodetect [for SSL in 5223/443 and for TLS if broadcasted]
if usessl: if usessl:
p = 5223 p = 5223
secur=1 #1 means force SSL no matter what the port will be
if gajim.config.get_per('accounts', self.name, 'use_custom_host'): if gajim.config.get_per('accounts', self.name, 'use_custom_host'):
h = gajim.config.get_per('accounts', self.name, 'custom_host') h = gajim.config.get_per('accounts', self.name, 'custom_host')
p = gajim.config.get_per('accounts', self.name, 'custom_port') p = gajim.config.get_per('accounts', self.name, 'custom_port')
#TODO: pass ssl optional arg if neccessary when client.py is patched
con_type = con.connect((h, p), proxy = proxy) #FIXME: blocking con_type = con.connect((h, p), proxy = proxy, secure=secur) #FIXME: blocking
if not con_type: if not con_type:
gajim.log.debug("Couldn't connect to %s" % self.name) gajim.log.debug("Couldn't connect to %s" % self.name)
self.connected = 0 self.connected = 0
@ -885,13 +887,16 @@ class Connection:
c.RegisterDisconnectHandler(self._disconnectedCB) c.RegisterDisconnectHandler(self._disconnectedCB)
h = hostname h = hostname
p = 5222 p = 5222
if usessl: usessl = None
if usessl: #FIXME: we cannot create an account if we want ssl connection to create it
p = 5223 p = 5223
if config['use_custom_host']: if config['use_custom_host']:
h = config['custom_host'] h = config['custom_host']
p = config['custom_port'] p = config['custom_port']
#FIXME: blocking secur = None # autodetect [for SSL in 5223/443 and for TLS if broadcasted]
con_type = c.connect((h, p), proxy = proxy) if usessl:
secur=1 #1 means force SSL no matter what the port is
con_type = c.connect((h, p), proxy = proxy, secure=secur)#FIXME: blocking
if not con_type: if not con_type:
gajim.log.debug("Couldn't connect to %s" % name) gajim.log.debug("Couldn't connect to %s" % name)
self.dispatch('ERROR', (_('Could not connect to "%s"') % name, self.dispatch('ERROR', (_('Could not connect to "%s"') % name,