Changeset 85693e6 for protocols/jabber/jabber_util.c

Timestamp:

2010-03-21T16:17:24Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0cb71a6

Parents:

81ee561 (diff), 767a148 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in killerbee stuff (just file transfers and maybe a few things from
mainline). Once I add ft support glue to protocols/purple/ I guess this will
all go into killerbee.

File:

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

protocols/jabber/jabber_util.c

@@ -99 +99 @@
 }
 
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code )
 {
         struct xt_node *node, *c;
@@ -111 +111 @@
         c = xt_new_node( "error", NULL, c );
         xt_add_attr( c, "type", err_type );
+        
+        /* Add the error code, if present */
+        if (err_code)
+                xt_add_attr( c, "code", err_code );
         
         /* To make the actual error packet, we copy the original packet and