Changes in / [cbaac62:8c4afbfa]

Files:

• bitlbee.c (modified) (3 diffs)
• irc.c (modified) (4 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (3 diffs)
• nick.c (modified) (3 diffs)
• nick.h (modified) (1 diff)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/conference.c (added)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/iq.c (modified) (3 diffs)
• protocols/jabber/jabber.c (modified) (7 diffs)
• protocols/jabber/jabber.h (modified) (7 diffs)
• protocols/jabber/jabber_util.c (modified) (12 diffs)
• protocols/jabber/message.c (modified) (5 diffs)
• protocols/jabber/presence.c (modified) (7 diffs)
• protocols/jabber/xmltree.c (modified) (4 diffs)
• protocols/jabber/xmltree.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (1 diff)
• protocols/nogaim.c (modified) (12 diffs)
• protocols/nogaim.h (modified) (5 diffs)
• protocols/oscar/oscar.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (6 diffs)
• root_commands.c (modified) (3 diffs)
• user.c (modified) (1 diff)

bitlbee.c

@@ -70 +70 @@
 #ifdef IPV6
         memset( &listen_addr6, 0, sizeof( listen_addr6 ) );
+        memset( &listen_addr, 0, sizeof( listen_addr ) );
         listen_addr6.sin6_family = AF_INET6;
         listen_addr6.sin6_port = htons( global.conf->port );
@@ -77 +78 @@
                 use_ipv6 = 0;
 #endif
-                memset( &listen_addr, 0, sizeof( listen_addr ) );
                 listen_addr.sin_family = AF_INET;
                 listen_addr.sin_port = htons( global.conf->port );
@@ -125 +125 @@
                         exit( 0 );
                 
-                chdir( "/" );
+//              chdir( "/" );
                 
                 /* Sometimes std* are already closed (for example when we're in a RESTARTed

irc.c

@@ -658 +658 @@
                 }
         }
-        else if( ( c = chat_by_channel( channel ) ) )
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
         {
                 GList *l;
@@ -811 +811 @@
         else
         {
-                struct groupchat *c = chat_by_channel( channel );
+                struct groupchat *c = irc_chat_by_channel( irc, channel );
                 
                 if( c )
@@ -949 +949 @@
         if( *nick == '#' || *nick == '&' )
         {
-                if( !( c = chat_by_channel( nick ) ) )
+                if( !( c = irc_chat_by_channel( irc, nick ) ) )
                 {
                         irc_reply( irc, 403, "%s :Channel does not exist", nick );
@@ -1215 +1215 @@
         return TRUE;
 }
+
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel )
+{
+        struct groupchat *c;
+        account_t *a;
+        
+        /* This finds the connection which has a conversation which belongs to this channel */
+        for( a = irc->accounts; a; a = a->next )
+        {
+                if( a->ic == NULL )
+                        continue;
+                
+                c = a->ic->groupchats;
+                while( c )
+                {
+                        if( c->channel && g_strcasecmp( c->channel, channel ) == 0 )
+                                return c;
+                        
+                        c = c->next;
+                }
+        }
+        
+        return NULL;
+}

irc.h

@@ -140 +140 @@
 
 void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
+struct groupchat *irc_chat_by_channel( irc_t *irc, char *channel );
 
 #endif

irc_commands.c

@@ -144 +144 @@
                 irc_join( irc, u, irc->channel );
         }
