Changeset 9625 for trunk/src/common/zeroconf/connection_handlers_zeroconf.py

Timestamp:

05/13/08 03:59:10 (6 months ago)

Author:

bct

Message:

merged in session-centric branch, with fixes for OTR compatibility

Files:

• trunk/src/common/zeroconf/connection_handlers_zeroconf.py (modified) (2 diffs)

trunk/src/common/zeroconf/connection_handlers_zeroconf.py

@@ -659 +659 @@
                 jid  = frm
 
-                session = self.get_session(frm, thread_id, mtype)
+                session = self.get_or_create_session(frm, thread_id, mtype)
 
                 if thread_id and not session.received_thread_id:
@@ -795 +795 @@
                 raise common.xmpp.NodeProcessed
 
-        def get_session(self, jid, thread_id, type):
+        def terminate_sessions(self):
+                '''send termination messages and delete all active sessions'''
+                # XXX
+                pass
+
+        def get_or_create_session(self, jid, thread_id, type):
                 '''returns an existing session between this connection and 'jid', returns a new one if none exist.'''
                 session = self.find_session(jid, thread_id, type)