Changeset 08135df for protocols/jabber/conference.c

Timestamp:

2007-12-04T01:08:43Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

793cc25

Parents:

fa30fa5 (diff), aaf92a9 (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:

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
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/conference.c (modified) (5 diffs)

protocols/jabber/conference.c

@@ -24 +24 @@
 #include "jabber.h"
 
+static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
 struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password )
 {
@@ -35 +37 @@
         xt_add_attr( node, "xmlns", XMLNS_MUC );
         node = jabber_make_packet( "presence", NULL, roomjid, node );
+        jabber_cache_add( ic, node, jabber_chat_join_failed );
         
         if( !jabber_write_packet( ic, node ) )
         {
                 g_free( roomjid );
-                xt_free_node( node );
                 return NULL;
         }
-        xt_free_node( node );
         
         jc = g_new0( struct jabber_chat, 1 );
@@ -63 +64 @@
         
         return c;
+}
+
+static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct jabber_error *err;
+        struct jabber_buddy *bud;
+        char *room;
+        
+        room = xt_find_attr( orig, "to" );
+        if( ( bud = jabber_buddy_by_jid( ic, room, 0 ) ) )
+                jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
+        
+        err = jabber_error_parse( xt_find_node( node->children, "error" ), XMLNS_STANZA_ERROR );
+        if( err )
+        {
+                imcb_error( ic, "Error joining groupchat %s: %s%s%s",
+                            bud->bare_jid, err->code, err->text ? ": " : "",
+                            err->text ? err->text : "" );
+                jabber_error_free( err );
+        }
+        
+        return XT_HANDLED;
+}
+
+struct groupchat *jabber_chat_by_jid( 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;
 }
 
@@ -148 +188 @@
         char *s;
         
-        if( ( chat = jabber_chat_by_name( ic, bud->bare_jid ) ) == NULL )
+        if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )
@@ -250 +290 @@
                 return;
         }
-        else if( ( chat = jabber_chat_by_name( ic, bud->bare_jid ) ) == NULL )
+        else if( ( chat = jabber_chat_by_jid( ic, bud->bare_jid ) ) == NULL )
         {
                 /* How could this happen?? We could do kill( self, 11 )