-        else if( ( c = chat_by_channel( cmd[1] ) ) )
+        else if( ( c = irc_chat_by_channel( irc, cmd[1] ) ) )
         {
                 user_t *u = user_find( irc, irc->nick );
@@ -201 +201 @@
 {
         char *nick = cmd[1], *channel = cmd[2];
-        struct groupchat *c = chat_by_channel( channel );
+        struct groupchat *c = irc_chat_by_channel( irc, channel );
         user_t *u = user_find( irc, nick );
         
@@ -287 +287 @@
                         u = u->next;
                 }
-        else if( ( c = chat_by_channel( channel ) ) )
+        else if( ( c = irc_chat_by_channel( irc, channel ) ) )
                 for( l = c->in_room; l; l = l->next )
                 {

nick.c

@@ -57 +57 @@
         static char nick[MAX_NICK_LENGTH+1];
         char *store_handle, *found_nick;
-        int inf_protection = 256;
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
@@ -82 +81 @@
         }
         g_free( store_handle );
+        
+        /* Make sure the nick doesn't collide with an existing one by adding
+           underscores and that kind of stuff, if necessary. */
+        nick_dedupe( acc, handle, nick );
+        
+        return nick;
+}
+
+void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] )
+{
+        int inf_protection = 256;
         
         /* Now, find out if the nick is already in use at the moment, and make
@@ -120 +130 @@
                 }
         }
-        
-        return nick;
 }
 

nick.h

@@ -26 +26 @@
 void nick_set( account_t *acc, const char *handle, const char *nick );
 char *nick_get( account_t *acc, const char *handle );
+void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+1] );
 int nick_saved( account_t *acc, const char *handle );
 void nick_del( account_t *acc, const char *handle );

protocols/jabber/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o
 
 CFLAGS += -Wall

protocols/jabber/io.c

@@ -44 +44 @@
         struct jabber_data *jd = ic->proto_data;
         gboolean ret;
+        
+        if( jd->flags & JFLAG_XMLCONSOLE )
+        {
+                char *msg;
+                
+                msg = g_strdup_printf( "TX: %s", buf );
+                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
+                g_free( msg );
+        }
         
         if( jd->tx_len == 0 )
@@ -484 +493 @@
 }
 
+static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
+{
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( jd->flags & JFLAG_XMLCONSOLE )
+        {
+                char *msg, *pkt;
+                
+                pkt = xt_to_string( node );
+                msg = g_strdup_printf( "RX: %s", pkt );
+                imcb_buddy_msg( ic, JABBER_XMLCONSOLE_HANDLE, msg, 0, 0 );
+                g_free( msg );
+                g_free( pkt );
+        }
+        
+        return XT_NEXT;
+}
+
 static const struct xt_handler_entry jabber_handlers[] = {
+        { NULL,                 "stream:stream",        jabber_xmlconsole },
         { "stream:stream",      "<root>",               jabber_end_of_stream },
         { "message",            "stream:stream",        jabber_pkt_message },

protocols/jabber/iq.c

@@ -99 +99 @@
                 else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
                 {
+                        const char *features[] = { XMLNS_VERSION,
+                                                   XMLNS_TIME,
+                                                   XMLNS_CHATSTATES,
+                                                   XMLNS_MUC,
+                                                   NULL };
+                        const char **f;
+                        
                         c = xt_new_node( "identity", NULL, NULL );
                         xt_add_attr( c, "category", "client" );
@@ -105 +112 @@
                         xt_add_child( reply, c );
                         
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_VERSION );
-                        xt_add_child( reply, c );
-                        
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_TIME );
-                        xt_add_child( reply, c );
-                        
-                        c = xt_new_node( "feature", NULL, NULL );
-                        xt_add_attr( c, "var", XMLNS_CHATSTATES );
-                        xt_add_child( reply, c );
-                        
-                        /* Later this can be useful to announce things like
-                           MUC support. */
+                        for( f = features; *f; f ++ )
+                        {
+                                c = xt_new_node( "feature", NULL, NULL );
+                                xt_add_attr( c, "var", *f );
+                                xt_add_child( reply, c );
+                        }
                 }
                 else
@@ -373 +372 @@
                                                                    group->text : NULL );
                                 
-                                imcb_rename_buddy( ic, jid, name );
+                                if( name )
+                                        imcb_rename_buddy( ic, jid, name );
                         }
                         else if( strcmp( sub, "remove" ) == 0 )
                         {
-                                /* Don't have any API call for this yet! So let's
-                                   just try to handle this as well as we can. */
                                 jabber_buddy_remove_bare( ic, jid );
-                                imcb_buddy_status( ic, jid, 0, NULL, NULL );
-                                /* FIXME! */
+                                imcb_remove_buddy( ic, jid, NULL );
                         }
                 }

protocols/jabber/jabber.c

@@ -197 +197 @@
         jabber_end_stream( ic );
         
+        while( ic->groupchats )
+                jabber_chat_free( ic->groupchats );
+        
         if( jd->r_inpa >= 0 )
                 b_event_remove( jd->r_inpa );
@@ -224 +227 @@
         struct jabber_buddy *bud;
         struct xt_node *node;
+        char *s;
         int st;
         
-        bud = jabber_buddy_by_jid( ic, who, 0 );
+        if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
+                return jabber_write( ic, message, strlen( message ) );
+        
+        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_name( ic, s + 1 ) )
+                bud = jabber_buddy_by_ext_jid( ic, who, 0 );
+        else
+                bud = jabber_buddy_by_jid( ic, who, 0 );
         
         node = xt_new_node( "body", message, NULL );
