Changeset 0a3c243 for protocols

Timestamp:

2006-06-30T23:18:56Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5100caa

Parents:

5c9512f

Message:

Got rid of struct aim_user (now using account_t everywhere). Needs some more
testing though.

Location:

protocols

Files:

• jabber/jabber.c (modified) (6 diffs)
• msn/msn.c (modified) (2 diffs)
• nogaim.c (modified) (24 diffs)
• nogaim.h (modified) (5 diffs)
• oscar/oscar.c (modified) (7 diffs)
• yahoo/yahoo.c (modified) (3 diffs)

protocols/jabber/jabber.c

@@ -561 +561 @@
 static void gjab_start(gjconn gjc)
 {
-        struct aim_user *user;
+        account_t *acc;
         int port = -1, ssl = 0;
         char *server = NULL, *s;
@@ -568 +568 @@
                 return;
 
-        user = GJ_GC(gjc)->user;
-        if (*user->proto_opt[0]) {
+        acc = GJ_GC(gjc)->acc;
+        if (acc->server) {
                 /* If there's a dot, assume there's a hostname in the beginning */
-                if (strchr(user->proto_opt[0], '.')) {
-                        server = g_strdup(user->proto_opt[0]);
+                if (strchr(acc->server, '.')) {
+                        server = g_strdup(acc->server);
                         if ((s = strchr(server, ':')))
                                 *s = 0;
@@ -578 +578 @@
                 
                 /* After the hostname, there can be a port number */
-                s = strchr(user->proto_opt[0], ':');
+                s = strchr(acc->server, ':');
                 if (s && isdigit(s[1]))
                         sscanf(s + 1, "%d", &port);
                 
                 /* And if there's the string ssl, the user wants an SSL-connection */
-                if (strstr(user->proto_opt[0], ":ssl") || g_strcasecmp(user->proto_opt[0], "ssl") == 0)
+                if (strstr(acc->server, ":ssl") || g_strcasecmp(acc->server, "ssl") == 0)
                         ssl = 1;
         }
@@ -616 +616 @@
         g_free(server);
         
-        if (!user->gc || (gjc->fd < 0)) {
+        if (!acc->gc || (gjc->fd < 0)) {
                 STATE_EVT(JCONN_STATE_OFF)
                 return;
@@ -1516 +1516 @@
 }
 
-static void jabber_login(struct aim_user *user)
-{
-        struct gaim_connection *gc = new_gaim_conn(user);
+static void jabber_login(account_t *acc)
+{
+        struct gaim_connection *gc = new_gaim_conn(acc);
         struct jabber_data *jd = gc->proto_data = g_new0(struct jabber_data, 1);
-        char *loginname = create_valid_jid(user->username, DEFAULT_SERVER, "BitlBee");
+        char *loginname = create_valid_jid(acc->user, DEFAULT_SERVER, "BitlBee");
 
         jd->hash = g_hash_table_new(g_str_hash, g_str_equal);
@@ -1527 +1527 @@
         set_login_progress(gc, 1, _("Connecting"));
 
-        if (!(jd->gjc = gjab_new(loginname, user->password, gc))) {
+        if (!(jd->gjc = gjab_new(loginname, acc->pass, gc))) {
                 g_free(loginname);
                 hide_login_progress(gc, _("Unable to connect"));

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-static void msn_login( struct aim_user *acct )
-{
-        struct gaim_connection *gc = new_gaim_conn( acct );
+static void msn_login( account_t *acc )
+{
+        struct gaim_connection *gc = new_gaim_conn( acc );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -37 +37 @@
         md->fd = -1;
         
-        if( strchr( acct->username, '@' ) == NULL )
+        if( strchr( acc->user, '@' ) == NULL )
         {
                 hide_login_progress( gc, "Invalid account name" );

protocols/nogaim.c

@@ -145 +145 @@
 /* multi.c */
 
-struct gaim_connection *new_gaim_conn( struct aim_user *user )
+struct gaim_connection *new_gaim_conn( account_t *acc )
 {
         struct gaim_connection *gc;
-        account_t *a;
         
         gc = g_new0( struct gaim_connection, 1 );
         
-        gc->prpl = user->prpl;
-        g_snprintf( gc->username, sizeof( gc->username ), "%s", user->username );
-        g_snprintf( gc->password, sizeof( gc->password ), "%s", user->password );
-        /* [MD] BUGFIX: don't set gc->irc to the global IRC, but use the one from the struct aim_user.
-         * This fixes daemon mode breakage where IRC doesn't point to the currently active connection.
-         */
-        gc->irc = user->irc;
+        /* Maybe we should get rid of this memory waste later. ;-) */
+        g_snprintf( gc->username, sizeof( gc->username ), "%s", acc->user );
+        g_snprintf( gc->password, sizeof( gc->password ), "%s", acc->pass );
+        
+        gc->irc = acc->irc;
+        gc->acc = acc;
+        acc->gc = gc;
         
         connections = g_slist_append( connections, gc );
-        
-        user->gc = gc;
-        gc->user = user;
-        
-        // Find the account_t so we can set its gc pointer
-        for( a = gc->irc->accounts; a; a = a->next )
-                if( ( struct aim_user * ) a->gc == user )
-                {
-                        a->gc = gc;
-                        break;
-                }
         
         return( gc );
@@ -189 +177 @@
         
         connections = g_slist_remove( connections, gc );
-        g_free( gc->user );
         g_free( gc );
 }
@@ -226 +213 @@
         /* Try to find a different connection on the same protocol. */
         for( a = gc->irc->accounts; a; a = a->next )
-                if( a->prpl == gc->prpl && a->gc != gc )
+                if( a->prpl == gc->acc->prpl && a->gc != gc )
                         break;
         
         /* If we found one, include the screenname in the message. */
         if( a )
-                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->acc->prpl->name, gc->username, text );
         else
-                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
+                irc_usermsg( gc->irc, "%s - %s", gc->acc->prpl->name, text );
         
         g_free( text );
@@ -242 +229 @@
         struct gaim_connection *gc = d;
         
-        if( gc->prpl && gc->prpl->keepalive )
-                gc->prpl->keepalive( gc );
+        if( gc->acc->prpl->keepalive )
+                gc->acc->prpl->keepalive( gc );
         
         return TRUE;
@@ -299 +286 @@
         
         gc->keepalive = 0;
-        gc->prpl->close( gc );
+        gc->acc->prpl->close( gc );
         b_event_remove( gc->inpa );
         
@@ -379 +366 @@
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
-        strcpy( nick, nick_get( gc->irc, handle, gc->prpl, realname ) );
+        strcpy( nick, nick_get( gc->irc, handle, gc->acc->prpl, realname ) );
         
         u = user_add( gc->irc, nick );
@@ -391 +378 @@
                 u->user = g_strndup( handle, s - handle );
         }
-        else if( gc->user->proto_opt[0] && *gc->user->proto_opt[0] )
+        else if( *gc->acc->server )
         {
                 char *colon;
                 
-                if( ( colon = strchr( gc->user->proto_opt[0], ':' ) ) )
-                        u->host = g_strndup( gc->user->proto_opt[0],
-                                             colon - gc->user->proto_opt[0] );
+                if( ( colon = strchr( gc->acc->server, ':' ) ) )
+                        u->host = g_strndup( gc->acc->server,
+                                             colon - gc->acc->server );
                 else
-                        u->host = g_strdup( gc->user->proto_opt[0] );
+                        u->host = g_strdup( gc->acc->server );
                 
                 u->user = g_strdup( handle );
@@ -410 +397 @@
         else
         {
-                u->host = g_strdup( gc->user->prpl->name );
+                u->host = g_strdup( gc->acc->prpl->name );
                 u->user = g_strdup( handle );
         }
@@ -480 +467 @@
 void show_got_added_yes( gpointer w, struct show_got_added_data *data )
 {
-        data->gc->prpl->add_buddy( data->gc, data->handle );
+        data->gc->acc->prpl->add_buddy( data->gc, data->handle );
         add_buddy( data->gc, NULL, data->handle, data->handle );
         
@@ -559 +546 @@
         }
         
-        if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "oscar") || !strcmp(gc->prpl->name, "icq")) )
+        if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "oscar" ) == 0 || strcmp( gc->acc->prpl->name, "icq" ) == 0 ) )
         {
                 u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && ( !strcmp(gc->prpl->name, "jabber") ) )
+        else if( ( type & UC_UNAVAILABLE ) && ( strcmp( gc->acc->prpl->name, "jabber" ) == 0 ) )
         {
                 if( type & UC_DND )
@@ -572 +559 @@
                         u->away = g_strdup( "Away" );
         }
-        else if( ( type & UC_UNAVAILABLE ) && gc->prpl->get_status_string )
-        {
-                u->away = g_strdup( gc->prpl->get_status_string( gc, type ) );
+        else if( ( type & UC_UNAVAILABLE ) && gc->acc->prpl->get_status_string )
+        {
+                u->away = g_strdup( gc->acc->prpl->get_status_string( gc, type ) );
         }
         else
@@ -733 +720 @@
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if( g_strcasecmp( who, gc->user->username ) == 0 )
+        if( g_strcasecmp( who, gc->username ) == 0 )
                 return;
         
@@ -791 +778 @@
         
         /* It might be yourself! */
-        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
+        if( b->gc->acc->prpl->cmp_buddynames( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -825 +812 @@
         
         /* It might be yourself! */
-        if( g_strcasecmp( handle, b->gc->user->username ) == 0 )
+        if( g_strcasecmp( handle, b->gc->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );
@@ -959 +946 @@
         }
         
-        st = gc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
+        st = gc->acc->prpl->send_im( gc, handle, msg, strlen( msg ), flags );
         g_free( buf );
         
@@ -976 +963 @@
         }
         
-        st = gc->prpl->chat_send( gc, id, msg );
+        st = gc->acc->prpl->chat_send( gc, id, msg );
         g_free( buf );
         
@@ -990 +977 @@
         
         if( !away ) away = "";
-        ms = m = gc->prpl->away_states( gc );
+        ms = m = gc->acc->prpl->away_states( gc );
         
         while( m )
@@ -1011 +998 @@
         if( m )
         {
-                gc->prpl->set_away( gc, m->data, *away ? away : NULL );
+                gc->acc->prpl->set_away( gc, m->data, *away ? away : NULL );
         }
         else
@@ -1018 +1005 @@
                 if( s )
                 {
-                        gc->prpl->set_away( gc, s, away );
+                        gc->acc->prpl->set_away( gc, s, away );
                         if( set_getint( &gc->irc->set, "debug" ) )
                                 serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
-                        gc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
+                        gc->acc->prpl->set_away( gc, GAIM_AWAY_CUSTOM, away );
         }
         
@@ -1075 +1062 @@
 void bim_add_allow( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        if( g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->permit = g_slist_prepend( gc->permit, g_strdup( handle ) );
         }
         
-        gc->prpl->add_permit( gc, handle );
+        gc->acc->prpl->add_permit( gc, handle );
 }
 
@@ -1087 +1074 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->permit, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1093 +1080 @@
         }
         
-        gc->prpl->rem_permit( gc, handle );
+        gc->acc->prpl->rem_permit( gc, handle );
 }
 
 void bim_add_block( struct gaim_connection *gc, char *handle )
 {
-        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) == NULL )
+        if( g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) == NULL )
         {
                 gc->deny = g_slist_prepend( gc->deny, g_strdup( handle ) );
         }
         
-        gc->prpl->add_deny( gc, handle );
+        gc->acc->prpl->add_deny( gc, handle );
 }
 
@@ -1110 +1097 @@
         GSList *l;
         
-        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->prpl->cmp_buddynames ) ) )
+        if( ( l = g_slist_find_custom( gc->deny, handle, (GCompareFunc) gc->acc->prpl->cmp_buddynames ) ) )
         {
                 g_free( l->data );
@@ -1116 +1103 @@
         }
         
