Changeset 2942 for trunk/src/common/connection.py

Timestamp:

08/10/05 17:59:55 (3 years ago)

Author:

dkirov

Message:

proper disconnect routines

Files:

• trunk/src/common/connection.py (modified) (4 diffs)

trunk/src/common/connection.py

@@ -524 +524 @@
                 except: # this bytestream result is not what we need
                         pass
-                if streamhost is None: 
-                        # proxy approves the activate query
-                        raise common.xmpp.NodeProcessed
-                jid = streamhost.getAttr('jid')
                 id = real_id[3:]
                 if self.files_props.has_key(id):
@@ -533 +529 @@
                 else:
                         raise common.xmpp.NodeProcessed
-                        file_props['type']
+                if streamhost is None: 
+                        # proxy approves the activate query
+                        if real_id[:3] == 'au_':
+                                id = real_id[3:]
+                                if not file_props.has_key('streamhost-used') or \
+                                        file_props['streamhost-used'] is False:
+                                        raise common.xmpp.NodeProcessed
+                                if not file_props.has_key('proxyhosts'):
+                                        raise common.xmpp.NodeProcessed
+                                for host in file_props['proxyhosts']:
+                                        if host['initiator'] == frm and \
+                                        str(query.getAttr('sid')) == file_props['sid']:
+                                                gajim.socks5queue.activate_proxy(host['idx'])
+                                                break
+                        raise common.xmpp.NodeProcessed
+                jid = streamhost.getAttr('jid')
                 if file_props.has_key('streamhost-used') and \
                         file_props['streamhost-used'] is True:
@@ -570 +581 @@
                 raise common.xmpp.NodeProcessed
         
+        def remove_all_transfers(self):
+                ''' stops and removes all active connections from the socks5 pool '''
+                for file_props in self.files_props.values():
+                        self.remove_transfer(file_props, remove_from_list = False)
+                del(self.files_props)
+                self.files_props = {}
+        
+        def remove_transfer(self, file_props, remove_from_list = True):
+                if file_props.has_key('hash'):
+                        gajim.socks5queue.remove_sender(file_props['hash'])
+                
+                if file_props.has_key('streamhosts'):
+                        for host in file_props['streamhosts']:
+                                if host['idx'] > 0:
+                                        gajim.socks5queue.remove_receiver(host['idx'])
+                                        gajim.socks5queue.remove_sender(host['idx'])
+                sid = file_props['sid']
+                gajim.socks5queue.remove_file_props(self.name, sid)
+                
+                if remove_from_list:
+                        if self.files_props.has_key('sid'):
+                                del(self.files_props['sid'])
+                                
+        def disconnect_transfer(self, file_props):
+                if file_props.has_key('hash'):
+                        gajim.socks5queue.remove_sender(file_props['hash'])
+                
+                if file_props.has_key('streamhosts'):
+                        for host in file_props['streamhosts']:
+                                if host['idx'] > 0:
+                                        gajim.socks5queue.remove_receiver(host['idx'])
+                                        gajim.socks5queue.remove_sender(host['idx'])
+                        
         def proxy_auth_ok(self, proxy):
                 '''cb, called after authentication to proxy server '''
@@ -1385 +1429 @@
                                 if msg:
                                         p.setStatus(msg)
+                                self.remove_all_transfers()
                                 if self.connection:
                                         self.connection.send(p)