Changeset 8651 for branches/gajim_0.11.1/src/common

Timestamp:

08/31/07 09:57:39 (15 months ago)

Author:

asterix

Message:

send stream:features in zeroconf network, and send stanza only when other part reply to stream initialization. fixes #3057

Files:

• branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py (modified) (3 diffs)

branches/gajim_0.11.1/src/common/zeroconf/client_zeroconf.py

@@ -159 +159 @@
                 dispatcher_nb.Dispatcher().PlugIn(self)
                 self._register_handlers()
-                if self.sock_type == TYPE_CLIENT:
-                        while self.stanzaqueue:
-                                stanza, is_message = self.stanzaqueue.pop(0)
-                                self.send(stanza, is_message)
 
         def StreamInit(self):
@@ -179 +175 @@
                 self.Dispatcher._metastream = Node('stream:stream')
                 self.Dispatcher._metastream.setNamespace(self.Namespace)
-                # XXX TLS support
                 self.Dispatcher._metastream.setAttr('version', '1.0')
                 self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS)
@@ -198 +193 @@
                                 self.to = attrs['from']
                         self.send_stream_header()
+                        if attrs.has_key('version') and attrs['version'] == '1.0':
+                                # other part supports stream features
+                                features = Node('stream:features')
+                                features.T.mechanisms.setNamespace(NS_SASL)
+                                features.T.mechanisms.NT.mechanism = 'PLAIN'
+                                self.Dispatcher.send(features)
+                        while self.stanzaqueue:
+                                stanza, is_message = self.stanzaqueue.pop(0)
+                                self.send(stanza, is_message)
+                elif self.sock_type == TYPE_CLIENT:
                         while self.stanzaqueue:
                                 stanza, is_message = self.stanzaqueue.pop(0)