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

correctly get connection object in JingleTransportSocks5

Browse source
This commit is contained in:
Yann Leboulanger 2010-07-06 12:29:21 +02:00
parent 92988cf2ba
commit e5eb62e12b
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/jingle_ft.py
View file

@ -66,6 +66,7 @@ class JingleFileTransfer(JingleContent):
self.transport = JingleTransportSocks5() self.transport = JingleTransportSocks5()
self.transport.set_file_props(self.file_props) self.transport.set_file_props(self.file_props)
self.transport.set_our_jid(session.ourjid) self.transport.set_our_jid(session.ourjid)
self.transport.set_connection(session.connection)
log.info('ourjid: %s' % session.ourjid) log.info('ourjid: %s' % session.ourjid)
self.session = session self.session = session
@ -101,6 +102,7 @@ class JingleFileTransfer(JingleContent):
if self.transport is None: if self.transport is None:
self.transport = JingleTransportSocks5() self.transport = JingleTransportSocks5()
self.transport.set_our_jid(self.session.ourjid) self.transport.set_our_jid(self.session.ourjid)
self.transport.set_connection(self.session.connection)
self.transport.set_file_props(self.file_props) self.transport.set_file_props(self.file_props)
if self.file_props.has_key("streamhosts"): if self.file_props.has_key("streamhosts"):
self.file_props['streamhosts'].extend(self.transport.remote_candidates) self.file_props['streamhosts'].extend(self.transport.remote_candidates)

31
src/common/jingle_transport.py
View file

@ -85,6 +85,7 @@ class JingleTransportSocks5(JingleTransport):
""" """
def __init__(self): def __init__(self):
JingleTransport.__init__(self, TransportType.streaming) JingleTransport.__init__(self, TransportType.streaming)
self.connection = None
self.remote_candidates = [] self.remote_candidates = []
def set_file_props(self, file_props): def set_file_props(self, file_props):
@ -93,6 +94,9 @@ class JingleTransportSocks5(JingleTransport):
def set_our_jid(self, jid): def set_our_jid(self, jid):
self.ourjid = jid self.ourjid = jid
def set_connection(self, conn):
self.connection = conn
def make_candidate(self, candidate): def make_candidate(self, candidate):
import logging import logging
log = logging.getLogger() log = logging.getLogger()
@ -134,13 +138,13 @@ class JingleTransportSocks5(JingleTransport):
def _add_local_ips_as_candidates(self): def _add_local_ips_as_candidates(self):
if not self.connection:
return
local_ip_cand = [] local_ip_cand = []
port = gajim.config.get('file_transfers_port') port = gajim.config.get('file_transfers_port')
type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 type_preference = 126 #type preference of connection type. XEP-0260 section 2.2
jid_wo_resource = gajim.get_jid_without_resource(self.ourjid) c = {'host': self.connection.peerhost[0]}
conn = gajim.connections[jid_wo_resource] c['candidate_id'] = self.connection.connection.getAnID()
c = {'host': conn.peerhost[0]}
c['candidate_id'] = conn.connection.getAnID()
c['port'] = port c['port'] = port
c['type'] = 'direct' c['type'] = 'direct'
c['jid'] = self.ourjid c['jid'] = self.ourjid
@ -161,18 +165,18 @@ class JingleTransportSocks5(JingleTransport):
self.candidates += local_ip_cand self.candidates += local_ip_cand
def _add_additional_candidates(self): def _add_additional_candidates(self):
if not self.connection:
return
type_preference = 126 type_preference = 126
additional_ip_cand = [] additional_ip_cand = []
port = gajim.config.get('file_transfers_port') port = gajim.config.get('file_transfers_port')
ft_add_hosts = gajim.config.get('ft_add_hosts_to_send') ft_add_hosts = gajim.config.get('ft_add_hosts_to_send')
jid_wo_resource = gajim.get_jid_without_resource(self.ourjid)
conn = gajim.connections[jid_wo_resource]
if ft_add_hosts: if ft_add_hosts:
hosts = [e.strip() for e in ft_add_hosts.split(',')] hosts = [e.strip() for e in ft_add_hosts.split(',')]
for h in hosts: for h in hosts:
c = {'host': h} c = {'host': h}
c['candidate_id'] = conn.connection.getAnID() c['candidate_id'] = self.connection.connection.getAnID()
c['port'] = port c['port'] = port
c['type'] = 'direct' c['type'] = 'direct'
c['jid'] = self.ourjid c['jid'] = self.ourjid
@ -181,22 +185,23 @@ class JingleTransportSocks5(JingleTransport):
self.candidates += additional_ip_cand self.candidates += additional_ip_cand
def _add_proxy_candidates(self): def _add_proxy_candidates(self):
if not self.connection:
return
type_preference = 10 type_preference = 10
proxy_cand = [] proxy_cand = []
socks5conn = ConnectionSocks5Bytestream() socks5conn = ConnectionSocks5Bytestream()
socks5conn.name = self.ourjid socks5conn.name = self.ourjid
proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props)
jid_wo_resource = gajim.get_jid_without_resource(self.ourjid)
conn = gajim.connections[jid_wo_resource]
if proxyhosts: if proxyhosts:
file_props['proxy_receiver'] = unicode(file_props['receiver']) self.file_props['proxy_receiver'] = unicode(
file_props['proxy_sender'] = unicode(file_props['sender']) self.file_props['receiver'])
file_props['proxyhosts'] = proxyhosts self.file_props['proxy_sender'] = unicode(self.file_props['sender'])
self.file_props['proxyhosts'] = proxyhosts
for proxyhost in proxyhosts: for proxyhost in proxyhosts:
c = {'host': proxyhost['host']} c = {'host': proxyhost['host']}
c['candidate_id'] = conn.connection.getAnID() c['candidate_id'] = self.connection.connection.getAnID()
c['port'] = proxyhost['port'] c['port'] = proxyhost['port']
c['type'] = 'proxy' c['type'] = 'proxy'
c['jid'] = self.ourjid c['jid'] = self.ourjid