Changeset 85693e6

Timestamp:

2010-03-21T16:17:24Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0cb71a6

Parents:

81ee561 (diff), 767a148 (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:

Merging in killerbee stuff (just file transfers and maybe a few things from
mainline). Once I add ft support glue to protocols/purple/ I guess this will
all go into killerbee.

Files:

• Makefile (modified) (1 diff)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• dcc.c (added)
• dcc.h (added)
• doc/user-guide/commands.xml (modified) (2 diffs)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• lib/ftutil.c (added)
• lib/ftutil.h (added)
• protocols/ft.h (added)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/iq.c (modified) (6 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (7 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/jabber/s5bytestream.c (added)
• protocols/jabber/si.c (added)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/msn/invitation.c (added)
• protocols/msn/invitation.h (added)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/msn.h (modified) (2 diffs)
• protocols/msn/sb.c (modified) (4 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/nogaim.h
+objects = account.o bitlbee.o chat.o crypting.o dcc.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.h lib/ftutil.h lib/http_client.h lib/ini.h lib/md5.h lib/misc.h lib/proxy.h lib/sha1.h lib/ssl_client.h lib/url.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols
 

conf.c

@@ -63 +63 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->ft_max_size = SIZE_MAX;
+        conf->ft_max_kbps = G_MAXUINT;
+        conf->ft_listen = NULL;
         conf->protocols = NULL;
         proxytype = 0;
@@ -308 +311 @@
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "ft_max_size" ) == 0 )
+                        {
+                                size_t ft_max_size;
+                                if( sscanf( ini->value, "%zu", &ft_max_size ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_size = ft_max_size;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_max_kbps" ) == 0 )
+                        {
+                                if( sscanf( ini->value, "%d", &i ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->ft_max_kbps = i;
+                        }
+                        else if( g_strcasecmp( ini->key, "ft_listen" ) == 0 )
+                        {
+                                g_free( conf->ft_listen );
+                                conf->ft_listen = g_strdup( ini->value );
+                        }
                         else if( g_strcasecmp( ini->key, "protocols" ) == 0 )
                         {

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        size_t ft_max_size;
+        int ft_max_kbps;
+        char *ft_listen;
         char **protocols;
 } conf_t;

doc/user-guide/commands.xml

@@ -587 +587 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Only supported by OSCAR so far, you can use this setting to ignore ICQ authorization requests, which are hardly used for legitimate (i.e. non-spam) reasons anymore.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="lcnicks" type="boolean" scope="global">
                 <default>true</default>
@@ -1017 +1028 @@
 
         </bitlbee-command>
+        
+        <bitlbee-command name="transfers">
+                <short-description>Monitor, cancel, or reject file transfers</short-description>
+                <syntax>transfers [&lt;cancel&gt; id | &lt;reject&gt;]</syntax>
+                
+                <description>
+                        <para>
+                                Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers &lt;action&gt;</emphasis> for more information.
+                        </para>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers</ircline>
+                        </ircexample>
+                </description>
+                
+                <bitlbee-command name="cancel">
+                        <short-description>Cancels the file transfer with the given id</short-description>
+                        <syntax>transfers &lt;cancel&gt; id</syntax>
+
+                        <description>
+                                <para>Cancels the file transfer with the given id</para>
+                        </description>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers cancel 1</ircline>
+                                <ircline nick="root">Canceling file transfer for test</ircline>
+                        </ircexample>
+                </bitlbee-command>
+
+                <bitlbee-command name="reject">
+                        <short-description>Rejects all incoming transfers</short-description>
+                        <syntax>transfers &lt;reject&gt;</syntax>
+
+                        <description>
+                                <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para>
+                        </description>
+
+                        <ircexample>
+                                <ircline nick="ulim">transfers reject</ircline>
+                        </ircexample>
+                </bitlbee-command>
+        </bitlbee-command>
+        
 </chapter>

irc.c

@@ -29 +29 @@
 #include "crypting.h"
 #include "ipc.h"
+#include "dcc.h"
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
@@ -1109 +1110 @@
                         return( 1 );
                 }
+                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
+                {
+                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
+                        {
+                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
+                                if ( ft )
+                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
+                        }
+                        return( 1 );
+                }               
                 else
                 {
-                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
+                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
                         return( 0 );
                 }

irc.h

@@ -83 +83 @@
         struct query *queries;
         struct account *accounts;
+        GSList *file_transfers;
         struct chat *chatrooms;
         

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ftutil.o
 
 CFLAGS += -Wall

protocols/jabber/Makefile

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

protocols/jabber/iq.c

@@ -91 +91 @@
                         pack = 0;
                 }
-                else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
-                {
-                        const char *features[] = { XMLNS_DISCOVER,
+                else if( strcmp( s, XMLNS_DISCO_INFO ) == 0 )
+                {
+                        const char *features[] = { XMLNS_DISCO_INFO,
                                                    XMLNS_VERSION,
                                                    XMLNS_TIME,
@@ -99 +99 @@
                                                    XMLNS_MUC,
                                                    XMLNS_PING,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -118 +121 @@
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }
@@ -124 +127 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
-                    !( s = xt_find_attr( c, "xmlns" ) ) )
+                if( ( c = xt_find_node( node->children, "si" ) ) &&
+                    ( s = xt_find_attr( c, "xmlns" ) ) &&
+                    ( strcmp( s, XMLNS_SI ) == 0 ) )
+                {
+                        return jabber_si_handle_request( ic, node, c );
+                }
+                else if( !( c = xt_find_node( node->children, "query" ) ) ||
+                         !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
                         imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
                 }
-                
+                else if( strcmp( s, XMLNS_ROSTER ) == 0 )
+                {
                 /* This is a roster push. XMPP servers send this when someone
                    was added to (or removed from) the buddy list. AFAIK they're
                    sent even if we added this buddy in our own session. */
-                if( strcmp( s, XMLNS_ROSTER ) == 0 )
-                {
                         int bare_len = strlen( ic->acc->user );
                         
@@ -152 +160 @@
                                 
                                 xt_free_node( reply );
-                                reply = jabber_make_error_packet( node, "not-allowed", "cancel" );
+                                reply = jabber_make_error_packet( node, "not-allowed", "cancel", NULL );
                                 pack = 0;
                         }
                 }
+                else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
+                {
+                        /* Bytestream Request (stage 2 of file transfer) */
+                        return jabber_bs_recv_request( ic, node, c );
+                }
                 else
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
                         pack = 0;
                 }
@@ -609 +622 @@
         return st;
 }
+
+xt_status jabber_iq_parse_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
+xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid )
+{
+        struct xt_node *node, *query;
+        struct jabber_buddy *bud;
+        
+        if( ( bud = jabber_buddy_by_jid( ic, bare_jid , 0 ) ) == NULL )
+        {
+                /* Who cares about the unknown... */
+                imcb_log( ic, "Couldn't find buddy: %s", bare_jid);
+                return XT_HANDLED;
+        }
+        
+        if( bud->features ) /* been here already */
+                return XT_HANDLED;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", XMLNS_DISCO_INFO );
+        
+        if( !( query = jabber_make_packet( "iq", "get", bare_jid, node ) ) )
+        {
+                imcb_log( ic, "WARNING: Couldn't generate feature query" );
+                xt_free_node( node );
+                return XT_HANDLED;
+        }
+
+        jabber_cache_add( ic, query, jabber_iq_parse_features );
+
+        return jabber_write_packet( ic, query ) ? XT_HANDLED : XT_ABORT;
+}
+
+xt_status jabber_iq_parse_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *c;
+        struct jabber_buddy *bud;
+        char *feature, *xmlns, *from;
+
+        if( !( from = xt_find_attr( node, "from" ) ) ||
+            !( c = xt_find_node( node->children, "query" ) ) ||
+            !( xmlns = xt_find_attr( c, "xmlns" ) ) ||
+            !( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete IQ-result packet for discover" );
+                return XT_HANDLED;
+        }
+        if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
+        {
+                /* Who cares about the unknown... */
+                imcb_log( ic, "Couldn't find buddy: %s", from );
+                return XT_HANDLED;
+        }
+        
+        c = c->children;
+        while( ( c = xt_find_node( c, "feature" ) ) )
+        {
+                feature = xt_find_attr( c, "var" );
+                if( feature )
+                        bud->features = g_slist_append( bud->features, g_strdup( feature ) );
+                c = c->next;
+        }
+
+        return XT_HANDLED;
+}
+
+xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
+
+xt_status jabber_iq_query_server( struct im_connection *ic, char *jid, char *xmlns )
+{
+        struct xt_node *node, *query;
+        struct jabber_data *jd = ic->proto_data;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", xmlns );
+        
+        if( !( query = jabber_make_packet( "iq", "get", jid, node ) ) )
+        {
+                imcb_log( ic, "WARNING: Couldn't generate server query" );
+                xt_free_node( node );
+        }
+
+        jd->have_streamhosts--;
+        jabber_cache_add( ic, query, jabber_iq_parse_server_features );
+
+        return jabber_write_packet( ic, query ) ? XT_HANDLED : XT_ABORT;
+}
+
+/*
+ * Query the server for "items", query each "item" for identities, query each "item" that's a proxy for it's bytestream info
+ */
+xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *c;
+        struct jabber_data *jd = ic->proto_data;
+        char *xmlns, *from;
+
+        if( !( c = xt_find_node( node->children, "query" ) ) ||
+            !( from = xt_find_attr( node, "from" ) ) ||
+            !( xmlns = xt_find_attr( c, "xmlns" ) ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete IQ-result packet for discover" );
+                return XT_HANDLED;
+        }
+
+        jd->have_streamhosts++;
+
+        if( strcmp( xmlns, XMLNS_DISCO_ITEMS ) == 0 )
+        {
+                char *itemjid;
+
+                /* answer from server */
+        
+                c = c->children;
+                while( ( c = xt_find_node( c, "item" ) ) )
+                {
+                        itemjid = xt_find_attr( c, "jid" );
+                        
+                        if( itemjid )
+                                jabber_iq_query_server( ic, itemjid, XMLNS_DISCO_INFO );
+
+                        c = c->next;
+                }
+        }
+        else if( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 )
+        {
+                char *category, *type;
+
+                /* answer from potential proxy */
+
+                c = c->children;
+                while( ( c = xt_find_node( c, "identity" ) ) )
+                {
+                        category = xt_find_attr( c, "category" );
+                        type = xt_find_attr( c, "type" );
+
+                        if( type && ( strcmp( type, "bytestreams" ) == 0 ) &&
+                            category && ( strcmp( category, "proxy" ) == 0 ) )
+                                jabber_iq_query_server( ic, from, XMLNS_BYTESTREAMS );
+
+                        c = c->next;
+                }
+        }
+        else if( strcmp( xmlns, XMLNS_BYTESTREAMS ) == 0 )
+        {
+                char *host, *jid, *port_s;
+                int port;
+
+                /* answer from proxy */
+
+                if( ( c = xt_find_node( c->children, "streamhost" ) ) &&
+                    ( host = xt_find_attr( c, "host" ) ) &&
+                    ( port_s = xt_find_attr( c, "port" ) ) &&
+                    ( sscanf( port_s, "%d", &port ) == 1 ) &&
+                    ( jid = xt_find_attr( c, "jid" ) ) )
+                {
+                        jabber_streamhost_t *sh = g_new0( jabber_streamhost_t, 1 );
+                        
+                        sh->jid = g_strdup( jid );
+                        sh->host = g_strdup( host );
+                        g_snprintf( sh->port, sizeof( sh->port ), "%u", port );
+
+                        imcb_log( ic, "Proxy found: jid %s host %s port %u", jid, host, port );
+                        jd->streamhosts = g_slist_append( jd->streamhosts, sh );
+                }
+        }
+
+        if( jd->have_streamhosts == 0 )
+                jd->have_streamhosts++;
+
+        return XT_HANDLED;
+}

protocols/jabber/jabber.c

@@ -65 +65 @@
         
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
+
+        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
         
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
@@ -264 +266 @@
         struct jabber_data *jd = ic->proto_data;
         
+        while( jd->filetransfers )
+                imcb_file_canceled( ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
+
+        while( jd->streamhosts )
+        {
+                jabber_streamhost_t *sh = jd->streamhosts->data;
+                jd->streamhosts = g_slist_remove( jd->streamhosts, sh );
+                g_free( sh->jid );
+                g_free( sh->host );
+                g_free( sh );
+        }
+
         if( jd->fd >= 0 )
                 jabber_end_stream( ic );
@@ -544 +558 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );

protocols/jabber/jabber.h

@@ -61 +61 @@
 } jabber_buddy_flags_t;
 
+/* Stores a streamhost's (a.k.a. proxy) data */
+typedef struct
+{
+        char *jid;
+        char *host;
+        char port[6];
+} jabber_streamhost_t;
+
 typedef enum
 {
@@ -91 +99 @@
         GHashTable *node_cache;
         GHashTable *buddies;
+
+        GSList *filetransfers;
+        GSList *streamhosts;
+        int have_streamhosts;
 };
 
@@ -127 +139 @@
         struct jabber_away_state *away_state;
         char *away_message;
+        GSList *features;
         
         time_t last_msg;
@@ -140 +153 @@
         char *my_full_jid; /* Separate copy because of case sensitivity. */
         struct jabber_buddy *me;
+};
+
+struct jabber_transfer
+{
+        /* bitlbee's handle for this transfer */
+        file_transfer_t *ft;
+
+        /* the stream's private handle */
+        gpointer streamhandle;
+
+        /* timeout for discover queries */
+        gint disco_timeout;
+        gint disco_timeout_fired;
+
+        struct im_connection *ic;
+
+        struct jabber_buddy *bud;
+
+        int watch_in;
+        int watch_out;
+
+        char *ini_jid;
+        char *tgt_jid;
+        char *iq_id;
+        char *sid;
+        int accepted;
+
+        size_t bytesread, byteswritten;
+        int fd;
+        struct sockaddr_storage saddr;
 };
 
@@ -167 +210 @@
 
 /* Some supported extensions/legacy stuff */
-#define XMLNS_AUTH         "jabber:iq:auth"                     /* XEP-0078 */
-#define XMLNS_VERSION      "jabber:iq:version"                  /* XEP-0092 */
-#define XMLNS_TIME         "jabber:iq:time"                     /* XEP-0090 */
-#define XMLNS_PING         "urn:xmpp:ping"                      /* XEP-0199 */
-#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 */
-#define XMLNS_CAPS         "http://jabber.org/protocol/caps"    /* XEP-0115 */
+#define XMLNS_AUTH         "jabber:iq:auth"                                      /* XEP-0078 */
+#define XMLNS_VERSION      "jabber:iq:version"                                   /* XEP-0092 */
+#define XMLNS_TIME         "jabber:iq:time"                                      /* XEP-0090 */
+#define XMLNS_PING         "urn:xmpp:ping"                                       /* XEP-0199 */
+#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
+#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
+#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
+#define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */
+#define XMLNS_DISCO_ITEMS  "http://jabber.org/protocol/disco#items"              /* XEP-0030 */
+#define XMLNS_MUC          "http://jabber.org/protocol/muc"                      /* XEP-0045 */
+#define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"                 /* XEP-0045 */
+#define XMLNS_CAPS         "http://jabber.org/protocol/caps"                     /* XEP-0115 */
+#define XMLNS_FEATURE      "http://jabber.org/protocol/feature-neg"              /* XEP-0020 */
+#define XMLNS_SI           "http://jabber.org/protocol/si"                       /* XEP-0095 */
+#define XMLNS_FILETRANSFER "http://jabber.org/protocol/si/profile/file-transfer" /* XEP-0096 */
+#define XMLNS_BYTESTREAMS  "http://jabber.org/protocol/bytestreams"              /* XEP-0065 */
+#define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
 
 /* iq.c */
@@ -187 +237 @@
 int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name );
 int jabber_remove_from_roster( struct im_connection *ic, char *handle );
+xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid );
+xt_status jabber_iq_query_server( struct im_connection *ic, char *jid, char *xmlns );
+
+/* si.c */
+int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, struct xt_node *sinode );
+void jabber_si_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
+void jabber_si_free_transfer( file_transfer_t *ft);
+
+/* s5bytestream.c */
+int jabber_bs_recv_request( struct im_connection *ic, struct xt_node *node, struct xt_node *qnode);
+gboolean jabber_bs_send_start( struct jabber_transfer *tf );
+gboolean jabber_bs_send_write( file_transfer_t *ft, char *buffer, unsigned int len );
 
 /* message.c */
