Changes in / [08135df:aaf92a9]

Files:

• Makefile (modified) (1 diff)
• conf.c (modified) (1 diff)
• conf.h (modified) (1 diff)
• dcc.c (deleted)
• dcc.h (deleted)
• doc/user-guide/commands.xml (modified) (1 diff)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)
• protocols/ft.h (deleted)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/jabber/iq.c (modified) (4 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (5 diffs)
• protocols/jabber/jabber_util.c (modified) (3 diffs)
• protocols/jabber/s5bytestream.c (deleted)
• protocols/jabber/si.c (deleted)
• protocols/nogaim.h (modified) (2 diffs)
• 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 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
+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
 subdirs = lib protocols
 

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/user-guide/commands.xml

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

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 );
@@ -996 +992 @@
                         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, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
+                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
                         return( 0 );
                 }

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

protocols/jabber/iq.c

@@ -87 +87 @@
                                                    XMLNS_CHATSTATES,
                                                    XMLNS_MUC,
-                                                   XMLNS_SI,
-                                                   XMLNS_BYTESTREAMS,
-                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -109 +106 @@
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
                         pack = 0;
                 }
@@ -115 +112 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                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" ) ) ||
+                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 );
                         
@@ -145 +140 @@
                                 
                                 xt_free_node( reply );
-                                reply = jabber_make_error_packet( node, "not-allowed", "cancel", NULL );
+                                reply = jabber_make_error_packet( node, "not-allowed", "cancel" );
                                 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
+                }
+                else
                 {
                         xt_free_node( reply );
-                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
+                        reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel" );
                         pack = 0;
                 }

protocols/jabber/jabber.c

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

@@ -81 +81 @@
         GHashTable *node_cache;
         GHashTable *buddies;
-
-        GSList *filetransfers;
 };
 
@@ -124 +122 @@
         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;
 };
 
@@ -175 +149 @@
 
 /* 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_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 */
+#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 */
 
 /* iq.c */
@@ -200 +168 @@
 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 );
-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 */
 xt_status jabber_pkt_message( struct xt_node *node, gpointer data );
@@ -222 +180 @@
 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, char *err_code );
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type );
 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, char *err_code )
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )
 {
         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
@@ -295 +291 @@
         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/nogaim.h

@@ -43 +43 @@
 #include "proxy.h"
 #include "md5.h"
-#include "ft.h"
 
 #define BUF_LEN MSG_LEN
@@ -229 +228 @@
          * - 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 );
 };
 

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