Changeset 019c031


Ignore:
Timestamp:
2005-12-04T21:55:15Z (14 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:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • bitlbee.c

    r500a1b6 r019c031  
    165165                return FALSE;
    166166        }
    167                
     167       
     168        /* Very naughty, go read the RFCs! >:) */
     169        if( irc->readbuffer && ( strlen( irc->readbuffer ) > 1024 ) )
     170        {
     171                log_message( LOGLVL_ERROR, "Maximum line length exceeded." );
     172                irc_free( irc );
     173                return FALSE;
     174        }
     175       
    168176        return TRUE;
    169177}
  • bitlbee.h

    r500a1b6 r019c031  
    3030
    3131#define PACKAGE "BitlBee"
    32 #define BITLBEE_VERSION "1.0pre"
     32#define BITLBEE_VERSION "1.0"
    3333#define VERSION BITLBEE_VERSION
    3434
  • configure

    r500a1b6 r019c031  
    5757--strip=0/1     Disable/enable binary stripping         $strip
    5858
    59 --flood=0/1     Flood protection                        $flood
    6059--ipv6=0/1      IPv6 socket support                     $ipv6
    6160
     
    287286
    288287if [ "$flood" = 1 ]; then
    289         echo '#define FLOOD_SEND' >> config.h
     288        # echo '#define FLOOD_SEND' >> config.h
     289        echo 'Flood protection is disabled in this release because of too many bugs.' 2> /dev/stderr
     290        rm config.h
     291        rm Makefile.settings
     292        exit 1
    290293fi
    291294
     
    345348case "$arch" in
    346349Linux )
    347         echo 'Linux.'
    348350;;
    349351GNU/* )
    350         echo 'Debian with non-Linux kernel?'
    351352;;
    352353*BSD )
    353         echo '*BSD.'
    354354        echo 'EFLAGS+=-liconv' >> Makefile.settings;
    355355;;
    356356SunOS )
    357         echo 'Solaris.'
    358357        echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
    359358        echo 'STRIP=\# skip strip' >> Makefile.settings
     
    361360;;
    362361Darwin )
    363         echo 'Darwin/Mac OS X.'
    364362        echo 'EFLAGS+=-liconv' >> Makefile.settings;
    365363;;
    366364IRIX )
    367         echo 'IRIX.'
    368365;;
    369366CYGWIN* )
     
    371368;;
    372369* )
    373         echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV. Please report any problems to <wilmer@gaast.net>.'
     370        echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
     371        echo 'Please report any problems at http://bugs.bitlbee.org/.'
    374372;;
    375373esac
     
    394392fi
    395393
    396 if [ "$flood" = "0" ]; then
    397         echo '  Flood protection disabled.';
    398 else
    399         echo '  Flood protection enabled.';
    400 fi
     394#if [ "$flood" = "0" ]; then
     395#       echo '  Flood protection disabled.';
     396#else
     397#       echo '  Flood protection enabled.';
     398#fi
    401399
    402400if [ -n "$protocols" ]; then
  • doc/AUTHORS

    r500a1b6 r019c031  
    44        Main developer
    55
    6 Jelmer 'ctrlsoft' Vernooij <jelmer@nl.linux.org>
     6Jelmer 'ctrlsoft' Vernooij <jelmer@samba.org>
    77        Documentation, general hacking, Win32 port
    88
  • doc/CHANGES

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

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

    r500a1b6 r019c031  
    108108See utils/bitlbeed.c for more information about the program.
    109109
    110 Just a little note: We run our public server im.bitlbee.org for a couple of
    111 months now, and so far we haven't experienced this problem yet. The only
    112 BitlBee processes killed because of CPU-time overuse were running for a long
    113 time already, they were usually killed during the MSN login process (which
    114 is quite CPU-time consuming).
     110Just a little note: Now that we reach version 1.0, this shouldn't be that
     111much of an issue anymore. However, on a public server, especially if you
     112also use it for other things, it can't hurt to protect yourself against
     113possible problems.
    115114
    116115
     
    145144You can find new releases of BitlBee at:
    146145http://www.bitlbee.org/
     146
     147The bug tracking system:
     148http://bugs.bitlbee.org/
     149
     150Our version control system is Bazaar-NG. Our repository is at:
     151http://code.bitlbee.org/
    147152
    148153
     
    187192        BitlBee - An IRC to other chat networks gateway
    188193                  <http://www.bitlbee.org/>
    189         Copyright (C) 2002-2004  Wilmer van der Gaast <wilmer@gaast.net>
     194        Copyright (C) 2002-2005  Wilmer van der Gaast <wilmer@gaast.net>
    190195                                 and others
  • doc/user-guide/user-guide.xml

    r500a1b6 r019c031  
    2121
    2222        <legalnotice id="legalnotice">
    23      <para>
    24          Permission is granted to copy, distribute and/or modify this
    25          document under the terms of the <ulink type="help"
    26          url="gnome-help:fdl"><citetitle>GNU Free Documentation
    27          License</citetitle></ulink>, Version 1.1 or any later version
    28          published by the Free Software Foundation with no Invariant
    29          Sections, no Front-Cover Texts, and no Back-Cover Texts. You
    30          may obtain a copy of the <citetitle>GNU Free Documentation
    31          License</citetitle> from the Free Software Foundation by
    32          visiting <ulink type="http" url="http://www.fsf.org">their
    33          Web site</ulink> or by writing to: Free Software Foundation,
    34          Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    35          USA.
    36        </para>
    3723    </legalnotice>
    3824
    3925   <releaseinfo>
    40                 This is the initial release of the BitlBee User Guide.
     26                This is the BitlBee User Guide. For now, the on-line help is
     27                the most up-to-date documentation. Although this document shares
     28                some parts with the on-line help system, other parts might be
     29                very outdated.
    4130   </releaseinfo>
    4231
  • irc.c

    r500a1b6 r019c031  
    15101510                        {
    15111511                                irc_write( irc, ":%s!%s@%s %s %s :%s%s", u->nick, u->user, u->host,
    1512                                            type, to, prefix, line );
     1512                                           type, to, prefix ? prefix : "", line );
    15131513                        }
    15141514                        line = s + 1;
  • protocols/jabber/jabber.c

    r500a1b6 r019c031  
    2222 */
    2323
    24 #ifdef HAVE_CONFIG_H
    25 #include "config.h"
    26 #endif
    27 
    2824#ifndef _WIN32
    2925#include <sys/utsname.h>
     
    5955#define DEFAULT_PORT 5222
    6056#define DEFAULT_PORT_SSL 5223
     57#define JABBER_PORT_MIN 5220
     58#define JABBER_PORT_MAX 5229
    6159
    6260#define JABBER_GROUP "Friends"
     
    541539        gjconn gjc;
    542540       
    543         if (!g_slist_find(get_connections(), gc)) {
    544                 ssl_disconnect(source);
    545                 return;
    546         }
    547        
    548541        jd = gc->proto_data;
    549542        gjc = jd->gjc;
     
    551544        if (source == NULL) {
    552545                STATE_EVT(JCONN_STATE_OFF)
     546                return;
     547        }
     548       
     549        if (!g_slist_find(get_connections(), gc)) {
     550                ssl_disconnect(source);
    553551                return;
    554552        }
     
    589587        else if (port == -1 && ssl)
    590588                port = DEFAULT_PORT_SSL;
     589        else if (port < JABBER_PORT_MIN || port > JABBER_PORT_MAX) {
     590                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);
     591                STATE_EVT(JCONN_STATE_OFF)
     592                return;
     593        }
    591594       
    592595        if (server == NULL)
  • protocols/nogaim.c

    r500a1b6 r019c031  
    452452void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
    453453{
    454         serv_got_crap( gc, "Error: %s", msg );
     454        if( msg && title )
     455                serv_got_crap( gc, "Error: %s: %s", title, msg );
     456        else if( msg )
     457                serv_got_crap( gc, "Error: %s", msg );
     458        else if( title )
     459                serv_got_crap( gc, "Error: %s", title );
     460        else
     461                serv_got_crap( gc, "Error" );
    455462}
    456463
     
    737744                /* If there's a newline/space in this string, split up there,
    738745                   looks a bit prettier. */
    739                 if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
     746                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
    740747                {
    741748                        msg[425] = tmp;
     
    769776       
    770777        if( ( u = user_findhandle( gc, handle ) ) )
    771                 irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
     778                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
    772779}
    773780
  • protocols/proxy.c

    r500a1b6 r019c031  
    114114}
    115115
    116 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
     116static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond)
    117117{
    118118        struct PHB *phb = data;
     
    163163        if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
    164164                if (sockerr_again()) {
    165                         phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
     165                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
    166166                        phb->fd = fd;
    167167                } else {
  • protocols/yahoo/crypt.c

    r500a1b6 r019c031  
    2222 * already had. isn't that lovely. people should just use linux or
    2323 * freebsd, crypt works properly on those systems. i hate solaris */
    24 
    25 #if HAVE_CONFIG_H
    26 #  include <config.h>
    27 #endif
    2824
    2925#if HAVE_STRING_H
  • protocols/yahoo/libyahoo2.c

    r500a1b6 r019c031  
    4343 *
    4444 */
    45 
    46 #if HAVE_CONFIG_H
    47 # include <config.h>
    48 #endif
    4945
    5046#ifndef _WIN32
  • protocols/yahoo/yahoo_httplib.c

    r500a1b6 r019c031  
    1919 *
    2020 */
    21 
    22 #if HAVE_CONFIG_H
    23 # include <config.h>
    24 #endif
    2521
    2622#include <stdio.h>
  • protocols/yahoo/yahoo_util.c

    r500a1b6 r019c031  
    1919 *
    2020 */
    21 
    22 #if HAVE_CONFIG_H
    23 # include <config.h>
    24 #endif
    2521
    2622#if STDC_HEADERS
Note: See TracChangeset for help on using the changeset viewer.