@@ -200 +262 @@
 char *set_eval_tls( set_t *set, char *value );
 struct xt_node *jabber_make_packet( char *name, char *type, char *to, struct xt_node *children );
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type );
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code );
 void jabber_cache_add( struct im_connection *ic, struct xt_node *node, jabber_cache_event func );
 struct xt_node *jabber_cache_get( struct im_connection *ic, char *id );

protocols/jabber/jabber_util.c

@@ -99 +99 @@
 }
 
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code )
 {
         struct xt_node *node, *c;
@@ -111 +111 @@
         c = xt_new_node( "error", NULL, c );
         xt_add_attr( c, "type", err_type );
+        
+        /* Add the error code, if present */
+        if (err_code)
+                xt_add_attr( c, "code", err_code );
         
         /* To make the actual error packet, we copy the original packet and

protocols/msn/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
+objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall

protocols/msn/msn.c

@@ -81 +81 @@
         if( md )
         {
+                while( md->filetransfers ) {
+                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
+                }
+                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -340 +344 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);

protocols/msn/msn.h

@@ -69 +69 @@
         int sb_failures;
         time_t first_sb_failure;
+        GSList *filetransfers;
         
         const struct msn_away_state *away_state;
@@ -180 +181 @@
 int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
 
+/* invitation.c */
+void msn_ftp_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
+
 #endif //_MSN_H

protocols/msn/sb.c

@@ -29 +29 @@
 #include "passport.h"
 #include "md5.h"
+#include "invitation.h"
 
 static gboolean msn_sb_callback( gpointer data, gint source, b_input_condition cond );
@@ -168 +169 @@
                 
                 /* Build the message. Convert LF to CR-LF for normal messages. */
-                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) != 0 )
+                if( strcmp( text, TYPING_NOTIFICATION_MESSAGE ) == 0 )
+                {
+                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
+                        buf = g_new0( char, i );
+                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
+                }
+                else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
+                {
+                        buf = g_strdup( text );
+                        i = strlen( buf );
+                }
+                else
                 {
                         buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );
@@ -181 +193 @@
                                 buf[i++] = text[j];
                         }
-                }
-                else
-                {
-                        i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
-                        buf = g_new0( char, i );
-                        i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
                 }
                 
@@ -687 +693 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
-                        char *itype = msn_findheader( body, "Application-GUID:", blen );
-                        char buf[1024];
+                        char *command = msn_findheader( body, "Invitation-Command:", blen );
+                        char *cookie = msn_findheader( body, "Invitation-Cookie:", blen );
+                        unsigned int icookie;
                         
                         g_free( ct );
                         
-                        *buf = 0;
-                        
-                        if( !itype )
-                                return( 1 );
-                        
-                        /* File transfer. */
-                        if( strcmp( itype, "{5D3E02AB-6190-11d3-BBBB-00C04F795683}" ) == 0 )
-                        {
-                                char *name = msn_findheader( body, "Application-File:", blen );
-                                char *size = msn_findheader( body, "Application-FileSize:", blen );
-                                
-                                if( name && size )
-                                {
-                                        g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Filetransfer: `%s', %s bytes >>\n"
-                                                    "Filetransfers are not supported by BitlBee for now...", name, size );
-                                }
-                                else
-                                {
-                                        strcpy( buf, "<< \x02""BitlBee\x02"" - Corrupted MSN filetransfer invitation message >>" );
-                                }
-                                
-                                if( name ) g_free( name );
-                                if( size ) g_free( size );
-                        }
-                        else
-                        {
-                                char *iname = msn_findheader( body, "Application-Name:", blen );
-                                
-                                g_snprintf( buf, sizeof( buf ), "<< \x02""BitlBee\x02"" - Unknown MSN invitation - %s (%s) >>",
-                                                                itype, iname ? iname : "no name" );
-                                
-                                if( iname ) g_free( iname );
-                        }
-                        
-                        g_free( itype );
-                        
-                        if( !*buf )
-                                return( 1 );
-                        
-                        if( sb->who )
-                        {
-                                imcb_buddy_msg( ic, cmd[1], buf, 0, 0 );
-                        }
-                        else if( sb->chat )
-                        {
-                                imcb_chat_msg( sb->chat, cmd[1], buf, 0, 0 );
-                        }
-                        else
-                        {
-                                /* PANIC! */
-                        }
+                        /* Every invite should have both a Command and Cookie header */
+                        if( !command || !cookie ) {
+                                g_free( command );
+                                g_free( cookie );
+                                imcb_log( ic, "Warning: No command or cookie from %s", sb->who );
+                                return 1;
+                        }
+                        
+                        icookie = strtoul( cookie, NULL, 10 );
+                        g_free( cookie );
+                        
+                        if( g_strncasecmp( command, "INVITE", 6 ) == 0 ) {
+                                msn_invitation_invite( sb, cmd[1], icookie, body, blen );
+                        } else if( g_strncasecmp( command, "ACCEPT", 6 ) == 0 ) {
+                                msn_invitation_accept( sb, cmd[1], icookie, body, blen );
+                        } else if( g_strncasecmp( command, "CANCEL", 6 ) == 0 ) {
+                                msn_invitation_cancel( sb, cmd[1], icookie, body, blen );
+                        } else {
+                                imcb_log( ic, "Warning: Received invalid invitation with "
+                                                "command %s from %s", command, sb->who );
+                        }
+                        
+                        g_free( command );
+                }
+                else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
+                {
+                        imcb_error( sb->ic, "Cannot receive file from %s: BitlBee does not "
+                                        "support msnmsgrp2p yet.", sb->who );
+                        g_free( ct );
                 }
                 else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )

protocols/nogaim.h

@@ -45 +45 @@
 #include "proxy.h"
 #include "query.h"
+#include "md5.h"
+#include "ft.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
@@ -229 +231 @@
         void (* auth_allow)     (struct im_connection *, const char *who);
         void (* auth_deny)      (struct im_connection *, const char *who);
+
+        /* Incoming transfer request */
+        void (* transfer_request) (struct im_connection *, file_transfer_t *ft, char *handle );
 };
 

protocols/oscar/oscar.c

@@ -373 +373 @@
         set_t *s;
         
-        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
+        if (isdigit(acc->user[0])) {
+                set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
+        }
+        
+        s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc);
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
-        if (isdigit(acc->user[0])) {
-                s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc );
+        if(isdigit(acc->user[0])) {
+                s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
@@ -1212 +1216 @@
  */
 static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
-        struct icq_auth *data = g_new(struct icq_auth, 1);
+        struct icq_auth *data;
         char *reason = NULL;
         char *dialog_msg;
-        
+
+        if (set_getbool(&ic->acc->set, "ignore_auth_requests"))
+                return;
+        
+        data = g_new(struct icq_auth, 1);
+
         if (strlen(msg) > 6)
                 reason = msg + 6;

root_commands.c

@@ -1154 +1154 @@
         {
                 irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+        }
+}
+
+static void cmd_transfer( irc_t *irc, char **cmd )
+{
+        GSList *files = irc->file_transfers;
+        enum { LIST, REJECT, CANCEL };
+        int subcmd = LIST;
+        int fid;
+
+        if( !files )
+        {
+                irc_usermsg( irc, "No pending transfers" );
+                return;
+        }
+
+        if( cmd[1] && ( strcmp( cmd[1], "reject" ) == 0 ) )
+        {
+                subcmd = REJECT;
+        }
+        else if( cmd[1] && ( strcmp( cmd[1], "cancel" ) == 0 ) && 
+                 cmd[2] && ( sscanf( cmd[2], "%d", &fid ) == 1 ) )
+        {
+                subcmd = CANCEL;
+        }
+
+        for( ; files; files = g_slist_next( files ) )
+        {
+                file_transfer_t *file = files->data;
+                
+                switch( subcmd ) {
+                case LIST:
+                        if ( file->status == FT_STATUS_LISTENING )
+                                irc_usermsg( irc, 
+                                        "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
+                        else 
+                        {
+                                int kb_per_s = 0;
+                                time_t diff = time( NULL ) - file->started ? : 1;
+                                if ( ( file->started > 0 ) && ( file->bytes_transferred > 0 ) )
+                                        kb_per_s = file->bytes_transferred / 1024 / diff;
+                                        
+                                irc_usermsg( irc, 
+                                        "Pending file(id %d): %s (%10zd/%zd kb, %d kb/s)", file->local_id, file->file_name, 
+                                        file->bytes_transferred/1024, file->file_size/1024, kb_per_s);
+                        }
+                        break;
+                case REJECT:
+                        if( file->status == FT_STATUS_LISTENING )
+                        {
+                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Denied by user" );
+                        }
+                        break;
+                case CANCEL:
+                        if( file->local_id == fid )
+                        {
+                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Canceled by user" );
+                        }
+                        break;
+                }
         }
 }
@@ -1178 +1240 @@
         { "join_chat",      2, cmd_join_chat,      0 },
         { "chat",           1, cmd_chat,           0 },
+        { "transfer",       0, cmd_transfer,       0 },
         { NULL }
 };