@@ -311 +321 @@
 static void jabber_add_buddy( struct im_connection *ic, char *who, char *group )
 {
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
+        {
+                jd->flags |= JFLAG_XMLCONSOLE;
+                imcb_add_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
+                return;
+        }
+        
         if( jabber_add_to_roster( ic, who, NULL ) )
                 presence_send_request( ic, who, "subscribe" );
@@ -317 +336 @@
 static void jabber_remove_buddy( struct im_connection *ic, char *who, char *group )
 {
+        struct jabber_data *jd = ic->proto_data;
+        
+        if( g_strcasecmp( who, JABBER_XMLCONSOLE_HANDLE ) == 0 )
+        {
+                jd->flags &= ~JFLAG_XMLCONSOLE;
+                /* Not necessary for now. And for now the code isn't too
+                   happy if the buddy is completely gone right after calling
+                   this function already.
+                imcb_remove_buddy( ic, JABBER_XMLCONSOLE_HANDLE, NULL );
+                */
+                return;
+        }
+        
         /* We should always do this part. Clean up our administration a little bit. */
         jabber_buddy_remove_bare( ic, who );
@@ -322 +354 @@
         if( jabber_remove_from_roster( ic, who ) )
                 presence_send_request( ic, who, "unsubscribe" );
+}
+
+static struct groupchat *jabber_chat_join_( struct im_connection *ic, char *room, char *nick, char *password )
+{
+        if( strchr( room, '@' ) == NULL )
+                imcb_error( ic, "Invalid room name: %s", room );
+        else if( jabber_chat_by_name( ic, room ) )
+                imcb_error( ic, "Already present in chat `%s'", room );
+        else
+                return jabber_chat_join( ic, room, nick, password );
+        
+        return NULL;
+}
+
+static void jabber_chat_msg_( struct groupchat *c, char *message, int flags )
+{
+        if( c && message )
+                jabber_chat_msg( c, message, flags );
+}
+
+static void jabber_chat_leave_( struct groupchat *c )
+{
+        if( c )
+                jabber_chat_leave( c, NULL );
 }
 
@@ -388 +444 @@
         ret->buddy_msg = jabber_buddy_msg;
         ret->away_states = jabber_away_states;
-//      ret->get_status_string = jabber_get_status_string;
         ret->set_away = jabber_set_away;
 //      ret->set_info = jabber_set_info;
@@ -394 +449 @@
         ret->add_buddy = jabber_add_buddy;
         ret->remove_buddy = jabber_remove_buddy;
-//      ret->chat_msg = jabber_chat_msg;
+        ret->chat_msg = jabber_chat_msg_;
 //      ret->chat_invite = jabber_chat_invite;
-//      ret->chat_leave = jabber_chat_leave;
-//      ret->chat_open = jabber_chat_open;
+        ret->chat_leave = jabber_chat_leave_;
+        ret->chat_join = jabber_chat_join_;
         ret->keepalive = jabber_keepalive;
         ret->send_typing = jabber_send_typing;

protocols/jabber/jabber.h

@@ -32 +32 @@
 typedef enum
 {
-        JFLAG_STREAM_STARTED = 1,       /* Set when we detected the beginning of the stream
+        JFLAG_STREAM_STARTED = 1,       /* Set when we detected the beginning of the stream
                                            and want to do auth. */
-        JFLAG_AUTHENTICATED = 2,        /* Set when we're successfully authenticatd. */
-        JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
+        JFLAG_AUTHENTICATED = 2,        /* Set when we're successfully authenticatd. */
+        JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
                                            SASL or TLS). */
-        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
+        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
                                            before we continue. */
-        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
-        JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
+        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
+        JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
                                            activates all XEP-85 related code. */
+        JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
 } jabber_flags_t;
 
@@ -50 +51 @@
         JBFLAG_DOES_XEP85 = 2,          /* Set this when the resource seems to support
                                            XEP85 (typing notification shite). */
+        JBFLAG_IS_CHATROOM = 4,         /* It's convenient to use this JID thingy for
+                                           groupchat state info too. */
+        JBFLAG_IS_ANONYMOUS = 8,        /* For anonymous chatrooms, when we don't have
+                                           have a real JID. */
 } jabber_buddy_flags_t;
-
-#define JABBER_PORT_DEFAULT "5222"
-#define JABBER_PORT_MIN 5220
-#define JABBER_PORT_MAX 5229
 
 struct jabber_data
@@ -101 +102 @@
         char *resource;
         
+        char *ext_jid; /* The JID to use in BitlBee. The real JID if possible, */
+                       /* otherwise something similar to the conference JID. */
+        
         int priority;
         struct jabber_away_state *away_state;
@@ -110 +114 @@
         struct jabber_buddy *next;
 };
+
+struct jabber_chat
+{
+        int flags;
+        char *name;
+        char *my_full_jid; /* Separate copy because of case sensitivity. */
+        struct jabber_buddy *me;
+};
+
+#define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
+
+#define JABBER_PORT_DEFAULT "5222"
+#define JABBER_PORT_MIN 5220
+#define JABBER_PORT_MAX 5229
 
 /* Prefixes to use for packet IDs (mainly for IQ packets ATM). Usually the
@@ -132 +150 @@
 #define XMLNS_TIME         "jabber:iq:time"                     /* XEP-0090 */
 #define XMLNS_VCARD        "vcard-temp"                         /* XEP-0054 */
+#define XMLNS_DELAY        "jabber:x:delay"                     /* XEP-0091 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"  /* 0085 */
 #define XMLNS_DISCOVER     "http://jabber.org/protocol/disco#info"  /* 0030 */
+#define XMLNS_MUC          "http://jabber.org/protocol/muc"     /* XEP-0045 */
+#define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"/* XEP-0045 */
 
 /* iq.c */
@@ -164 +185 @@
 const struct jabber_away_state *jabber_away_state_by_name( char *name );
 void jabber_buddy_ask( struct im_connection *ic, char *handle );
-char *jabber_normalize( char *orig );
+char *jabber_normalize( const char *orig );
 
 typedef enum
 {
         GET_BUDDY_CREAT = 1,    /* Try to create it, if necessary. */
-        GET_BUDDY_EXACT = 2,    /* Get an exact message (only makes sense with bare JIDs). */
+        GET_BUDDY_EXACT = 2,    /* Get an exact match (only makes sense with bare JIDs). */
+        GET_BUDDY_FIRST = 4,    /* No selection, simply get the first resource for this JID. */
 } get_buddy_flags_t;
 
 struct jabber_buddy *jabber_buddy_add( struct im_connection *ic, char *full_jid );
 struct jabber_buddy *jabber_buddy_by_jid( struct im_connection *ic, char *jid, get_buddy_flags_t flags );
+struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *jid, get_buddy_flags_t flags );
 int jabber_buddy_remove( struct im_connection *ic, char *full_jid );
 int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid );
+struct groupchat *jabber_chat_by_name( struct im_connection *ic, const char *name );
+time_t jabber_get_timestamp( struct xt_node *xt );
 
 extern const struct jabber_away_state jabber_away_state_list[];
@@ -193 +218 @@
 gboolean sasl_supported( struct im_connection *ic );
 
+/* conference.c */
+struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
+void jabber_chat_free( struct groupchat *c );
+int jabber_chat_msg( struct groupchat *ic, char *message, int flags );
+int jabber_chat_leave( struct groupchat *c, const char *reason );
+void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
+void jabber_chat_pkt_message( struct im_connection *ic, struct jabber_buddy *bud, struct xt_node *node );
+
 #endif

protocols/jabber/jabber_util.c

@@ -48 +48 @@
                    call p_s_u() now to send the new prio setting, it would
                    send the old setting because the set->value gets changed
-                   when the eval returns a non-NULL value.
+                   after the (this) eval returns a non-NULL value.
                    
                    So now I can choose between implementing post-set
@@ -129 +129 @@
 /* Cache a node/packet for later use. Mainly useful for IQ packets if you need
    them when you receive the response. Use this BEFORE sending the packet so
-   it'll get a new id= tag, and do NOT free() the packet after writing it! */
+   it'll get a new id= tag, and do NOT free() the packet after sending it! */
 void jabber_cache_add( struct im_connection *ic, struct xt_node *node, jabber_cache_event func )
 {
@@ -252 +252 @@
 
 /* Returns a new string. Don't leak it! */
-char *jabber_normalize( char *orig )
+char *jabber_normalize( const char *orig )
 {
         int len, i;
@@ -320 +320 @@
         else
         {
+                /* Keep in mind that full_jid currently isn't really
+                   a full JID... */
                 new->bare_jid = g_strdup( full_jid );
                 g_hash_table_insert( jd->buddies, new->bare_jid, new );
@@ -333 +335 @@
         {
                 /* Let's waste some more bytes of RAM instead of to make
-                   memory management a total disaster here.. */
+                   memory management a total disaster here. And it saves
+                   me one g_free() call in this function. :-P */
                 new->full_jid = full_jid;
         }
@@ -353 +356 @@
         if( ( s = strchr( jid, '/' ) ) )
         {
+                int none_found = 0;
+                
                 *s = 0;
                 if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
@@ -370 +375 @@
                         }
                 }
-                
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) )
+                else
+                {
+                        /* This hack is there to make sure that O_CREAT will
+                           work if there's already another resouce present
+                           for this JID, even if it's an unknown buddy. This
+                           is done to handle conferences properly. */
+                        none_found = 1;
+                }
+                
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && ( imcb_find_buddy( ic, jid ) || !none_found ) )
                 {
                         *s = '/';
@@ -418 +431 @@
 }
 
+/* I'm keeping a separate ext_jid attribute to save a JID that makes sense
+   to export to BitlBee. This is mainly for groupchats right now. It's
+   a bit of a hack, but I just think having the user nickname in the hostname
+   part of the hostmask doesn't look nice on IRC. Normally you can convert
+   a normal JID to ext_jid by swapping the part before and after the / and
+   replacing the / with a =. But there should be some stripping (@s are
+   allowed in Jabber nicks...). */
+struct jabber_buddy *jabber_buddy_by_ext_jid( struct im_connection *ic, char *jid_, get_buddy_flags_t flags )
+{
+        struct jabber_buddy *bud;
+        char *s, *jid;
+        
+        jid = jabber_normalize( jid_ );
+        
+        if( ( s = strchr( jid, '=' ) ) == NULL )
+                return NULL;
+        
+        for( bud = jabber_buddy_by_jid( ic, s + 1, GET_BUDDY_FIRST ); bud; bud = bud->next )
+        {
+                /* Hmmm, could happen if not all people in the chat are anonymized? */
+                if( bud->ext_jid == NULL )
+                        continue;
+                
+                if( strcmp( bud->ext_jid, jid ) == 0 )
+                        break;
+        }
+        
+        g_free( jid );
+        
+        return bud;
+}
+
 /* Remove one specific full JID from our list. Use this when a buddy goes
    off-line (because (s)he can still be online from a different location.
@@ -441 +486 @@
                         g_hash_table_remove( jd->buddies, bud->bare_jid );
                         g_free( bud->bare_jid );
+                        g_free( bud->ext_jid );
                         g_free( bud->full_jid );
                         g_free( bud->away_message );
@@ -473 +519 @@
                                         g_hash_table_replace( jd->buddies, bi->bare_jid, bi->next );
                                 
+                                g_free( bi->ext_jid );
                                 g_free( bi->full_jid );
                                 g_free( bi->away_message );
@@ -495 +542 @@
    specified bare JID. Use this when removing someone from the contact
    list, for example. */
