Changeset 0d3f30f for protocols/jabber/presence.c

Timestamp:

2006-11-12T23:06:08Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

16b5f86

Parents:

47d3ac4

Message:

Improved handling of JIDs: Bare JIDs are allowed (*sigh*) and case
insensitivity. Probably not complete yet...

File:

• protocols/jabber/presence.c (modified) (4 diffs)

protocols/jabber/presence.c

@@ -38 +38 @@
         if( type == NULL )
         {
-                if( ( s = strchr( from, '/' ) ) == NULL )
+                if( !( bud = jabber_buddy_by_jid( gc, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
-                        char *s = xt_to_string( node );
-                        serv_got_crap( gc, "WARNING: Ignoring presence tag with bare JID: %s", s );
-                        g_free( s );
+                        serv_got_crap( gc, "WARNING: Could not handle presence information from JID: %s", from );
                         return XT_HANDLED;
-                }
-                
-                if( !( bud = jabber_buddy_by_jid( gc, from ) ) )
-                {
-                        /* FOR NOW, s still contains the location of the /.
-                           Keep this in mind when changing things here. :-) */
-                        
-                        /* We check if the buddy is in the contact list,
-                           because Jabber servers seem to like to send
-                           presence information of buddies we removed
-                           from our list sometimes, for example... */
-                        
-                        *s = 0;
-                        if( find_buddy( gc, from ) == NULL )
-                        {
-                                *s = '/';
-                                serv_got_crap( gc, "WARNING: Ignoring presence information from unknown JID: %s", from );
-                                return XT_HANDLED;
-                        }
-                        *s = '/';
-                        
-                        bud = jabber_buddy_add( gc, from );
                 }
                 
@@ -89 +65 @@
                         bud->priority = 0;
                 
-                serv_got_update( gc, bud->handle, 1, 0, 0, 0,
+                serv_got_update( gc, bud->bare_jid, 1, 0, 0, 0,
                                  bud->away_state ? UC_UNAVAILABLE : 0, 0 );
         }
         else if( strcmp( type, "unavailable" ) == 0 )
         {
-                char *s;
-                
-                if( ( s = strchr( from, '/' ) ) == NULL )
-                {
-                        char *s = xt_to_string( node );
-                        serv_got_crap( gc, "WARNING: Ignoring presence tag with bare JID: %s\n", s );
-                        g_free( s );
-                        return XT_HANDLED;
-                }
-                
-                if( jabber_buddy_by_jid( gc, from ) == NULL )
+                if( jabber_buddy_by_jid( gc, from, GET_BUDDY_EXACT ) == NULL )
                 {
                         serv_got_crap( gc, "WARNING: Received presence information from unknown JID: %s", from );
@@ -111 +77 @@
                 
                 jabber_buddy_remove( gc, from );
-                *s = 0;
                 
-                /* Only count this as offline if there's no other resource
-                   available anymore. */
-                if( jabber_buddy_by_jid( gc, from ) == NULL )
+                if( ( s = strchr( from, '/' ) ) )
+                {
+                        *s = 0;
+                
+                        /* Only count this as offline if there's no other resource
+                           available anymore. */
+                        if( jabber_buddy_by_jid( gc, from, 0 ) == NULL )
+                                serv_got_update( gc, from, 0, 0, 0, 0, 0, 0 );
+                        
+                        *s = '/';
+                }
+                else
+                {
                         serv_got_update( gc, from, 0, 0, 0, 0, 0, 0 );
-                
-                *s = '/';
+                }
         }
         else if( strcmp( type, "subscribe" ) == 0 )
@@ -126 +100 @@
         else if( strcmp( type, "subscribed" ) == 0 )
         {
+                /* Not sure about this one, actually... */
                 serv_got_crap( gc, "%s just accepted your authorization request", from );
         }