Changes in / [de03374:2379566]

Files:

• Makefile (modified) (1 diff)
• account.c (modified) (1 diff)
• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• dcc.c (added)
• dcc.h (added)
• doc/CREDITS (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (5 diffs)
• doc/user-guide/quickstart.xml (modified) (1 diff)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (1 diff)
• nick.c (modified) (3 diffs)
• protocols/ft.h (added)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/conference.c (modified) (1 diff)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/iq.c (modified) (7 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (8 diffs)
• protocols/jabber/jabber_util.c (modified) (3 diffs)
• protocols/jabber/s5bytestream.c (added)
• protocols/jabber/si.c (added)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/aim.h (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (5 diffs)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• root_commands.c (modified) (8 diffs)
• tests/check_nick.c (modified) (4 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o 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 conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o user.o dcc.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 dcc.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 protocols/ft.h
 subdirs = lib protocols
 

account.c

@@ -95 +95 @@
                 g_free( acc->server );
                 if( *value )
+                {
                         acc->server = g_strdup( value );
+                        return value;
+                }
                 else
+                {
                         acc->server = NULL;
-                return value;
+                        return g_strdup( set->def );
+                }
         }
         else if( strcmp( set->key, "auto_connect" ) == 0 )

conf.c

@@ -64 +64 @@
         conf->ping_timeout = 300;
         conf->user = NULL;
+        conf->max_filetransfer_size = G_MAXUINT;
         proxytype = 0;
         

conf.h

@@ -50 +50 @@
         int ping_timeout;
         char *user;
+        size_t max_filetransfer_size;
 } conf_t;
 

doc/CREDITS

@@ -55 +55 @@
 - Greg (gropeep.org), for updating the Yahoo! module to fix some issues
   that were there for quite some time already.
+- misc@mandriva.org for lots of Jabber contributions.
 
 - And all other users who help us by sending useful bug reports, positive

doc/user-guide/commands.xml

@@ -17 +17 @@
 
                 <bitlbee-command name="add">
-                        <syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt; [&lt;server&gt;]</syntax>
+                        <syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt;</syntax>
 
                         <description>
@@ -26 +26 @@
                         
                         <bitlbee-command name="jabber">
-                                <syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt; [&lt;servertag&gt;]</syntax>
+                                <syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt;</syntax>
 
                                 <description>
@@ -50 +50 @@
                         
                         <bitlbee-command name="oscar">
-                                <syntax>account add oscar &lt;handle&gt; &lt;password&gt; [&lt;servername&gt;]</syntax>
+                                <syntax>account add oscar &lt;handle&gt; &lt;password&gt;</syntax>
 
                                 <description>
                                         <para>
-                                                Specifying a server is required for OSCAR, since OSCAR can be used for both ICQ- and AIM-connections. Although these days it's supposed to be possible to connect to ICQ via AIM-servers and vice versa, we like to stick with this separation for now. For ICQ connections, the servername is <emphasis>login.icq.com</emphasis>, for AIM connections it's <emphasis>login.oscar.aol.com</emphasis>.
+                                                OSCAR is the protocol used to connect to AIM and/or ICQ. The servers will automatically detect if you're using a numeric or non-numeric username so there's no need to tell which network you want to connect to.
                                         </para>
                                 </description>
 
                                 <ircexample>
-                                        <ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw login.icq.com</ircline>
+                                        <ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw</ircline>
                                         <ircline nick="root">Account successfully added</ircline>
                                 </ircexample>
@@ -595 +595 @@
                 <description>
                         <para>
-                                Can be set for Jabber- and OSCAR-connections. For OSCAR, this must be set to <emphasis>login.icq.com</emphasis> if it's an ICQ connection, or <emphasis>login.oscar.aol.com</emphasis> if it's an AIM connection. For Jabber, you have to set this if the servername isn't equal to the part after the @ in the Jabber handle.
+                                Can be set for Jabber- and OSCAR-connections. For Jabber, you might have to set this if the servername isn't equal to the part after the @ in the Jabber handle. For OSCAR this shouldn't be necessary anymore in recent BitlBee versions.
                         </para>
                 </description>
@@ -861 +861 @@
 
         </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>

doc/user-guide/quickstart.xml

@@ -38 +38 @@
 
 <ircexample>
-        <ircline nick="you">account add oscar 72696705 QuickStart login.icq.com</ircline>
+        <ircline nick="you">account add jabber bitlbee@jabber.org QuickStart</ircline>
         <ircline nick="root">Account successfully added</ircline>
 </ircexample>
 
 <para>
-Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is <emphasis>login.oscar.aol.com</emphasis>. For ICQ, the server name is <emphasis>login.icq.com</emphasis>.
+Other available IM protocols are msn, oscar, and yahoo. Oscar is the protocol used by ICQ and AOL.
 </para>
 

irc.c

@@ -28 +28 @@
 #include "crypting.h"
 #include "ipc.h"
+#include "dcc.h"
+
+#include <regex.h>
+#include <netinet/in.h>
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
@@ -992 +996 @@
                         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

@@ -84 +84 @@
         struct query *queries;
         struct account *accounts;
+        GSList *file_transfers;
         
         struct __USER *users;

irc_commands.c

@@ -207 +207 @@
                 if( c->ic && c->ic->acc->prpl->chat_invite )
                 {
-                        c->ic->acc->prpl->chat_invite( c, "", u->handle );
+                        c->ic->acc->prpl->chat_invite( c, u->handle, NULL );
                         irc_reply( irc, 341, "%s %s", nick, channel );
                         return;

lib/misc.c

@@ -44 +44 @@
 #include <resolv.h>
 #endif
+
+#include "ssl_client.h"
 
 void strip_linefeed(gchar *text)
@@ -591 +593 @@
         return g_string_free( ret, FALSE );
 }
+
+gboolean ssl_sockerr_again( void *ssl )
+{
+        if( ssl )
+                return ssl_errno == SSL_AGAIN;
+        else
+                return sockerr_again();
+}

lib/misc.h

@@ -66 +66 @@
 G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
 
+G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
+
 #endif

lib/ssl_gnutls.c

@@ -223 +223 @@
         closesocket( conn->fd );
         
-        gnutls_deinit( conn->session );
-        gnutls_certificate_free_credentials( conn->xcred );
+        if( conn->session )
+                gnutls_deinit( conn->session );
+        if( conn->xcred )
+                gnutls_certificate_free_credentials( conn->xcred );
         g_free( conn );
 }

nick.c

@@ -154 +154 @@
    With one difference, we allow dashes. */
 
-static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^-_|";
-static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~-_\\";
-
-void nick_strip( char * nick )
+static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^`-_|";
+static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~`-_\\";
+
+void nick_strip( char *nick )
 {
         int i, j;
@@ -170 +170 @@
                 }
         }