-int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid_ )
+int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid )
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *next;
-        char *bare_jid;
-        
-        if( strchr( bare_jid_, '/' ) )
+        
+        if( strchr( bare_jid, '/' ) )
                 return 0;
         
-        bare_jid = jabber_normalize( bare_jid_ );
-        
-        if( ( bud = g_hash_table_lookup( jd->buddies, bare_jid ) ) )
+        if( ( bud = jabber_buddy_by_jid( ic, bare_jid, GET_BUDDY_FIRST ) ) )
         {
                 /* Most important: Remove the hash reference. We don't know
                    this buddy anymore. */
                 g_hash_table_remove( jd->buddies, bud->bare_jid );
+                g_free( bud->bare_jid );
                 
                 /* Deallocate the linked list of resources. */
                 while( bud )
                 {
+                        /* ext_jid && anonymous means that this buddy is
+                           specific to one groupchat (the one we're
+                           currently cleaning up) so it can be deleted
+                           completely. */
+                        if( bud->ext_jid && bud->flags & JBFLAG_IS_ANONYMOUS )
+                                imcb_remove_buddy( ic, bud->ext_jid, NULL );
+                        
                         next = bud->next;
+                        g_free( bud->ext_jid );
                         g_free( bud->full_jid );
                         g_free( bud->away_message );
@@ -522 +575 @@
                 }
                 
-                g_free( bare_jid );
                 return 1;
         }
         else
         {
-                g_free( bare_jid );
                 return 0;
         }
 }
+
+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 )
+{
+        struct tm tp, utc;
+        struct xt_node *c;
+        time_t res, tres;
+        char *s = NULL;
+        
+        for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
+        {
+                if( ( s = xt_find_attr( c, "xmlns" ) ) && strcmp( s, XMLNS_DELAY ) == 0 )
+                        break;
+        }
+        
+        if( !c || !( s = xt_find_attr( c, "stamp" ) ) )
+                return 0;
+        
+        memset( &tp, 0, sizeof( tp ) );
+        if( sscanf( s, "%4d%2d%2dT%2d:%2d:%2d", &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
+                                                &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
+                return 0;
+        
+        tp.tm_year -= 1900;
+        tp.tm_mon --;
+        tp.tm_isdst = -1; /* GRRRRRRRRRRR */
+        
+        res = mktime( &tp );
+        /* Problem is, mktime() just gave us the GMT timestamp for the
+           given local time... While the given time WAS NOT local. So
+           we should fix this now.
+        
+           Now I could choose between messing with environment variables
+           (kludgy) or using timegm() (not portable)... Or doing the
+           following, which I actually prefer... */
+        gmtime_r( &res, &utc );
+        utc.tm_isdst = -1; /* Once more: GRRRRRRRRRRRRRRRRRR!!! */
+        if( utc.tm_hour == tp.tm_hour && utc.tm_min == tp.tm_min )
+                /* Sweet! We're in UTC right now... */
+                return res;
+        
+        tres = mktime( &utc );
+        res += res - tres;
+        
+        /* Yes, this is a hack. And it will go wrong around DST changes.
+           BUT this is more likely to be threadsafe than messing with
+           environment variables, and possibly more portable... */
+        
+        return res;
+}

protocols/jabber/message.c

@@ -30 +30 @@
         char *type = xt_find_attr( node, "type" );
         struct xt_node *body = xt_find_node( node->children, "body" ), *c;
+        struct jabber_buddy *bud = NULL;
         char *s;
+        
+        if( !from )
+                return XT_HANDLED; /* Consider this packet corrupted. */
+        
+        bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT );
         
         if( type && strcmp( type, "error" ) == 0 )
@@ -36 +42 @@
                 /* Handle type=error packet. */
         }
-        else if( type && strcmp( type, "groupchat" ) == 0 )
+        else if( type && from && strcmp( type, "groupchat" ) == 0 )
         {
-                /* TODO! */
+                jabber_chat_pkt_message( ic, bud, node );
         }
         else /* "chat", "normal", "headline", no-type or whatever. Should all be pretty similar. */
         {
-                struct jabber_buddy *bud = NULL;
                 GString *fullmsg = g_string_new( "" );
                 
                 if( ( s = strchr( from, '/' ) ) )
                 {
-                        if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) )
+                        if( bud )
+                        {
                                 bud->last_act = time( NULL );
+                                from = bud->ext_jid ? : bud->bare_jid;
+                        }
                         else
                                 *s = 0; /* We need to generate a bare JID now. */
@@ -76 +84 @@
                 
                 if( fullmsg->len > 0 )
-                        imcb_buddy_msg( ic, bud ? bud->bare_jid : from, fullmsg->str, 0, 0 );
+                        imcb_buddy_msg( ic, from, fullmsg->str,
+                                        0, jabber_get_timestamp( node ) );
                 
                 g_string_free( fullmsg, TRUE );
@@ -84 +93 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_TYPING );
+                        imcb_buddy_typing( ic, from, OPT_TYPING );
                 }
                 /* No need to send a "stopped typing" signal when there's a message. */
@@ -90 +99 @@
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, 0 );
+                        imcb_buddy_typing( ic, from, 0 );
                 }
                 else if( xt_find_node( node->children, "paused" ) )
                 {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing( ic, bud ? bud->bare_jid : from, OPT_THINKING );
+                        imcb_buddy_typing( ic, from, OPT_THINKING );
                 }
                 

protocols/jabber/presence.c

@@ -31 +31 @@
         struct xt_node *c;
         struct jabber_buddy *bud;
+        int is_chat = 0, is_away = 0;
         char *s;
         
@@ -36 +37 @@
                 return XT_HANDLED;
         
+        if( ( s = strchr( from, '/' ) ) )
+        {
+                *s = 0;
+                if( jabber_chat_by_name( ic, from ) )
+                        is_chat = 1;
+                *s = '/';
+        }
+        
         if( type == NULL )
         {
-                int is_away = 0;
-                
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
@@ -72 +79 @@
                         bud->priority = 0;
                 
-                if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
+                if( is_chat )
+                        jabber_chat_pkt_presence( ic, bud, node );
+                else if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
                         imcb_buddy_status( ic, bud->bare_jid, OPT_LOGGED_IN | is_away,
                                            ( is_away && bud->away_state ) ? bud->away_state->full_name : NULL,
@@ -79 +88 @@
         else if( strcmp( type, "unavailable" ) == 0 )
         {
-                if( jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) == NULL )
+                if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) == NULL )
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
@@ -86 +95 @@
                 }
                 
+                /* Handle this before we delete the JID. */
+                if( is_chat )
+                {
+                        jabber_chat_pkt_presence( ic, bud, node );
+                }
+                
                 jabber_buddy_remove( ic, from );
                 
-                if( ( s = strchr( from, '/' ) ) )
+                if( is_chat )
+                {
+                        /* Nothing else to do for now? */
+                }
+                else if( ( s = strchr( from, '/' ) ) )
                 {
                         *s = 0;
                 
-                        /* Only count this as offline if there's no other resource
-                           available anymore. */
-                        if( jabber_buddy_by_jid( ic, from, 0 ) == NULL )
+                        /* If another resource is still available, send its presence
+                           information. */
+                        if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) )
+                        {
+                                if( bud->away_state && ( *bud->away_state->code == 0 ||
+                                    strcmp( bud->away_state->code, "chat" ) == 0 ) )
+                                        is_away = OPT_AWAY;
+                                
+                                imcb_buddy_status( ic, bud->bare_jid, OPT_LOGGED_IN | is_away,
+                                                   ( is_away && bud->away_state ) ? bud->away_state->full_name : NULL,
+                                                   bud->away_message );
+                        }
+                        else
+                        {
+                                /* Otherwise, count him/her as offline now. */
                                 imcb_buddy_status( ic, from, 0, NULL, NULL );
+                        }
                         
                         *s = '/';
@@ -145 +177 @@
         char *show = jd->away_state->code;
         char *status = jd->away_message;
+        struct groupchat *c;
         int st;
         
@@ -156 +189 @@
         st = jabber_write_packet( ic, node );
         
+        /* Have to send this update to all groupchats too, the server won't
+           do this automatically. */
+        for( c = ic->groupchats; c && st; c = c->next )
+        {
+                struct jabber_chat *jc = c->data;
+                
+                xt_add_attr( node, "to", jc->my_full_jid );
+                st = jabber_write_packet( ic, node );
+        }
+        
         xt_free_node( node );
         return st;

protocols/jabber/xmltree.c

@@ -442 +442 @@
    list, not the node itself! The reason you have to do this by hand: So
    that you can also use this function as a find-next. */
-struct xt_node *xt_find_node( struct xt_node *node, char *name )
+struct xt_node *xt_find_node( struct xt_node *node, const char *name )
 {
         while( node )
@@ -455 +455 @@
 }
 
-char *xt_find_attr( struct xt_node *node, char *key )
+char *xt_find_attr( struct xt_node *node, const char *key )
 {
         int i;
@@ -524 +524 @@
 }
 
-void xt_add_attr( struct xt_node *node, char *key, char *value )
+void xt_add_attr( struct xt_node *node, const char *key, const char *value )
 {
         int i;
@@ -551 +551 @@
 }
 
