Changeset 019c031

Timestamp:

2005-12-04T21:55:15Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

568aaf7

Parents:

500a1b6 (diff), d636233 (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:

Merge from Wilmer

Files:

• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• configure (modified) (6 diffs)
• doc/AUTHORS (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/FAQ (modified) (2 diffs)
• doc/README (modified) (3 diffs)
• doc/TODO (deleted)
• doc/user-guide/user-guide.xml (modified) (1 diff)
• irc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (5 diffs)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/proxy.c (modified) (2 diffs)
• protocols/yahoo/crypt.c (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (1 diff)
• protocols/yahoo/yahoo_util.c (modified) (1 diff)

bitlbee.c

@@ -165 +165 @@
                 return FALSE;
         } 
-                
+        
+        /* Very naughty, go read the RFCs! >:) */
+        if( irc->readbuffer && ( strlen( irc->readbuffer ) > 1024 ) )
+        {
+                log_message( LOGLVL_ERROR, "Maximum line length exceeded." );
+                irc_free( irc );
+                return FALSE;
+        }
+        
         return TRUE;
 }

bitlbee.h

@@ -30 +30 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.0pre"
+#define BITLBEE_VERSION "1.0"
 #define VERSION BITLBEE_VERSION
 

configure

@@ -57 +57 @@
 --strip=0/1     Disable/enable binary stripping         $strip
 
---flood=0/1     Flood protection                        $flood
 --ipv6=0/1      IPv6 socket support                     $ipv6
 
@@ -287 +286 @@
 
 if [ "$flood" = 1 ]; then
-        echo '#define FLOOD_SEND' >> config.h
+        # 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
 
@@ -345 +348 @@
 case "$arch" in
 Linux )
-        echo 'Linux.'
 ;;
 GNU/* )
-        echo 'Debian with non-Linux kernel?'
 ;;
 *BSD )
-        echo '*BSD.'
         echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 SunOS )
-        echo 'Solaris.'
         echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
         echo 'STRIP=\# skip strip' >> Makefile.settings
@@ -361 +360 @@
 ;;
 Darwin )
-        echo 'Darwin/Mac OS X.'
         echo 'EFLAGS+=-liconv' >> Makefile.settings;
 ;;
 IRIX )
-        echo 'IRIX.'
 ;;
 CYGWIN* )
@@ -371 +368 @@
 ;;
 * )
-        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV. Please report any problems to <wilmer@gaast.net>.'
+        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
+        echo 'Please report any problems at http://bugs.bitlbee.org/.'
 ;;
 esac
@@ -394 +392 @@
 fi
 
-if [ "$flood" = "0" ]; then
-        echo '  Flood protection disabled.';
-else
-        echo '  Flood protection enabled.';
-fi
+#if [ "$flood" = "0" ]; then
+#       echo '  Flood protection disabled.';
+#else
+#       echo '  Flood protection enabled.';
+#fi
 
 if [ -n "$protocols" ]; then

doc/AUTHORS

@@ -4 +4 @@
         Main developer
 
-Jelmer 'ctrlsoft' Vernooij <jelmer@nl.linux.org>
+Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
         Documentation, general hacking, Win32 port
 

doc/CHANGES

@@ -11 +11 @@
   handlers for headline messages (which allows you to use RSS-to-Jabber
   gateways).
-
-Finished ...
+- Lowered the line splitting limit a bit to fix data loss issues.
+- The $proto($handle) format used for messages specific to one IM-connection
+  now only include the ($handle) part when there's more than one $proto-
+  connection.
+- Fix for a crash-bug on broken Jabber/SSL connections.
+- Incoming typing notifications now also come in as CTCP TYPING messages, for
+  better consistency. Don't forget to update your scripts!
+- AIM typing notifications are supported now.
+- Jabber module only accepts ports 5220-5229 now, to prevent people from
+  abusing it as a port scanner. We aren't aware of any Jabber server that
+  runs on other ports than those. If you are, please warn us.
+- Send flood protection can't be enabled anymore. It was disabled by default
+  for a good reason for some time already, but some package maintainers
+  turned it back on while it's way too unreliable and trigger-happy to be
+  used.
+- Removed TODO file, the current to-do list is always in the on-line bug
+  tracking system.
+- Fixed a potential DoS bug in input handling.
+
+Finished 4 Dec 2005
 
 Version 0.99:

doc/FAQ

@@ -39 +39 @@
 
 Q: When is $random_feature going to be implemented?
-A: Please do consult doc/TODO (preferably in a development snapshot, which
-   is more up-to-date than a TODO in a release version) before asking.
-   Please also check the documentation. You'd not be the first one to request
-   a feature which already exists!
-   
-   If your fabulous feature seems not to be requested before, just join
-   #bitlbee on irc.oftc.net and tell us the news.
-   
-   If your feature request is already in the TODO list, of course you can
-   still request it again/make us know that you'd like to see the feature as
-   well. But when the feature is in the "post-1.0" list, it's probably not
-   going to help. Most of the features in this list are low-priority because
-   we (the developers) don't need (or even want) them. (File transfers are a
-   good example here.)
-   Hence, they'll only be implemented when we really got too much spare
-   time. Obviously, if you're willing to help (i.e. submit a patch), you're
-   always welcome.
+A: It depends on the feature. We keep a list of all wishlist "bugs" in our
+   Bug Tracking system at http://bugs.bitlbee.org/
 
 Q: The messages I send and/or receive look weird. I see weird characters and
@@ -61 +46 @@
    non-ASCII characters!
 A: You probably have to change some settings. To get rid of HTML in messages,
-   see "help set html". If you seem to have problems with your charset, see
-   "help set charset".
+   see "help set strip_html". If you seem to have problems with your charset,
+   see "help set charset".
+   
+   Although actually most of these problems should be gone by now. So if you
+   can't get things to work well, you might have found a bug.
 
 Q: Is BitlBee forked from Gaim?

doc/README

@@ -108 +108 @@
 See utils/bitlbeed.c for more information about the program.
 
-Just a little note: We run our public server im.bitlbee.org for a couple of
-months now, and so far we haven't experienced this problem yet. The only
-BitlBee processes killed because of CPU-time overuse were running for a long
-time already, they were usually killed during the MSN login process (which
-is quite CPU-time consuming).
+Just a little note: Now that we reach version 1.0, this shouldn't be that
+much of an issue anymore. However, on a public server, especially if you
+also use it for other things, it can't hurt to protect yourself against
+possible problems.
 
 
@@ -145 +144 @@
 You can find new releases of BitlBee at:
 http://www.bitlbee.org/
+
+The bug tracking system:
+http://bugs.bitlbee.org/
+
+Our version control system is Bazaar-NG. Our repository is at:
+http://code.bitlbee.org/
 
 
@@ -187 +192 @@
         BitlBee - An IRC to other chat networks gateway 
                   <http://www.bitlbee.org/>
-        Copyright (C) 2002-2004  Wilmer van der Gaast <wilmer@gaast.net>
+        Copyright (C) 2002-2005  Wilmer van der Gaast <wilmer@gaast.net>
                                  and others

doc/user-guide/user-guide.xml

@@ -21 +21 @@
 
         <legalnotice id="legalnotice">
-     <para>
-         Permission is granted to copy, distribute and/or modify this 
-         document under the terms of the <ulink type="help"
-         url="gnome-help:fdl"><citetitle>GNU Free Documentation 
-         License</citetitle></ulink>, Version 1.1 or any later version 
-         published by the Free Software Foundation with no Invariant 
-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You 
-         may obtain a copy of the <citetitle>GNU Free Documentation 
-         License</citetitle> from the Free Software Foundation by 
-         visiting <ulink type="http" url="http://www.fsf.org">their 
-         Web site</ulink> or by writing to: Free Software Foundation, 
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-         USA.
-       </para>
     </legalnotice>
 
    <releaseinfo>
-                This is the initial release of the BitlBee User Guide.
+                This is the BitlBee User Guide. For now, the on-line help is
+                the most up-to-date documentation. Although this document shares
+                some parts with the on-line help system, other parts might be
+                very outdated.
    </releaseinfo>
 

irc.c

@@ -1510 +1510 @@
                         {
                                 irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
-                                           type, to, prefix, line );
+                                           type, to, prefix ? prefix : "", line );
                         }
                         line = s + 1;

protocols/jabber/jabber.c

@@ -22 +22 @@
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef _WIN32
 #include <sys/utsname.h>
@@ -59 +55 @@
 #define DEFAULT_PORT 5222
 #define DEFAULT_PORT_SSL 5223
+#define JABBER_PORT_MIN 5220
+#define JABBER_PORT_MAX 5229
 
 #define JABBER_GROUP "Friends"
@@ -541 +539 @@
         gjconn gjc;
         
-        if (!g_slist_find(get_connections(), gc)) {
-                ssl_disconnect(source);
-                return;
-        }
-        
         jd = gc->proto_data;
         gjc = jd->gjc;
@@ -551 +544 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
+                return;
+        }
+        
+        if (!g_slist_find(get_connections(), gc)) {
+                ssl_disconnect(source);
                 return;
         }
@@ -589 +587 @@
         else if (port == -1 && ssl)
                 port = DEFAULT_PORT_SSL;
+        else if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
+                serv_got_crap(GJ_GC(gjc), "For security reasons, the Jabber port number must be in the %d-%d range.", JABBER_PORT_MIN, JABBER_PORT_MAX);
+                STATE_EVT(JCONN_STATE_OFF)
+                return;
+        }
         
         if (server == NULL)

protocols/nogaim.c

@@ -452 +452 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        serv_got_crap( gc, "Error: %s", msg );
+        if( msg && title )
+                serv_got_crap( gc, "Error: %s: %s", title, msg );
+        else if( msg )
+                serv_got_crap( gc, "Error: %s", msg );
+        else if( title )
+                serv_got_crap( gc, "Error: %s", title );
+        else
+                serv_got_crap( gc, "Error" );
 }
 
@@ -737 +744 @@
                 /* If there's a newline/space in this string, split up there,
                    looks a bit prettier. */
-                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
+                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
                 {
                         msg[425] = tmp;
@@ -769 +776 @@
         
         if( ( u = user_findhandle( gc, handle ) ) )
-                irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
+                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
 }
 

protocols/proxy.c

@@ -114 +114 @@
 }
 
-static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
+static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond)
 {
         struct PHB *phb = data;
@@ -163 +163 @@
         if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
                 if (sockerr_again()) {
-                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
+                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
                         phb->fd = fd;
                 } else {

protocols/yahoo/crypt.c

@@ -22 +22 @@
  * already had. isn't that lovely. people should just use linux or
  * freebsd, crypt works properly on those systems. i hate solaris */
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
 
 #if HAVE_STRING_H

protocols/yahoo/libyahoo2.c

@@ -43 +43 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #ifndef _WIN32

protocols/yahoo/yahoo_httplib.c

@@ -19 +19 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #include <stdio.h>

protocols/yahoo/yahoo_util.c

@@ -19 +19 @@
  *
  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
 
 #if STDC_HEADERS