Changes in protocols/yahoo/yahoo.c [56699f0:c495217]

File:

• protocols/yahoo/yahoo.c (modified) (22 diffs)

protocols/yahoo/yahoo.c

@@ -2 +2 @@
  * libyahoo2 wrapper to BitlBee
  *
- * Mostly Copyright 2004 Wilmer van der Gaast <wilmer@gaast.net>
+ * Mostly Copyright 2004-2010 Wilmer van der Gaast <wilmer@gaast.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -271 +271 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        
-        yahoo_add_buddy( yd->y2_id, who, group ? group : BYAHOO_DEFAULT_GROUP, NULL );
+        bee_user_t *bu;
+        
+        if( group && ( bu = bee_user_by_handle( ic->bee, ic, who ) ) && bu->group )
+        {
+                GSList *bgl;
+                
+                /* If the person is in our list already, this is a group change. */
+                yahoo_change_buddy_group( yd->y2_id, who, bu->group->name, group );
+                
+                /* No idea how often people have people in multiple groups and
+                   BitlBee doesn't currently support this anyway .. but keep
+                   this struct up-to-date for now. */
+                for( bgl = yd->buddygroups; bgl; bgl = bgl->next )
+                {
+                        struct byahoo_buddygroups *bg = bgl->data;
+                        
+                        if( g_strcasecmp( bg->buddy, who ) == 0 &&
+                            g_strcasecmp( bg->group, bu->group->name ) == 0 )
+                        {
+                                g_free( bg->group );
+                                bg->group = g_strdup( group );
+                        }
+                }
+        }
+        else
+                yahoo_add_buddy( yd->y2_id, who, group ? group : BYAHOO_DEFAULT_GROUP, NULL );
 }
 
@@ -341 +365 @@
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
         
-        yahoo_accept_buddy_ymsg13( yd->y2_id, NULL, who );
+        yahoo_confirm_buddy( yd->y2_id, who, 0, "" );
 }
 
@@ -348 +372 @@
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
         
-        yahoo_reject_buddy_ymsg13( yd->y2_id, NULL, who, NULL );
+        yahoo_confirm_buddy( yd->y2_id, who, 1, "" );
 }
 
@@ -421 +445 @@
         }
         
-        d->callback( d->fd, 0, d->data );
+        d->callback( NULL + d->fd, 0, d->data );
         g_free( d );
 }
@@ -441 +465 @@
                 return FALSE;
         
-        yahoo_read_ready( d->id, d->fd, d->data );
+        yahoo_read_ready( d->id, NULL + d->fd, d->data );
         
         return TRUE;
@@ -458 +482 @@
         struct byahoo_write_ready_data *d = data;
         
-        return yahoo_write_ready( d->id, d->fd, d->data );
+        return yahoo_write_ready( d->id, NULL + d->fd, d->data );
 }
 
@@ -487 +511 @@
         {
                 char *errstr;
-                int allow_reconnect = TRUE;
+                int allow_reconnect = FALSE;
                 
                 yd->logged_in = FALSE;
@@ -497 +521 @@
                 else if( succ == YAHOO_LOGIN_LOCK )
                         errstr = "Yahoo! account locked";
+                else if( succ == 1236 )
+                        errstr = "Yahoo! account locked or machine temporarily banned";
                 else if( succ == YAHOO_LOGIN_DUPL )
+                        errstr = "Logged in on a different machine or device";
+                else if( succ == YAHOO_LOGIN_SOCK )
                 {
-                        errstr = "Logged in on a different machine or device";
-                        allow_reconnect = FALSE;
+                        errstr = "Socket problem";
+                        allow_reconnect = TRUE;
                 }
-                else if( succ == YAHOO_LOGIN_SOCK )
-                        errstr = "Socket problem";
                 else
                         errstr = "Unknown error";
@@ -606 +632 @@
                 flags = 0;
                 break;
-        case YAHOO_STATUS_NOTIFY:
-                state_string = "Notify";
-                break;
         }
         
@@ -615 +638 @@
         if( stat == YAHOO_STATUS_IDLE )
                 imcb_buddy_times( ic, who, 0, idle );
+}
+
+void ext_yahoo_got_buzz( int id, const char *me, const char *who, long tm )
+{
 }
 
@@ -630 +657 @@
 }
 
-void ext_yahoo_got_file( int id,
-                         const char *ignored,
-                         const char *who, const char *url, long expires, const char *msg, const char *fname, unsigned long fesize )
+void ext_yahoo_got_file( int id, const char *ignored, const char *who, const char *msg,
+                         const char *fname, unsigned long fesize, char *trid )
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
         imcb_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