-int xt_remove_attr( struct xt_node *node, char *key )
+int xt_remove_attr( struct xt_node *node, const char *key )
 {
         int i, last;

protocols/jabber/xmltree.h

@@ -87 +87 @@
 void xt_free_node( struct xt_node *node );
 void xt_free( struct xt_parser *xt );
-struct xt_node *xt_find_node( struct xt_node *node, char *name );
-char *xt_find_attr( struct xt_node *node, char *key );
+struct xt_node *xt_find_node( struct xt_node *node, const char *name );
+char *xt_find_attr( struct xt_node *node, const char *key );
 
 struct xt_node *xt_new_node( char *name, char *text, struct xt_node *children );
 void xt_add_child( struct xt_node *parent, struct xt_node *child );
-void xt_add_attr( struct xt_node *node, char *key, char *value );
-int xt_remove_attr( struct xt_node *node, char *key );
+void xt_add_attr( struct xt_node *node, const char *key, const char *value );
+int xt_remove_attr( struct xt_node *node, const char *key );
 
 #endif

protocols/msn/sb.c

@@ -232 +232 @@
         if( sb->chat )
         {
-                imcb_chat_removed( sb->chat );
+                imcb_chat_free( sb->chat );
         }
         

protocols/nogaim.c

@@ -289 +289 @@
 {
         irc_t *irc = ic->irc;
-        user_t *t, *u = irc->users;
+        user_t *t, *u;
         account_t *a;
         
@@ -306 +306 @@
         b_event_remove( ic->inpa );
         
+        u = irc->users;
         while( u )
         {
@@ -428 +429 @@
 {
         user_t *u = user_findhandle( ic, handle );
-        char *s, newnick[MAX_NICK_LENGTH+1];
         
         if( !u || !realname ) return;
@@ -440 +440 @@
                 if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
-                
-                if( !u->online && !nick_saved( ic->acc, handle ) )
-                {
-                        /* Detect numeric handles: */
-                        for( s = u->user; isdigit( *s ); s++ );
+        }
+}
+
+void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
+{
+        user_t *u;
+        
+        if( ( u = user_findhandle( ic, handle ) ) )
+                user_del( ic->irc, u->nick );
+}
+
+/* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
+   modules to suggest a nickname for a handle. */
+void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
+{
+        user_t *u = user_findhandle( ic, handle );
+        char newnick[MAX_NICK_LENGTH+1], *orig_nick;
+        
+        if( u && !u->online && !nick_saved( ic->acc, handle ) )
+        {
+                /* Only do this if the person isn't online yet (which should
+                   be the case if we just added it) and if the user hasn't
+                   assigned a nickname to this buddy already. */
+                
+                strncpy( newnick, nick, MAX_NICK_LENGTH );
+                newnick[MAX_NICK_LENGTH] = 0;
+                
+                /* Some processing to make sure this string is a valid IRC nickname. */
+                nick_strip( newnick );
+                if( set_getbool( &ic->irc->set, "lcnicks" ) )
+                        nick_lc( newnick );
+                
+                if( strcmp( u->nick, newnick ) != 0 )
+                {
+                        /* Only do this if newnick is different from the current one.
+                           If rejoining a channel, maybe we got this nick already
+                           (and dedupe would only add an underscore. */
+                        nick_dedupe( ic->acc, handle, newnick );
                         
-                        if( *s == 0 )
-                        {
-                                /* If we reached the end of the string, it only contained numbers.
-                                   Seems to be an ICQ# then, so hopefully realname contains
-                                   something more useful. */
-                                strcpy( newnick, realname );
-                                
-                                /* Some processing to make sure this string is a valid IRC nickname. */
-                                nick_strip( newnick );
-                                if( set_getbool( &ic->irc->set, "lcnicks" ) )
-                                        nick_lc( newnick );
-                                
-                                u->nick = g_strdup( newnick );
-                        }
-                }
-        }
-}
-
+                        /* u->nick will be freed halfway the process, so it can't be
+                           passed as an argument. */
+                        orig_nick = g_strdup( u->nick );
+                        user_rename( ic->irc, orig_nick, newnick );
+                        g_free( orig_nick );
+                }
+        }
+}
 
 /* prpl.c */
@@ -554 +577 @@
                 u->online = 0;
                 
-                /* Remove him/her from the conversations to prevent PART messages after he/she QUIT already */
-                for( c = ic->conversations; c; c = c->next )
+                /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
+                for( c = ic->groupchats; c; c = c->next )
                         remove_chat_buddy_silent( c, (char*) handle );
         }
@@ -685 +708 @@
 }
 
-void imcb_chat_removed( struct groupchat *c )
+void imcb_chat_free( struct groupchat *c )
 {
         struct im_connection *ic = c->ic;
-        struct groupchat *l = NULL;
+        struct groupchat *l;
         GList *ir;
         
@@ -708 +731 @@
                 }
                 
+                /* Find the previous chat in the linked list. */
+                for( l = ic->groupchats; l && l->next != c; l = l->next );
+                
                 if( l )
                         l->next = c->next;
                 else
-                        ic->conversations = c->next;
+                        ic->groupchats = c->next;
                 
                 for( ir = c->in_room; ir; ir = ir->next )
@@ -749 +775 @@
         /* This one just creates the conversation structure, user won't see anything yet */
         
-        if( ic->conversations )
-        {
-                for( c = ic->conversations; c->next; c = c->next );
+        if( ic->groupchats )
+        {
+                for( c = ic->groupchats; c->next; c = c->next );
                 c = c->next = g_new0( struct groupchat, 1 );
         }
         else
-                ic->conversations = c = g_new0( struct groupchat, 1 );
+                ic->groupchats = c = g_new0( struct groupchat, 1 );
         
         c->ic = ic;
@@ -804 +830 @@
 }
 
+/* This function is one BIG hack... :-( EREWRITE */
 void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
 {
@@ -815 +842 @@
         if( g_strcasecmp( handle, b->ic->acc->user ) == 0 )
         {
+                if( b->joined == 0 )
+                        return;
+                
                 u = user_find( b->ic->irc, b->ic->irc->nick );
                 b->joined = 0;
@@ -824 +854 @@
         }
         
-        if( remove_chat_buddy_silent( b, handle ) )
-                if( ( b->joined || me ) && u )
-                        irc_part( b->ic->irc, u, b->channel );
+        if( me || ( remove_chat_buddy_silent( b, handle ) && b->joined && u ) )
+                irc_part( b->ic->irc, u, b->channel );
 }
 
