merge

src/common/jingle.py

@@ -38,6 +38,7 @@ from jingle_session import JingleSession, JingleStates
 if gajim.HAVE_FARSIGHT:
     from jingle_rtp import JingleAudio, JingleVideo
 from jingle_ft import JingleFileTransfer
+from jingle_transport import JingleTransportSocks5, JingleTransportIBB
 
 import logging
 logger = logging.getLogger('gajim.c.jingle')
@@ -78,11 +79,11 @@ class ConnectionJingle(object):
         """
         # get data
         jid = helpers.get_full_jid_from_iq(stanza)
-        id = stanza.getID()
+        id_ = stanza.getID()
 
-        if (jid, id) in self.__iq_responses.keys():
+        if (jid, id_) in self.__iq_responses.keys():
-            self.__iq_responses[(jid, id)].on_stanza(stanza)
+            self.__iq_responses[(jid, id_)].on_stanza(stanza)
-            del self.__iq_responses[(jid, id)]
+            del self.__iq_responses[(jid, id_)]
             raise xmpp.NodeProcessed
 
         jingle = stanza.getTag('jingle')
@@ -93,7 +94,7 @@ class ConnectionJingle(object):
         else:
             sid = None
             for sesn in self._sessions.values():
-                if id in sesn.iq_ids:
+                if id_ in sesn.iq_ids:
                     sesn.on_stanza(stanza)
             return
 
@@ -101,14 +102,15 @@ class ConnectionJingle(object):
         if sid not in self._sessions:
             #TODO: tie-breaking and other things...
             newjingle = JingleSession(con=self, weinitiate=False, jid=jid,
-                iq_id=id, sid=sid)
+                iq_id=id_, sid=sid)
             self._sessions[sid] = newjingle
 
         # we already have such session in dispatcher...
-        self._sessions[sid].collect_iq_id(id)
+        self._sessions[sid].collect_iq_id(id_)
         self._sessions[sid].on_stanza(stanza)
         # Delete invalid/unneeded sessions
-        if sid in self._sessions and self._sessions[sid].state == JingleStates.ended:
+        if sid in self._sessions and \
+        self._sessions[sid].state == JingleStates.ended:
             self.delete_jingle_session(sid)
 
         raise xmpp.NodeProcessed
@@ -149,8 +151,12 @@ class ConnectionJingle(object):
         jingle = JingleSession(self, weinitiate=True, jid=jid)
         self._sessions[jingle.sid] = jingle
         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)
 		c.hash_algo = self.__hash_support(contact) 
         jingle.add_content('file' + helpers.get_random_string_16(), c)
         jingle.start_session()
@@ -172,13 +178,16 @@ class ConnectionJingle(object):
 
     def iter_jingle_sessions(self, jid, sid=None, media=None):
         if sid:
-            return (session for session in self._sessions.values() if session.sid == sid)
+            return (session for session in self._sessions.values() if \
-        sessions = (session for session in self._sessions.values() if session.peerjid == jid)
+                session.sid == sid)
+        sessions = (session for session in self._sessions.values() if \
+            session.peerjid == jid)
         if media:
             if media not in ('audio', 'video', 'file'):
                 return tuple()
             else:
-                return (session for session in sessions if session.get_content(media))
+                return (session for session in sessions if \
+                    session.get_content(media))
         else:
             return sessions
 

src/common/jingle_ft.py

@@ -22,7 +22,8 @@ Handles  Jingle File Transfer (XEP 0234)
 import gajim
 import xmpp
 from jingle_content import contents, JingleContent
-from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5, JingleTransportIBB, TransportType
+from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5
+from jingle_transport import JingleTransportIBB, TransportType
 from common import helpers
 from common.socks5 import Socks5ReceiverClient, Socks5SenderClient
 from common.connection_handlers_events import FileRequestReceivedEvent
@@ -286,11 +287,11 @@ class JingleFileTransfer(JingleContent):
     def __start_IBB_transfer(self, con):
         con.files_props[self.file_props['sid']] = self.file_props
         fp = open(self.file_props['file-name'], 'r')
-        con.OpenStream( self.transport.sid, self.session.peerjid,
+        con.OpenStream( self.transport.sid, self.session.peerjid, fp,
-                            fp,    blocksize=4096)
+            blocksize=4096)
 
-    def __transport_setup(self, stanza=None, content=None, error=None
+    def __transport_setup(self, stanza=None, content=None, error=None,
-                     , action=None):
+    action=None):
         # Sets up a few transport specific things for the file transfer
         if self.transport.type == TransportType.SOCKS5:
             self._listen_host()
@@ -467,13 +468,10 @@ class JingleFileTransfer(JingleContent):
                 gajim.socks5queue.idx += 1
                 idx = gajim.socks5queue.idx
                 sockobj = Socks5SenderClient(gajim.idlequeue, idx,
-                                       gajim.socks5queue, 
+                    gajim.socks5queue, _sock=None,
-                                       _sock=None,
                     host=str(streamhost_used['host']),
-                                       port=int(streamhost_used['port']),
+                    port=int(streamhost_used['port']), fingerprint=None,
-                                       fingerprint=None, 
+                    connected=False, file_props=self.file_props)
-                                       connected=False, 
-                                       file_props=self.file_props)
             else:
                 sockobj = Socks5ReceiverClient(gajim.idlequeue, streamhost_used,
                     sid=self.file_props['sid'],

src/common/protocol/bytestream.py

@@ -957,13 +957,17 @@ class ConnectionIBBytestream(ConnectionBytestream):
         log.debug('StreamCloseHandler called sid->%s' % sid)
         # look in sending files
         if sid in self.files_props.keys():
-            conn.send(stanza.buildReply('result'))
+            reply = stanza.buildReply('result')
+            reply.delChild('close')
+            conn.send(reply)
             gajim.socks5queue.complete_transfer_cb(self.name, self.files_props[sid])
             del self.files_props[sid]
         # look in receiving files
         elif gajim.socks5queue.get_file_props(self.name, sid):
             file_props = gajim.socks5queue.get_file_props(self.name, sid)
-            conn.send(stanza.buildReply('result'))
+            reply = stanza.buildReply('result')
+            reply.delChild('close')
+            conn.send(reply)
             file_props['fp'].close()
             gajim.socks5queue.complete_transfer_cb(self.name, file_props)
             gajim.socks5queue.remove_file_props(self.name, sid)
@@ -1003,6 +1007,7 @@ class ConnectionIBBytestream(ConnectionBytestream):
             if stanza.getTag('data'):
                 if self.IBBMessageHandler(conn, stanza):
                     reply = stanza.buildReply('result')
+                    reply.delChild('data')
                     conn.send(reply)
                     raise xmpp.NodeProcessed
             elif syn_id == self.last_sent_ibb_id: