Changeset 8076ec0 for protocols/jabber/iq.c

Timestamp:

2007-12-05T01:30:50Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

dc0ba9c

Parents:

dce3903 (diff), 793cc25 (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:

merges from upstream/release

ulim 2007-12-04 Follow rename of jabber_chat_by_jid from upstrem

ulim 2007-12-04 Merged in current devel
Wilmer van der Gaast 2007-12-02 Imported setuid() patch from Simo Leone <simo@archlinux...> with some
Wilmer van der Gaast 2007-12-02 Forgot to return something in jabber_chat_join_failed().
Wilmer van der Gaast 2007-12-02 Merging a change I should've pulled before committing three other changes.
Wilmer van der Gaast 2007-12-02 Added charset checks on incoming msgs (from the IRC side) to prevent possible
Wilmer van der Gaast 2007-12-02 Handling of presence-error packets (only useful for groupchats now), moved
Wilmer van der Gaast 2007-12-02 Defining DEBUG via CFLAGS so that it'll always be there, even when a file
ulim 2007-12-04 Jabber file transfer now also with sending! You can't use a proxy yet when
Wilmer van der Gaast 2007-12-02 Removed retarded printf() (ARGH) and moved the event handling handling of
Wilmer van der Gaast 2007-11-29 printf() in daemons considered harmful.
Wilmer van der Gaast 2007-11-28 Fixed the epoll+ForkDaemon combination. The libevent event handling

File:

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

protocols/jabber/iq.c

@@ -31 +31 @@
 {
         struct im_connection *ic = data;
-        struct jabber_data *jd = ic->proto_data;
         struct xt_node *c, *reply = NULL;
         char *type, *s;
@@ -47 +46 @@
         if( strcmp( type, "result" ) == 0 || strcmp( type, "error" ) == 0 )
         {
-                struct jabber_cache_entry *entry;
-                
-                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 IQ-%s packet with unknown/expired ID %s!", type, s );
-                else if( entry->func )
-                        return entry->func( ic, node, entry->node );
+                return jabber_cache_handle_packet( ic, node );
         }
         else if( strcmp( type, "get" ) == 0 )