@@ -852 +881 @@
 
 /* Misc. BitlBee stuff which shouldn't really be here */
-
-struct groupchat *chat_by_channel( char *channel )
-{
-        struct im_connection *ic;
-        struct groupchat *c;
-        GSList *l;
-        
-        /* This finds the connection which has a conversation which belongs to this channel */
-        for( l = connections; l; l = l->next )
-        {
-                ic = l->data;
-                for( c = ic->conversations; c && g_strcasecmp( c->channel, channel ) != 0; c = c->next );
-                if( c )
-                        return c;
-        }
-        
-        return NULL;
-}
 
 char *set_eval_away_devoice( set_t *set, char *value )

protocols/nogaim.h

@@ -61 +61 @@
 #define OPT_AWAY        0x00000004
 #define OPT_DOES_HTML   0x00000010
+#define OPT_LOCALBUDDY  0x00000020 /* For nicks local to one groupchat */
 #define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
 #define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
@@ -91 +92 @@
         irc_t *irc;
         
-        struct groupchat *conversations;
+        struct groupchat *groupchats;
 };
 
@@ -97 +98 @@
         struct im_connection *ic;
 
-        /* stuff used just for chat */
         GList *in_room;
         GList *ignored;
         
-        /* BitlBee */
         struct groupchat *next;
         char *channel;
@@ -195 +194 @@
 G_MODULE_EXPORT struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle );
 G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname );
+G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick );
 
 /* Buddy activity */
@@ -208 +208 @@
 G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason );
 G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at );
-G_MODULE_EXPORT void imcb_chat_removed( struct groupchat *c );
-struct groupchat *chat_by_channel( char *channel );
+G_MODULE_EXPORT void imcb_chat_free( struct groupchat *c );
 
 /* Actions, or whatever. */

protocols/oscar/oscar.c

@@ -2022 +2022 @@
                                         
                                         if (realname) {
+                                                imcb_buddy_nick_hint(ic, curitem->name, realname);
                                                 imcb_rename_buddy(ic, curitem->name, realname);
                                                 g_free(realname);
@@ -2514 +2515 @@
 
         /* Notify the conversation window that we've left the chat */
-        imcb_chat_removed(cc->cnv);
+        imcb_chat_free(cc->cnv);
 
         /* Destroy the chat_connection */

protocols/yahoo/yahoo.c

@@ -145 +145 @@
         GSList *l;
         
-        while( ic->conversations )
-                imcb_chat_removed( ic->conversations );
+        while( ic->groupchats )
+                imcb_chat_free( ic->groupchats );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -318 +318 @@
         
         yahoo_conference_logoff( yd->y2_id, NULL, c->data, c->title );
-        imcb_chat_removed( c );
+        imcb_chat_free( c );
 }
 
@@ -798 +798 @@
 {
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
-        imcb_chat_removed( inv->c );
+        imcb_chat_free( inv->c );
         g_free( inv->name );
         g_free( inv );
@@ -841 +841 @@
         struct groupchat *c;
         
-        for( c = ic->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
@@ -853 +853 @@
         struct groupchat *c;
         
-        for( c = ic->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
@@ -865 +865 @@
         struct groupchat *c;
         
-        for( c = ic->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )

root_commands.c

@@ -912 +912 @@
         if( cmd[3] )
         {
-                channel = g_strdup( cmd[3] );
+                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
+                        channel = g_strdup_printf( "&%s", cmd[3] );
+                else
+                        channel = g_strdup( cmd[3] );
         }
         else
@@ -918 +921 @@
                 char *s;
                 
-                channel = g_strdup( chat );
+                channel = g_strdup_printf( "&%s", chat );
                 if( ( s = strchr( channel, '@' ) ) )
                         *s = 0;
@@ -924 +927 @@
         if( cmd[3] && cmd[4] )
                 nick = cmd[4];
+        else
+                nick = irc->nick;
         if( cmd[3] && cmd[4] && cmd[5] )
                 password = cmd[5];
         
-        c = a->prpl->chat_join( ic, chat, nick, password );
-        
-        g_free( channel );
+        if( !nick_ok( channel + 1 ) )
+        {
+                irc_usermsg( irc, "Invalid channel name: %s", channel );
+                g_free( channel );
+                return;
+        }
+        else if( g_strcasecmp( channel, irc->channel ) == 0 || irc_chat_by_channel( irc, channel ) )
+        {
+                irc_usermsg( irc, "Channel already exists: %s", channel );
+                g_free( channel );
+                return;
+        }
+        
+        if( ( c = a->prpl->chat_join( ic, chat, nick, password ) ) )
+        {
+                g_free( c->channel );
+                c->channel = channel;
+        }
+        else
+        {
+                irc_usermsg( irc, "Tried to join chat, not sure if this was successful" );
+                g_free( channel );
+        }
 }
 

user.c

@@ -161 +161 @@
 }
 
+/* DO NOT PASS u->nick FOR oldnick !!! */
 void user_rename( irc_t *irc, char *oldnick, char *newnick )
 {