Changeset 9064

Timestamp:

11/28/07 20:26:40 (12 months ago)

Author:

bct

Message:

fixed use of common.xmpp namespace in a place it wasn't imported

Location:

trunk/src

Files:

• common/stanza_session.py (modified) (2 diffs)
• gajim.py (modified) (1 diff)

trunk/src/common/stanza_session.py

@@ -585 +585 @@
 
                 feature.addChild(node=x)
-                
+
                 if not_acceptable:
                         response = xmpp.Error(response, xmpp.ERR_NOT_ACCEPTABLE)
@@ -854 +854 @@
         def acknowledge_termination(self):
                 StanzaSession.acknowledge_termination(self)
-                
+
                 self.enable_encryption = False
 
-        def fail_bad_negotiation(self, reason):
-                '''they've tried to feed us a bogus value, send an error and cancel everything.'''
+        def fail_bad_negotiation(self, reason, fields = None):
+                '''sends an error and cancels everything.
+
+if fields == None, the remote party has given us a bad cryptographic value of some kind
+
+otherwise, list the fields we haven't implemented'''
 
                 err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED)
                 err.T.error.T.text.setData(reason)
+
+                if fields:
+                        feature = xmpp.Node(xmpp.NS_FEATURE + ' feature')
+
+                        for field in fields:
+                                fn = xmpp.Node('field')
+                                fn['var'] = field
+                                feature.addChild(node=feature)
+
+                        err.addChild(node=feature)
+
                 self.send(err)
 

trunk/src/gajim.py

@@ -1899 +1899 @@
                                         # we don't support 3-message negotiation as the responder
                                         if 'dhkeys' in form.asDict():
-                                                err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED)
-
-                                                feature = xmpp.Node(xmpp.NS_FEATURE + ' feature')
-                                                field = xmpp.Node('field')
-                                                field['var'] = 'dhkeys'
-
-                                                feature.addChild(node=field)
-                                                err.addChild(node=feature)
-
-                                                session.send(err)
+                                                session.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',))
                                                 return