-        gc->prpl->rem_deny( gc, handle );
-}
+        gc->acc->prpl->rem_deny( gc, handle );
+}

protocols/nogaim.h

@@ -39 +39 @@
 
 #include "bitlbee.h"
+#include "account.h"
 #include "proxy.h"
 #include "md5.h"
@@ -63 +64 @@
 struct gaim_connection
 {
-        struct prpl *prpl;
+        account_t *acc;
         guint32 flags;
         
@@ -78 +79 @@
         GSList *deny;
         int permdeny;
-        
-        struct aim_user *user;
         
         char username[64];
@@ -126 +125 @@
 };
 
-struct aim_user {
-        char username[64];
-        char alias[SELF_ALIAS_LEN]; 
-        char password[32];
-        char user_info[2048];
-        int options;
-        struct prpl *prpl;
-        /* prpls can use this to save information about the user,
-         * like which server to connect to, etc */
-        char proto_opt[7][256];
-
-        struct gaim_connection *gc;
-        irc_t *irc;
-};
-
 struct prpl {
         int options;
         const char *name;
 
-        void (* login)          (struct aim_user *);
+        void (* login)          (account_t *);
         void (* keepalive)      (struct gaim_connection *);
         void (* close)          (struct gaim_connection *);
@@ -212 +196 @@
 
 /* multi.c */
-G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( struct aim_user *user );
+G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( account_t *acc );
 G_MODULE_EXPORT void destroy_gaim_conn( struct gaim_connection *gc );
 G_MODULE_EXPORT void set_login_progress( struct gaim_connection *gc, int step, char *msg );

protocols/oscar/oscar.c

@@ -356 +356 @@
 }
 
