Changeset 2c2df7d

Timestamp:

2007-11-28T21:07:30Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

2ff2076, fa30fa5

Parents:

221a273

Message:

Initial import of jabber file receive and DCC send support. This introduces
only a few changes to bitlbees code, mainly the addition of the "transfers"
command.

This is known to work with Kopete, Psi, and Pidgin (formerly known as gaim).
At least with Pidgin also over a proxy. DCC has only been tested with irssi.
IPV6 is untested but should work.

Currently, only receiving via SOCKS5BYTESREAMS is implemented. I'm not sure if
the alternative(in-band bytestreams IBB) is worth implementing since I didn't
see a client yet that can do it. Additionally, it is probably very slow and
needs support by the server as well.

Files:

• Makefile (modified) (1 diff)
• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• dcc.c (added)
• dcc.h (added)
• irc.h (modified) (1 diff)
• protocols/ft.h (added)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/iq.c (modified) (4 diffs)
• protocols/jabber/jabber.h (modified) (5 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/jabber/si.c (added)
• protocols/jabber/stream.c (added)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (2 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
 

conf.c

@@ -63 +63 @@
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
+        conf->max_filetransfer_size = G_MAXUINT;
         proxytype = 0;
         

conf.h

@@ -49 +49 @@
         int ping_interval;
         int ping_timeout;
+        size_t max_filetransfer_size;
 } conf_t;
 

irc.h

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

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 stream.o
 
 CFLAGS += -Wall

protocols/jabber/iq.c

@@ -104 +104 @@
                                                    XMLNS_CHATSTATES,
                                                    XMLNS_MUC,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -123 +126 @@
                 {
                         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;
                 }
@@ -129 +132 @@
         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 );
                         
@@ -157 +162 @@
                                 
                                 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_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;
                 }

protocols/jabber/jabber.h

@@ -81 +81 @@
         GHashTable *node_cache;
         GHashTable *buddies;
+
+        GSList *filetransfers;
 };
 
@@ -122 +124 @@
         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 receiver_overflow;
+        int fd;
 };
 
@@ -149 +175 @@
 
 /* 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_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_DISCOVER     "http://jabber.org/protocol/disco#info"               /* 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 */
@@ -168 +200 @@
 int jabber_remove_from_roster( struct im_connection *ic, char *handle );
 
+/* si.c */
+int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, struct xt_node *sinode);
+
+/* stream.c */
+int jabber_bs_request( struct im_connection *ic, struct xt_node *node, struct xt_node *qnode);
+
 /* message.c */
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data );
@@ -180 +218 @@
 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

@@ -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

protocols/nogaim.h

@@ -43 +43 @@
 #include "proxy.h"
 #include "md5.h"
+#include "ft.h"
 
 #define BUF_LEN MSG_LEN

root_commands.c

@@ -972 +972 @@
                 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 +1060 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "transfers",      0, cmd_transfers,      0 },
         { NULL }
 };