Changes in protocols/jabber/jabber_util.c [5bd21df:2ff2076]

File:

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

protocols/jabber/jabber_util.c

@@ -97 +97 @@
 }
 
-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;
@@ -109 +109 @@
         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
@@ -179 +183 @@
                 return FALSE;
         }
-}
-
-xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *node )
-{
-        struct jabber_data *jd = ic->proto_data;
-        struct jabber_cache_entry *entry;
-        char *s;
-        
-        if( ( s = xt_find_attr( node, "id" ) ) == NULL ||
-            strncmp( s, jd->cached_id_prefix, strlen( jd->cached_id_prefix ) ) != 0 )
-        {
-                /* Silently ignore it, without an ID (or a non-cache
-                   ID) we don't know how to handle the packet and we
-                   probably don't have to. */
-                return XT_HANDLED;
-        }
-        
-        entry = g_hash_table_lookup( jd->node_cache, s );
-        
-        if( entry == NULL )
-        {
-                imcb_log( ic, "WARNING: Received %s-%s packet with unknown/expired ID %s!",
-                              node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
-        }
-        else if( entry->func )
-        {
-                return entry->func( ic, node, entry->node );
-        }
-        
-        return XT_HANDLED;
 }
 
@@ -291 +265 @@
         new = g_new( char, len + 1 );
         for( i = 0; i < len; i ++ )
+        {
+                /* don't normalize the resource */
+                if( orig[i] == '/' )
+                        break;
                 new[i] = tolower( orig[i] );
+        }
+        for( ; i < len; i ++ )
+                new[i] = orig[i];
         
         new[i] = 0;
@@ -614 +595 @@
 }
 
+struct groupchat *jabber_chat_by_name( struct im_connection *ic, const char *name )
+{
+        char *normalized = jabber_normalize( name );
+        struct groupchat *ret;
+        struct jabber_chat *jc;
+        
+        for( ret = ic->groupchats; ret; ret = ret->next )
+        {
+                jc = ret->data;
+                if( strcmp( normalized, jc->name ) == 0 )
+                        break;
+        }
+        g_free( normalized );
+        
+        return ret;
+}
+
 time_t jabber_get_timestamp( struct xt_node *xt )
 {
@@ -665 +663 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns )
 {
-        struct jabber_error *err;
+        struct jabber_error *err = g_new0( struct jabber_error, 1 );
         struct xt_node *c;
         char *s;
         
-        if( node == NULL )
-                return NULL;
-        
-        err = g_new0( struct jabber_error, 1 );
         err->type = xt_find_attr( node, "type" );