-static void oscar_login(struct aim_user *user) {
+static void oscar_login(account_t *acc) {
         aim_session_t *sess;
         aim_conn_t *conn;
         char buf[256];
-        struct gaim_connection *gc = new_gaim_conn(user);
+        struct gaim_connection *gc = new_gaim_conn(acc);
         struct oscar_data *odata = gc->proto_data = g_new0(struct oscar_data, 1);
 
-        if (isdigit(*user->username)) {
+        if (isdigit(acc->user[0])) {
                 odata->icq = TRUE;
                 /* This is odd but it's necessary for a proper do_import and do_export.
                    We don't do those anymore, but let's stick with it, just in case
-                   it accidentally fixes something else too... */
+                   it accidentally fixes something else too... </bitlbee> */
                 gc->password[8] = 0;
         } else {
@@ -390 +390 @@
         }
         
-        if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 &&
-            g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",user->proto_opt[USEROPT_AUTH]);
+        if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
+            g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
         }
         
@@ -402 +402 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(user->proto_opt[USEROPT_AUTH][0] ?
-                                        user->proto_opt[USEROPT_AUTH] : AIM_DEFAULT_LOGIN_SERVER,
-                                 user->proto_opt[USEROPT_AUTHPORT][0] ?
-                                        atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-                                 oscar_login_connect, gc);
+        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, gc);
         if (conn->fd < 0) {
                 hide_login_progress(gc, _("Couldn't connect to host"));
@@ -485 +481 @@
         struct aim_authresp_info *info;
         int i; char *host; int port;
-        struct aim_user *user;
         aim_conn_t *bosconn;
 
         struct gaim_connection *gc = sess->aux_data;
         struct oscar_data *od = gc->proto_data;
-        user = gc->user;
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
+        port = AIM_LOGIN_PORT;
 
         va_start(ap, fr);
@@ -871 +864 @@
         struct aim_redirect_data *redir;
         struct gaim_connection *gc = sess->aux_data;
-        struct aim_user *user = gc->user;
         aim_conn_t *tstconn;
         int i;
@@ -877 +869 @@
         int port;
 
-        port = user->proto_opt[USEROPT_AUTHPORT][0] ?
-                atoi(user->proto_opt[USEROPT_AUTHPORT]) : AIM_LOGIN_PORT,
-
         va_start(ap, fr);
         redir = va_arg(ap, struct aim_redirect_data *);
         va_end(ap);
 
+        port = AIM_LOGIN_PORT;
         for (i = 0; i < (int)strlen(redir->ip); i++) {
                 if (redir->ip[i] == ':') {
@@ -1723 +1713 @@
         odata->rights.maxsiglen = odata->rights.maxawaymsglen = (guint)maxsiglen;
 
+        /* FIXME: It seems we're not really using this, and it broke now that
+           struct aim_user is dead.
         aim_bos_setprofile(sess, fr->conn, gc->user->user_info, NULL, gaim_caps);
-
+        */
+        
         return 1;
 }

protocols/yahoo/yahoo.c

@@ -121 +121 @@
 }
 
-static void byahoo_login( struct aim_user *user )
-{
-        struct gaim_connection *gc = new_gaim_conn( user );
+static void byahoo_login( account_t *acc )
+{
+        struct gaim_connection *gc = new_gaim_conn( acc );
         struct byahoo_data *yd = gc->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -130 +130 @@
         
         set_login_progress( gc, 1, "Connecting" );
-        yd->y2_id = yahoo_init( user->username, user->password );
+        yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
 }
@@ -425 +425 @@
                 yd = gc->proto_data;
                 
-                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
+                if( strcmp( gc->acc->prpl->name, "yahoo" ) == 0 && yd->y2_id == id )
                         return( gc );
         }