Changeset 259edd4 for protocols/jabber/iq.c

Timestamp:

2006-10-12T17:48:58Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a4effbf

Parents:

b56b220

Message:

Special message when the XMPP session is ended because of a concurrent
login, and now sending proper error responses to IQ packets we can't
handle.

File:

• protocols/jabber/iq.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -30 +30 @@
         struct xt_node *c, *reply = NULL;
         char *type, *s;
-        int st;
+        int st, pack = 1;
         
         type = xt_find_attr( node, "type" );
@@ -101 +101 @@
                 {
                         xt_free_node( reply );
-                        reply = NULL;
-                }
-                
-                /* If we recognized the xmlns and managed to generate a reply,
-                   finish and send it. */
-                if( reply )
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        pack = 0;
+                }
+        }
+        else if( strcmp( type, "set" ) == 0 )
+        {
+                xt_free_node( reply );
+                reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                pack = 0;
+        }
+        
+        /* If we recognized the xmlns and managed to generate a reply,
+           finish and send it. */
+        if( reply )
+        {
+                /* Normally we still have to pack it into an iq-result
+                   packet, but for errors, for example, we don't. */
+                if( pack )
                 {
                         reply = jabber_make_packet( "iq", "result", xt_find_attr( node, "from" ), reply );
                         if( ( s = xt_find_attr( node, "id" ) ) )
                                 xt_add_attr( reply, "id", s );
-                        
-                        st = jabber_write_packet( gc, reply );
-                        xt_free_node( reply );
-                        if( !st )
-                                return XT_ABORT;
-                }
+                }
+                
+                st = jabber_write_packet( gc, reply );
+                xt_free_node( reply );
+                if( !st )
+                        return XT_ABORT;
         }