+}
+
+void ext_yahoo_got_ft_data( int id, const unsigned char *in, int len, void *data )
+{
+}
+
+void ext_yahoo_file_transfer_done( int id, int result, void *data )
+{
 }
 
@@ -649 +683 @@
 }
 
-void ext_yahoo_system_message( int id, const char *msg )
+void ext_yahoo_system_message( int id, const char *me, const char *who, const char *msg )
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
@@ -671 +705 @@
 
 /* TODO: Clear up the mess of inp and d structures */
-int ext_yahoo_add_handler( int id, int fd, yahoo_input_condition cond, void *data )
+int ext_yahoo_add_handler( int id, void *fd_, yahoo_input_condition cond, void *data )
 {
         struct byahoo_input_data *inp = g_new0( struct byahoo_input_data, 1 );
+        int fd = (int) fd_;
         
         if( cond == YAHOO_INPUT_READ )
@@ -700 +735 @@
         {
                 g_free( inp );
-                return( -1 );
+                return -1;
                 /* Panic... */
         }
         
         byahoo_inputs = g_slist_append( byahoo_inputs, inp );
-        return( inp->h );
+        return inp->h;
 }
 
@@ -729 +764 @@
 }
 
-int ext_yahoo_connect_async( int id, const char *host, int port, yahoo_connect_callback callback, void *data )
+int ext_yahoo_connect_async( int id, const char *host, int port, yahoo_connect_callback callback, void *data, int use_ssl )
 {
         struct byahoo_connect_callback_data *d;
@@ -745 +780 @@
         d->id = id;
         
-        return( fd );
+        return fd;
+}
+
+char *ext_yahoo_get_ip_addr( const char *domain )
+{
+        return NULL;
+}
+
+int ext_yahoo_write( void *fd, char *buf, int len )
+{
+        return write( (int) fd, buf, len );
+}
+
+int ext_yahoo_read( void *fd, char *buf, int len )
+{
+        return read( (int) fd, buf, len );
+}
+
+void ext_yahoo_close( void *fd )
+{
+        close( (int) fd );
+}
+
+void ext_yahoo_got_buddy_change_group( int id, const char *me, const char *who,
+                                       const char *old_group, const char *new_group )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_add_buddy( ic, who, new_group );
 }
 
@@ -752 +815 @@
 int ext_yahoo_connect(const char *host, int port)
 {
-#if 0
-        struct sockaddr_in serv_addr;
-        static struct hostent *server;
-        static char last_host[256];
-        int servfd;
-        char **p;
-
-        if(last_host[0] || g_strcasecmp(last_host, host)!=0) {
-                if(!(server = gethostbyname(host))) {
-                        return -1;
-                }
-                strncpy(last_host, host, 255);
-        }
-
-        if((servfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-                return -1;
-        }
-
-        for (p = server->h_addr_list; *p; p++)
-        {
-                memset(&serv_addr, 0, sizeof(serv_addr));
-                serv_addr.sin_family = AF_INET;
-                memcpy(&serv_addr.sin_addr.s_addr, *p, server->h_length);
-                serv_addr.sin_port = htons(port);
-
-                if(connect(servfd, (struct sockaddr *) &serv_addr, 
-                                        sizeof(serv_addr)) == -1) {
-                        return -1;
-                } else {
-                        return servfd;
-                }
-        }
-
-        closesocket(servfd);
-#endif
         return -1;
 }
@@ -898 +926 @@
 }
 
-void ext_yahoo_chat_join( int id, const char *who, const char *room, const char *topic, YList *members, int fd )
+void ext_yahoo_chat_join( int id, const char *who, const char *room, const char *topic, YList *members, void *fd )
 {
 }
@@ -926 +954 @@
 }
 
-void ext_yahoo_contact_auth_request( int id, const char *myid, const char *who, const char *msg )
-{
-        struct im_connection *ic = byahoo_get_ic_by_id( id );
-        
-        imcb_ask_auth( ic, who, NULL );
-}
-
 void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
 {
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imcb_add_buddy( ic, (char*) who, NULL );
+        imcb_ask_auth( ic, who, msg );
 }
 
@@ -944 +965 @@
 }
 
-void ext_yahoo_game_notify( int id, const char *me, const char *who, int stat )
+void ext_yahoo_game_notify( int id, const char *me, const char *who, int stat, const char *msg )
 {
 }
@@ -989 +1010 @@
 }
 
-void ext_yahoo_got_ping( int id, const char *msg)
+void ext_yahoo_got_ping( int id, const char *msg )
 {
 }