+        if( isdigit( nick[0] ) )
+        {
+                char *orig;
+                
+                orig = g_strdup( nick );
+                g_snprintf( nick, MAX_NICK_LENGTH, "_%s", orig );
+                g_free( orig );
+                j ++;
+        }
         while( j <= MAX_NICK_LENGTH )
                 nick[j++] = '\0';
@@ -178 +187 @@
         const char *s;
         
-        /* Empty/long nicks are not allowed */
-        if( !*nick || strlen( nick ) > MAX_NICK_LENGTH )
+        /* Empty/long nicks are not allowed, nor numbers at [0] */
+        if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
                 return( 0 );
         

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 xmltree.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o si.o s5bytestream.o
 
 CFLAGS += -Wall

protocols/jabber/conference.c

@@ -174 +174 @@
         
         return 1;
+}
+
+void jabber_chat_invite( struct groupchat *c, char *who, char *message )
+{
+        struct xt_node *node;
+        struct im_connection *ic = c->ic;
+        struct jabber_chat *jc = c->data;
+
+        node = xt_new_node( "reason", message, NULL ); 
+
+        node = xt_new_node( "invite", NULL, node );
+        xt_add_attr( node, "to", who ); 
+
+        node = xt_new_node( "x", NULL, node ); 
+        xt_add_attr( node, "xmlns", XMLNS_MUC_USER ); 
+        
+        node = jabber_make_packet( "message", NULL, jc->name, node ); 
+
+        jabber_write_packet( ic, node ); 
+
+        xt_free_node( node );
 }
 

protocols/jabber/io.c

@@ -120 +120 @@
                 return TRUE;
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 /* Set fd to -1 to make sure we won't write to it anymore. */
@@ -231 +231 @@
                 }
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 closesocket( jd->fd );

protocols/jabber/iq.c

@@ -50 +50 @@
         else if( strcmp( type, "get" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
+                if( !( ( c = xt_find_node( node->children, "query" ) ) ||
+                       ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
@@ -81 +82 @@
                         xt_add_child( reply, xt_new_node( "tz", buf, NULL ) );
                 }
-                else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
+                else if( strcmp( s, XMLNS_PING ) == 0 )
+                {
+                        xt_free_node( reply );
+                        reply = jabber_make_packet( "iq", "result", xt_find_attr( node, "from" ), NULL );
+                        if( ( s = xt_find_attr( node, "id" ) ) )
+                                xt_add_attr( reply, "id", s );
+                        pack = 0;
+                }
+                else if( strcmp( s, XMLNS_DISCO_INFO ) == 0 )
                 {
                         const char *features[] = { XMLNS_VERSION,
@@ -87 +96 @@
                                                    XMLNS_CHATSTATES,
                                                    XMLNS_MUC,
+                                                   XMLNS_PING,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -106 +119 @@
                 {
                         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;
                 }
@@ -112 +125 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                if( !( c = xt_find_node( node->children, "query" ) ) ||
+                if(  ( c = xt_find_node( node->children, "si" ) ) &&
+                     ( strcmp( xt_find_attr( c, "xmlns" ), 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 );
                         
@@ -140 +155 @@
                                 
                                 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
+                } 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;
                 }
@@ -557 +575 @@
         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, "Couldnt find the man: %s", bare_jid);
+                return 0;
+        }
+        
+        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 );
+        }
+
+        jabber_cache_add( ic, query, jabber_iq_parse_features );
+
+        return jabber_write_packet( ic, query );
+}
+
+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;
+
+        if( !( c = xt_find_node( node->children, "query" ) ) ||
+            !( strcmp( xt_find_attr( c, "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, xt_find_attr( node, "from") , 0 ) ) == NULL )
+        {
+                /* Who cares about the unknown... */
+                imcb_log( ic, "Couldnt find the man: %s", xt_find_attr( node, "from"));
+                return 0;
+        }
+        
+        c = c->children;
+        while( ( c = xt_find_node( c, "feature" ) ) ) {
+                feature = xt_find_attr( c, "var" );
+                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 );
+}
+
+/*
+ * 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;
+
+        if( !( c = xt_find_node( node->children, "query" ) ) ||
+            !xt_find_attr( node, "from" ) )
+        {
+                imcb_log( ic, "WARNING: Received incomplete IQ-result packet for discover" );
+                return XT_HANDLED;
+        }
+
+        jd->have_streamhosts++;
+
+        if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_DISCO_ITEMS ) == 0 )
+        {
+                char *item, *itemjid;
+
+                /* answer from server */
+        
+                c = c->children;
+                while( ( c = xt_find_node( c, "item" ) ) )
+                {
+                        item = xt_find_attr( c, "name" );
+                        itemjid = xt_find_attr( c, "jid" );
+
+                        jabber_iq_query_server( ic, itemjid, XMLNS_DISCO_INFO );
+
+                        c = c->next;
+                }
+        } else if( strcmp( xt_find_attr( c, "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, xt_find_attr( node, "from" ), XMLNS_BYTESTREAMS );
+
+                        c = c->next;
+                }
+        } else if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_BYTESTREAMS ) == 0 )
+        {
+                char *host, *jid;
+                int port;
+
+                /* answer from proxy */
+
+                if( ( c = xt_find_node( c->children, "streamhost" ) ) &&
+                    ( host = xt_find_attr( c, "host" ) ) &&
+                    ( port = atoi( xt_find_attr( c, "port" ) ) ) &&
+                    ( 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 );
+                        sprintf( 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

@@ -427 +427 @@
 }
 
+static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
+{
+        struct jabber_chat *jc = c->data;
+        gchar *msg_alt = NULL;
+
+        if( msg == NULL )
+                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
+        
+        if( c && who )
+                jabber_chat_invite( c, who, msg ? msg : msg_alt );
+        
+        g_free( msg_alt );
+}
+
 static void jabber_keepalive( struct im_connection *ic )
 {
@@ -498 +512 @@
         ret->chat_msg = jabber_chat_msg_;
         ret->chat_topic = jabber_chat_topic_;
-//      ret->chat_invite = jabber_chat_invite;
+        ret->chat_invite = jabber_chat_invite_;
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;
@@ -504 +518 @@
         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

@@ -57 +57 @@
 } 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;
+
 struct jabber_data
 {
@@ -81 +89 @@
         GHashTable *node_cache;
         GHashTable *buddies;
+
+        GSList *filetransfers;
+        GSList *streamhosts;
+        int have_streamhosts;
 };
 
@@ -109 +121 @@
         struct jabber_away_state *away_state;
         char *away_message;
+        GSList *features;
         
         time_t last_act;
@@ -122 +135 @@
         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;
+
+        struct im_connection *ic;
+
+        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;
 };
 
@@ -149 +186 @@
 
 /* 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_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_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_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 */
@@ -167 +212 @@
 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 */
@@ -180 +237 @@
 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 );
@@ -237 +294 @@
 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 );
+void jabber_chat_invite( struct groupchat *c, char *who, char *message );
 
 #endif

protocols/jabber/jabber_util.c

@@ -97 +97 @@
 }
 
