Skip to content
Snippets Groups Projects
Commit 07cb1253 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

send file using IBB directly if receiver don't support socks5

parent 8bbca8a0
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,7 @@ from jingle_session import JingleSession, JingleStates ...@@ -38,6 +38,7 @@ from jingle_session import JingleSession, JingleStates
if gajim.HAVE_FARSIGHT: if gajim.HAVE_FARSIGHT:
from jingle_rtp import JingleAudio, JingleVideo from jingle_rtp import JingleAudio, JingleVideo
from jingle_ft import JingleFileTransfer from jingle_ft import JingleFileTransfer
from jingle_transport import JingleTransportSocks5, JingleTransportIBB
import logging import logging
logger = logging.getLogger('gajim.c.jingle') logger = logging.getLogger('gajim.c.jingle')
...@@ -150,8 +151,12 @@ class ConnectionJingle(object): ...@@ -150,8 +151,12 @@ class ConnectionJingle(object):
jingle = JingleSession(self, weinitiate=True, jid=jid) jingle = JingleSession(self, weinitiate=True, jid=jid)
self._sessions[jingle.sid] = jingle self._sessions[jingle.sid] = jingle
file_props['sid'] = jingle.sid file_props['sid'] = jingle.sid
c = JingleFileTransfer(jingle, file_props=file_props, if contact.supports(xmpp.NS_JINGLE_BYTESTREAM):
use_security=use_security) transport = JingleTransportSocks5()
elif contact.supports(xmpp.NS_JINGLE_IBB):
transport = JingleTransportIBB()
c = JingleFileTransfer(jingle, transport=transport,
file_props=file_props, use_security=use_security)
jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.add_content('file' + helpers.get_random_string_16(), c)
jingle.start_session() jingle.start_session()
return c.transport.sid return c.transport.sid
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment