Changeset 8076ec0 for protocols/jabber/jabber_util.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/jabber_util.c (modified) (3 diffs)

protocols/jabber/jabber_util.c

@@ -183 +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;
 }
 
@@ -595 +625 @@
 }
 
-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 )
 {
@@ -663 +676 @@
 struct jabber_error *jabber_error_parse( struct xt_node *node, char *xmlns )
 {
-        struct jabber_error *err = g_new0( struct jabber_error, 1 );
+        struct jabber_error *err;
         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" );