-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;
@@ -109 +109 @@
         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
@@ -291 +295 @@
         new = g_new( char, len + 1 );
         for( i = 0; i < len; i ++ )
+        {
+                /* don't normalize the resource */
+                if( orig[i] == '/' )
+                        break;
                 new[i] = tolower( orig[i] );
+        }
+        for( ; i < len; i ++ )
+                new[i] = orig[i];
         
         new[i] = 0;

protocols/msn/msn.c

@@ -241 +241 @@
 }
 
-static void msn_chat_invite( struct groupchat *c, char *msg, char *who )
+static void msn_chat_invite( struct groupchat *c, char *who, char *message )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );

protocols/nogaim.h

@@ -43 +43 @@
 #include "proxy.h"
 #include "md5.h"
+#include "ft.h"
 
 #define BUF_LEN MSG_LEN
@@ -228 +229 @@
          * - Most protocols will just want to set this to g_strcasecmp().*/
         int (* handle_cmp) (const char *who1, const char *who2);
+
+        /* Incoming transfer request */
+        void (* transfer_request) (struct im_connection *, file_transfer_t *ft, char *handle );
 };
 

protocols/oscar/aim.h

@@ -94 +94 @@
  *
  */
-#define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define AIM_DEFAULT_LOGIN_SERVER "login.messaging.aol.com"
 #define AIM_LOGIN_PORT 5190
 

protocols/oscar/oscar.c

@@ -341 +341 @@
         set_t *s;
         
-        s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
+        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
@@ -356 +356 @@
         struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
-        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... </bitlbee> */
-                /* ic->acc->pass[8] = 0;
-                   Not touching this anymore now that it belongs to account_t!
-                   Let's hope nothing will break. ;-) */
-        } else {
+        if (!isdigit(acc->user[0])) {
                 ic->flags |= OPT_DOES_HTML;
         }
@@ -385 +377 @@
         }
         
-        if (acc->server == NULL) {
-                imcb_error(ic, "No servername specified");
-                imc_logout(ic, FALSE);
-                return;
-        }
-        
-        if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
-            g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
-                imcb_log(ic, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
-        }
-        
         imcb_log(ic, _("Signon: %s"), ic->acc->user);
 
