Changeset ebb95b6 for protocols/jabber

Timestamp:

2007-11-14T23:42:07Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

50e1776

Parents:

a6df0b5 (diff), 1bf1ae6 (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 from devel/Jelmer.

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• presence.c (modified) (1 diff)
• xmltree.c (modified) (2 diffs)

protocols/jabber/io.c

@@ -470 +470 @@
 }
 
-static xt_status jabber_pkt_misc( struct xt_node *node, gpointer data )
-{
-        printf( "Received unknown packet:\n" );
-        xt_print( node );
-        
-        return XT_HANDLED;
-}
-
 static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
 {
@@ -509 +501 @@
         { "success",            "stream:stream",        sasl_pkt_result },
         { "failure",            "stream:stream",        sasl_pkt_result },
-        { NULL,                 "stream:stream",        jabber_pkt_misc },
         { NULL,                 NULL,                   NULL }
 };

protocols/jabber/presence.c

@@ -170 +170 @@
                 /* What else to do with it? */
         }
-        else
-        {
-                printf( "Received PRES from %s:\n", from );
-                xt_print( node );
-        }
         
         return XT_HANDLED;

protocols/jabber/xmltree.c

@@ -305 +305 @@
 }
 
+#ifdef DEBUG
 void xt_print( struct xt_node *node )
 {
@@ -355 +356 @@
         printf( "</%s>\n", node->name );
 }
+#endif
 
 struct xt_node *xt_dup( struct xt_node *node )