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

handle ft_send_local_ips option with jingle FT

Browse source
This commit is contained in:
Yann Leboulanger 2012-06-14 19:46:17 +02:00
parent 503c7dc515
commit 0493997a24
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/jingle_transport.py
View file

@ -78,7 +78,7 @@ class JingleTransport(object):
Return the list of transport candidates from a transport stanza Return the list of transport candidates from a transport stanza
""" """
return [] return []
def set_connection(self, conn): def set_connection(self, conn):
self.connection = conn self.connection = conn
if not self.sid: if not self.sid:
@ -89,7 +89,7 @@ class JingleTransport(object):
def set_our_jid(self, jid): def set_our_jid(self, jid):
self.ourjid = jid self.ourjid = jid
def set_sid(self, sid): def set_sid(self, sid):
self.sid = sid self.sid = sid
@ -168,6 +168,9 @@ class JingleTransportSocks5(JingleTransport):
self.candidates.append(cand) self.candidates.append(cand)
def _add_local_ips_as_candidates(self): def _add_local_ips_as_candidates(self):
if not gajim.config.get_per('accounts', self.connection.name,
'ft_send_local_ips'):
return
if not self.connection: if not self.connection:
return return
local_ip_cand = [] local_ip_cand = []
@ -259,7 +262,7 @@ class JingleTransportSocks5(JingleTransport):
self.file_props.session_sid) self.file_props.session_sid)
if sesn is None: if sesn is None:
return return
iq = xmpp.Iq(to=proxy['jid'], frm=self.ourjid, typ='set') iq = xmpp.Iq(to=proxy['jid'], frm=self.ourjid, typ='set')
auth_id = "au_" + proxy['sid'] auth_id = "au_" + proxy['sid']
iq.setID(auth_id) iq.setID(auth_id)
@ -321,7 +324,7 @@ class JingleTransportIBB(JingleTransport):
transport.setAttr('block-size', self.block_sz) transport.setAttr('block-size', self.block_sz)
transport.setAttr('sid', self.sid) transport.setAttr('sid', self.sid)
return transport return transport
try: try:
import farstream import farstream
except Exception: except Exception: