Changeset 4fe4be2

Timestamp:

2006-01-10T14:20:48Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd8d4c5

Parents:

2d75b56

Message:

Removed send-flood protection code completely.

Files:

• bitlbee.c (modified) (2 diffs)
• configure (modified) (2 diffs)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)

bitlbee.c

@@ -220 +220 @@
         int st, size;
         char *temp;
-#ifdef FLOOD_SEND
-        time_t newtime;
-#endif
-
-#ifdef FLOOD_SEND       
-        newtime = time( NULL );
-        if( ( newtime - irc->oldtime ) > FLOOD_SEND_INTERVAL )
-        {
-                irc->sentbytes = 0;
-                irc->oldtime = newtime;
-        }
-#endif
-        
+
         if( irc->sendbuffer == NULL )
                 return( FALSE );
         
         size = strlen( irc->sendbuffer );
-        
-#ifdef FLOOD_SEND
-        if( ( FLOOD_SEND_BYTES - irc->sentbytes ) > size )
-                st = write( irc->fd, irc->sendbuffer, size );
-        else
-                st = write( irc->fd, irc->sendbuffer, ( FLOOD_SEND_BYTES - irc->sentbytes ) );
-#else
         st = write( irc->fd, irc->sendbuffer, size );
-#endif
         
         if( st <= 0 )
@@ -259 +239 @@
                 }
         }
-        
-#ifdef FLOOD_SEND
-        irc->sentbytes += st;
-#endif          
         
         if( st == size )

configure

@@ -23 +23 @@
 debug=0
 strip=1
-flood=0
 ipv6=1
 ssl=auto
@@ -289 +288 @@
 fi
 
-if [ "$flood" = 1 ]; then
-        # echo '#define FLOOD_SEND' >> config.h
-        echo 'Flood protection is disabled in this release because of too many bugs.' 2> /dev/stderr
-        rm config.h
-        rm Makefile.settings
-        exit 1
-fi
-
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr -a -x "`which bzr`" ]; then

irc.c

@@ -941 +941 @@
         if( irc->sendbuffer != NULL ) {
                 size = strlen( irc->sendbuffer ) + strlen( line );
-#ifdef FLOOD_SEND
-                if( size > FLOOD_SEND_MAXBUFFER ) {
-                        /* Die flooder, die! >:) */
-
-                        g_free(irc->sendbuffer);
-                        
-                        /* We need the \r\n at the start because else we might append our string to a half
-                         * sent line. A bit hackish, but it works.
-                         */
-                        irc->sendbuffer = g_strdup( "\r\nERROR :Sendq Exceeded\r\n" );
-                        irc->quit = 1;
-                        
-                        return;
-                }
-#endif
                 irc->sendbuffer = g_renew ( char, irc->sendbuffer, size + 1 );
                 strcpy( ( irc->sendbuffer + strlen( irc->sendbuffer ) ), line );

irc.h

@@ -32 +32 @@
 #define IRC_LOGIN_TIMEOUT 60
 #define IRC_PING_STRING "PinglBee"
-
-/* #define FLOOD_SEND 
- * Not yet enabled by default due to some problems.
- */
-#define FLOOD_SEND_INTERVAL 30
-#define FLOOD_SEND_BYTES (1024*10)
-#define FLOOD_SEND_MAXBUFFER (1024*20)
 
 #define UMODES "ias"