Changeset 9d6b229

Timestamp:

2006-01-14T20:34:10Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0431ea1

Parents:

5c577bd (diff), 277674c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Imported changes from main tree.

Files:

• bitlbee.c (modified) (2 diffs)
• configure (modified) (2 diffs)
• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• protocols/yahoo/Makefile (modified) (1 diff)
• protocols/yahoo/yahoo_list.c (deleted)
• protocols/yahoo/yahoo_list.h (modified) (1 diff)
• util.c (modified) (2 diffs)

bitlbee.c

@@ -194 +194 @@
         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 )
@@ -233 +213 @@
                 }
         }
-        
-#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

@@ -945 +945 @@
         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"

protocols/yahoo/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_list.o yahoo_util.o
+objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
 
 CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB

protocols/yahoo/yahoo_list.h

@@ -21 +21 @@
  */
 
-/*
- * This is a replacement for the GList.  It only provides functions that 
- * we use in Ayttm.  Thanks to Meredyyd from everybuddy dev for doing 
- * most of it.
- */
-
 #ifndef __YLIST_H__
 #define __YLIST_H__
 
-#ifdef __cplusplus
-extern "C" {
+/* GLib has linked list already, so I don't see why libyahoo2 has to copy this... */
+
+typedef GList YList;
+
+#define y_list_append g_list_append
+#define y_list_concat g_list_concat
+#define y_list_copy g_list_copy
+#define y_list_empty g_list_empty
+#define y_list_find g_list_find
+#define y_list_find_custom g_list_find_custom
+#define y_list_foreach g_list_foreach
+#define y_list_free g_list_free
+#define y_list_free_1 g_list_free_1
+#define y_list_insert_sorted g_list_insert_sorted
+#define y_list_length g_list_length
+#define y_list_next g_list_next
+#define y_list_nth g_list_nth
+#define y_list_prepend g_list_prepend
+#define y_list_remove g_list_remove
+#define y_list_remove_link g_list_remove_link
+#define y_list_singleton g_list_singleton
+
 #endif
-
-typedef struct _YList {
-        struct _YList *next;
-        struct _YList *prev;
-        void *data;
-} YList;
-
-typedef int (*YListCompFunc) (const void *, const void *);
-typedef void (*YListFunc) (void *, void *);
-
-YList *y_list_append(YList * list, void *data);
-YList *y_list_prepend(YList * list, void *data);
-YList *y_list_remove_link(YList * list, const YList * link);
-YList *y_list_remove(YList * list, void *data);
-
-YList *y_list_insert_sorted(YList * list, void * data, YListCompFunc comp);
-
-YList *y_list_copy(YList * list);
-
-YList *y_list_concat(YList * list, YList * add);
-
-YList *y_list_find(YList * list, const void *data);
-YList *y_list_find_custom(YList * list, const void *data, YListCompFunc comp);
-
-YList *y_list_nth(YList * list, int n);
-
-void y_list_foreach(YList * list, YListFunc fn, void *user_data);
-
-void y_list_free_1(YList * list);
-void y_list_free(YList * list);
-int  y_list_length(const YList * list);
-int  y_list_empty(const YList * list);
-int  y_list_singleton(const YList * list);
-
-#define y_list_next(list)       list->next
-
-#ifdef __cplusplus
-}
-#endif
-#endif

util.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <glib.h>
 #include <time.h>
@@ -377 +378 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' )
+                /* if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' ) */
+                if( !isalnum( t[i] ) )
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );