Changeset 2c2df7d for root_commands.c

Timestamp:

2007-11-28T21:07:30Z (16 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.

File:

• root_commands.c (modified) (2 diffs)

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 }
 };