@@ -402 +383 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, ic);
+        conn->fd = proxy_connect(set_getstr(&acc->set, "server"),
+                                 AIM_LOGIN_PORT, oscar_login_connect, ic);
         if (conn->fd < 0) {
                 imcb_error(ic, _("Couldn't connect to host"));
@@ -2509 +2491 @@
 }
 
-void oscar_chat_invite(struct groupchat *c, char *message, char *who)
+void oscar_chat_invite(struct groupchat *c, char *who, char *message)
 {
         struct im_connection *ic = c->ic;

protocols/yahoo/yahoo.c

@@ -306 +306 @@
 }
 
-static void byahoo_chat_invite( struct groupchat *c, char *msg, char *who )
+static void byahoo_chat_invite( struct groupchat *c, char *who, char *msg )
 {
         struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;

root_commands.c

@@ -199 +199 @@
                 break;
         default:
-                irc_usermsg( irc, "Error: '%d'", status );
+                irc_usermsg( irc, "Error: `%d'", status );
                 break;
         }
@@ -234 +234 @@
                 a = account_add( irc, prpl, cmd[3], cmd[4] );
                 if( cmd[5] )
+                {
+                        irc_usermsg( irc, "Warning: Passing a servername/other flags to `account add' "
+                                          "is now deprecated. Use `account set' instead." );
                         set_setstr( &a->set, "server", cmd[5] );
+                }
                 
                 irc_usermsg( irc, "Account successfully added" );
@@ -317 +321 @@
                         else
                         {
-                                irc_usermsg( irc, "No accounts known. Use 'account add' to add one." );
+                                irc_usermsg( irc, "No accounts known. Use `account add' to add one." );
                         }
                 }
@@ -403 +407 @@
                         }
                         
-                        if( ( strcmp( cmd[3], "=" ) ) == 0 && cmd[4] )
-                                irc_usermsg( irc, "Warning: Correct syntax: \002account set <variable> <value>\002 (without =)" );
-                        else if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
+                        if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
                                 set_reset( &a->set, set_name );
                         else
@@ -745 +747 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        char *set_name = NULL;
+        char *set_name = cmd[1];
         
         if( cmd[1] && cmd[2] )
         {
-                if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
-                {
-                        irc_usermsg( irc, "Warning: Correct syntax: \002set <variable> <value>\002 (without =)" );
-                        return;
-                }
-                else if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
+                if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
                 {
                         set_reset( &irc->set, cmd[2] );
@@ -762 +759 @@
                 {
                         set_setstr( &irc->set, cmd[1], cmd[2] );
-                        set_name = cmd[1];
                 }
         }
@@ -972 +968 @@
                 irc_usermsg( irc, "Tried to join chat, not sure if this was successful" );
                 g_free( channel );
+        }
+}
+
+static void cmd_transfers( 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] &&
+                 ( fid = atoi( cmd[2] ) ) )
+        {
+                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;
+                                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;
+                }
         }
 }
@@ -995 +1056 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "transfers",      0, cmd_transfers,      0 },
         { NULL }
 };

tests/check_nick.c

@@ -15 +15 @@
                 "thisisave:ryveryveryverylongnick",
                 "t::::est",
+                "test123",
+                "123test",
+                "123",
                 NULL };
         const char *expected[] = { "test", "test", "test", 
@@ -20 +23 @@
                 "thisisaveryveryveryveryl", 
                 "test",
+                "test123",
+                "_123test",
+                "_123",
                 NULL };
 
@@ -35 +41 @@
 START_TEST(test_nick_ok_ok)
 {
-        const char *nicks[] = { "foo", "bar", "bla[", "blie]", 
-                                    "BreEZaH", "\\od^~", NULL };
+        const char *nicks[] = { "foo", "bar123", "bla[", "blie]", "BreEZaH",
+                                "\\od^~", "_123", "_123test", NULL };
         int i;
 
@@ -49 +55 @@
 {
         const char *nicks[] = { "thisisaveryveryveryveryveryveryverylongnick",
-                                    "\nillegalchar", "", "nick%", NULL };
+                                    "\nillegalchar", "", "nick%", "123test", NULL };
         int i;