Changeset 6197702

Timestamp:

2010-10-09T18:41:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d150a9d

Parents:

23b29c6 (diff), 27b407f (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:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

Files:

• Makefile (modified) (5 diffs)
• bitlbee.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• configure (modified) (5 diffs)
• debian/control (modified) (2 diffs)
• debian/rules (modified) (5 diffs)
• doc/README (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (3 diffs)
• irc.c (modified) (6 diffs)
• irc.h (modified) (5 diffs)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (7 diffs)
• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (1 diff)
• lib/misc.c (modified) (2 diffs)
• lib/ssl_bogus.c (modified) (2 diffs)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_nss.c (modified) (2 diffs)
• lib/ssl_openssl.c (modified) (2 diffs)
• log.c (modified) (6 diffs)
• log.h (modified) (2 diffs)
• nick.c (modified) (1 diff)
• otr.c (added)
• otr.h (added)
• protocols/bee_user.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• query.c (modified) (3 diffs)
• root_commands.c (modified) (3 diffs)
• sock.h (modified) (1 diff)
• storage.c (modified) (5 diffs)
• unix.c (modified) (2 diffs)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS)
 headers = bitlbee.h commands.h conf.h config.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h lib/events.h lib/ftutil.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/account.h protocols/bee.h protocols/ft.h protocols/nogaim.h
 subdirs = lib protocols
@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE)
+all: $(OUTFILE) $(OTR_PI)
         $(MAKE) -C doc
 
@@ -33 +33 @@
         @echo -e '\nmake uninstall does not remove files in '$(DESTDIR)$(ETCDIR)', you can use make uninstall-etc to do that.\n'
 
-install: install-bin install-doc
+install: install-bin install-doc install-plugins
         @if ! [ -d $(DESTDIR)$(CONFIG) ]; then echo -e '\nThe configuration directory $(DESTDIR)$(CONFIG) does not exist yet, don'\''t forget to create it!'; fi
         @if ! [ -e $(DESTDIR)$(ETCDIR)/bitlbee.conf ]; then echo -e '\nNo files are installed in '$(DESTDIR)$(ETCDIR)' by make install. Run make install-etc to do that.'; fi
         @echo
 
-.PHONY:   install   install-bin   install-etc   install-doc \
+.PHONY:   install   install-bin   install-etc   install-doc install-plugins \
         uninstall uninstall-bin uninstall-etc uninstall-doc \
         all clean distclean tar $(subdirs)
@@ -104 +104 @@
         -rmdir $(DESTDIR)$(ETCDIR)
 
+install-plugins:
+ifdef OTR_PI
+        mkdir -p $(DESTDIR)$(PLUGINDIR)
+        install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+endif
+
 tar:
         fakeroot debian/rules clean || make distclean
@@ -112 +118 @@
 $(subdirs):
         @$(MAKE) -C $@ $(MAKECMDGOALS)
+
+$(OTR_PI): %.so: $(SRCDIR)%.c
+        @echo '*' Building plugin $@
+        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
 
 $(objects): %.o: $(SRCDIR)%.c

bitlbee.h

@@ -162 +162 @@
 void root_command_string( irc_t *irc, char *command );
 void root_command( irc_t *irc, char *command[] );
+gboolean root_command_add( const char *command, int params, void (*func)(irc_t *, char **args), int flags );
 gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond );
 gboolean bitlbee_shutdown( gpointer data, gint fd, b_input_condition cond );

commands.h

@@ -37 +37 @@
 } command_t;
 
-extern const command_t commands[];
+extern command_t root_commands[];
 
 #define IRC_CMD_PRE_LOGIN       1

configure

@@ -34 +34 @@
 gcov=0
 plugins=1
+otr=0
 
 events=glib
@@ -72 +73 @@
 
 --purple=0/1    Disable/enable libpurple support        $purple
+                (automatically disables other protocol modules)
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -77 +79 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
+--otr=0/1/auto/plugin
+                Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events
@@ -489 +493 @@
 fi
 
+otrprefix=""
+for i in / /usr /usr/local; do
+        if [ -f ${i}/lib/libotr.a ]; then
+                otrprefix=${i}
+                break
+        fi
+done
+if [ "$otr" = "auto" ]; then
+        if [ -n "$otrprefix" ]; then
+                otr=1
+        else
+                otr=0
+        fi
+fi
+if [ "$otr" = 1 ]; then
+        # BI == built-in
+        echo '#define OTR_BI' >> config.h
+        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        echo 'OTR_BI=otr.o' >> Makefile.settings
+elif [ "$otr" = "plugin" ]; then
+        echo '#define OTR_PI' >> config.h
+        echo "OTRFLAGS=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+        echo 'OTR_PI=otr.so' >> Makefile.settings
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
         echo
@@ -683 +714 @@
 fi
 
+if [ "$otr" = "1" ]; then
+        echo '  Off-the-Record (OTR) Messaging enabled.'
+elif [ "$otr" = "plugin" ]; then
+        echo '  Off-the-Record (OTR) Messaging enabled (as a plugin).'
+else
+        echo '  Off-the-Record (OTR) Messaging disabled.'
+fi
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.8.4
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -59 +59 @@
  .
  This package holds development stuff for compiling plug-ins.
+
+Package: bitlbee-plugin-otr
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version})
+Description: An IRC to other chat networks gateway (default version)
+ This program can be used as an IRC server which forwards everything you
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ .
+ This package contains a plugin that adds support for Off-The-Record
+ encryption of instant messages.

debian/rules

@@ -8 +8 @@
 #
 
-# Include the bitlbee-libpurple variant by default
+# Include the bitlbee-libpurple variant and OTR plugin by default
 BITLBEE_LIBPURPLE ?= 1
+BITLBEE_OTR ?= plugin
 BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
@@ -22 +23 @@
 endif
 
+ifneq ($(BITLBEE_OTR),plugin)
+DH_OPTIONS += -Nbitlbee-plugin-otr
+endif
+
 build: build-stamp
 build-stamp:
@@ -27 +32 @@
 
         mkdir -p debian/build-native
-        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(BITLBEE_CONFIGURE_FLAGS)
+        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-native
 
@@ -56 +61 @@
         dh_installdirs
 
-        $(MAKE) -C debian/build-native install DESTDIR=`pwd`/debian/bitlbee
-        $(MAKE) -C debian/build-native install-etc DESTDIR=`pwd`/debian/bitlbee-common
+        $(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee
+        $(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common
         $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
-        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        $(MAKE) -C debian/build-native install-plugins DESTDIR=`pwd`/debian/bitlbee-plugin-otr
 
 ifeq ($(BITLBEE_LIBPURPLE),1)
-        $(MAKE) -C debian/build-libpurple install DESTDIR=`pwd`/debian/bitlbee-libpurple
+        $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple
         ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm
 endif
 
-        mkdir -p debian/bitlbee-common/usr
-        mv debian/bitlbee/usr/share debian/bitlbee-common/usr
-        rm -rf debian/bitlbee-libpurple/usr/share
+        patch debian/bitlbee-common/etc/bitlbee/bitlbee.conf debian/patches/bitlbee.conf.diff
+        chmod 640 debian/bitlbee-common/etc/bitlbee/bitlbee.conf
 
 binary-common:
@@ -79 +83 @@
         # TODO: Restore --link-doc up here and remove the hack below once
         # Hardy and Lenny are deprecated.
-        for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
+        for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
         dh_installdebconf
         dh_installinit --init-script=bitlbee

doc/README

@@ -66 +66 @@
 BitlBee's only real dependency is GLib. This is available on virtually every
 platform. Any recent version of GLib (2.4 or higher) will work.
+
+Off-the-Record encryption support can be included if libotr is available on
+your machine. Pass --otr=1 to configure to build it into BitlBee, or
+--otr=plugin to build it as a separate loadable plugin (mostly meant for
+distro packages).
 
 These days, many IM protocols use SSL/TLS connections (for authentication
@@ -145 +150 @@
 
 
-A NOTE ON ENCRYPTION
-====================
+A NOTE ON PASSWORD ENCRYPTION
+=============================
 
 There used to be a note here about the simple obfuscation method used to

doc/user-guide/commands.xml

@@ -367 +367 @@
                 </description>
         </bitlbee-command>
+        
+        <bitlbee-command name="otr">
+                <short-description>Off-the-Record encryption control</short-description>
+                <syntax>otr &lt;subcommand&gt; [&lt;arguments&gt;]</syntax>
+
+                <description>
+
+                        <para>
+                                Available subcommands: connect, disconnect, smp, smpq, trust, info, keygen, and forget. See <emphasis>help otr &lt;subcommand&gt;</emphasis> for more information.
+                        </para>
+
+                </description>
+                
+                <bitlbee-command name="connect">
+                        <syntax>otr connect &lt;nick&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Attempts to establish an encrypted connection with the specified user by sending a magic string.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="disconnect">
+                        <syntax>otr disconnect &lt;nick&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Resets the connection with the specified user to cleartext.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="smp">
+                        <syntax>otr smp &lt;nick&gt; &lt;secret&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Attempts to authenticate the given user's active fingerprint via the Socialist Millionaires' Protocol.
+                                </para>
+                                
+                                <para>
+                                        If an SMP challenge has been received from the given user, responds with the specified secret/answer. Otherwise, sends a challenge for the given secret.
+                                </para>
+                                
+                                <para>
+                                        Note that there are two flavors of SMP challenges: "shared-secret" and "question &amp; answer". This command is used to respond to both of them, or to initiate a shared-secret style exchange. Use the <emphasis>otr smpq</emphasis> command to initiate a "Q&amp;A" session.
+                                </para>
+                                
+                                <para>
+                                        When responding to a "Q&amp;A" challenge, the local trust value is not altered. Only the <emphasis>asking party</emphasis> sets trust in the case of success. Use <emphasis>otr smpq</emphasis> to pose your challenge. In a shared-secret exchange, both parties set their trust according to the outcome.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="smpq">
+                        <syntax>otr smpq &lt;nick&gt; &lt;question&gt; &lt;answer&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Attempts to authenticate the given user's active fingerprint via the Socialist Millionaires' Protocol, Q&amp;A style.
+                                </para>
+
+                                <para>
+                                        Initiates an SMP session in "question &amp; answer" style. The question is transmitted with the initial SMP packet and used to prompt the other party. You must be confident that only they know the answer. If the protocol succeeds (i.e. they answer correctly), the fingerprint will be trusted. Note that the answer must be entered exactly, case and punctuation count!
+                                </para>
+                                
+                                <para>
+                                        Note that this style of SMP only affects the trust setting on your side. Expect your opponent to send you their own challenge. Alternatively, if you and the other party have a shared secret, use the <emphasis>otr smp</emphasis> command.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="trust">
+                        <syntax>otr trust &lt;nick&gt; &lt;fp1&gt; &lt;fp2&gt; &lt;fp3&gt; &lt;fp4&gt; &lt;fp5&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Manually affirms trust in the specified fingerprint, given as five blocks of precisely eight (hexadecimal) digits each.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="info">
+                        <syntax>otr info</syntax>
+                        <syntax>otr info &lt;nick&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Shows information about the OTR state. The first form lists our private keys and current OTR contexts. The second form displays information about the connection with a given user, including the list of their known fingerprints.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="keygen">
+                        <syntax>otr keygen &lt;account-no&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Generates a new OTR private key for the given account.
+                                </para>
+                                
+                        </description>
+                
+                </bitlbee-command>
+                
+                <bitlbee-command name="forget">
+                        <syntax>otr forget &lt;thing&gt; &lt;arguments&gt;</syntax>
+                        
+                        <description>
+                        
+                                <para>
+                                        Forgets some part of our OTR userstate. Available things: fingerprint, context, and key. See <emphasis>help otr forget &lt;thing&gt;</emphasis> for more information.
+                                </para>
+                        
+                        </description>
+                        
+                        <bitlbee-command name="fingerprint">
+                                <syntax>otr forget fingerprint &lt;nick&gt; &lt;fingerprint&gt;</syntax>
+                                
+                                <description>
+                                
+                                        <para>
+                                                Drops the specified fingerprint from the given user's OTR connection context. It is allowed to specify only a (unique) prefix of the desired fingerprint.
+                                        </para>
+                                        
+                                </description>
+                                
+                        </bitlbee-command>
+                                
+                        <bitlbee-command name="context">
+                                <syntax>otr forget context &lt;nick&gt;</syntax>
+                                
+                                <description>
+                                
+                                        <para>
+                                                Forgets the entire OTR context associated with the given user. This includes current message and protocol states, as well as any fingerprints for that user.
+                                        </para>
+                                        
+                                </description>
+                                
+                        </bitlbee-command>
+
+                        <bitlbee-command name="key">
+                                <syntax>otr forget key &lt;fingerprint&gt;</syntax>
+                                
+                                <description>
+                                
+                                        <para>
+                                                Forgets an OTR private key matching the specified fingerprint. It is allowed to specify only a (unique) prefix of the fingerprint.
+                                        </para>
+                                        
+                                </description>
+                                
+                        </bitlbee-command>
+                
+                </bitlbee-command>
+                
+        </bitlbee-command>
 
         <bitlbee-command name="set">
@@ -589 +767 @@
                 </description>
 
+        </bitlbee-setting>
+
+        <bitlbee-setting name="color_encrypted" type="boolean" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                If set to true, BitlBee will color incoming encrypted messages according to their fingerprint trust level: untrusted=red, trusted=green.
+                        </para>
+                </description>
         </bitlbee-setting>
 
@@ -931 +1119 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="otr_policy" type="string" scope="global">
+                <default>opportunistic</default>
+                <possible-values>never, opportunistic, manual, always</possible-values>
+
+                <description>
+                        <para>
+                                This setting controls the policy for establishing Off-the-Record connections.
+                        </para>
+                        <para>
+                                A value of "never" effectively disables the OTR subsystem. In "opportunistic" mode, a magic whitespace pattern will be appended to the first message sent to any user. If the peer is also running opportunistic OTR, an encrypted connection will be set up automatically. On "manual", on the other hand, OTR connections must be established explicitly using <emphasis>otr connect</emphasis>. Finally, the setting "always" enforces encrypted communication by causing BitlBee to refuse to send any cleartext messages at all.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="password" type="string" scope="both">
                 <description>

irc.c

@@ -29 +29 @@
 
 GSList *irc_connection_list;
+GSList *irc_plugins;
 
 static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond );
@@ -42 +43 @@
         char *host = NULL, *myhost = NULL;
         irc_user_t *iu;
+        GSList *l;
         set_t *s;
         bee_t *b;
@@ -165 +167 @@
         nogaim_init();
         
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->irc_new )
+                        p->irc_new( irc );
+        }
+        
         return irc;
 }
@@ -208 +217 @@
 void irc_free( irc_t * irc )
 {
+        GSList *l;
+        
         irc->status |= USTATUS_SHUTDOWN;
         
@@ -215 +226 @@
                 if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
                         log_message( LOGLVL_WARNING, "Error while saving settings for user %s", irc->user->nick );
+        
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->irc_free )
+                        p->irc_free( irc );
+        }
         
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
@@ -933 +951 @@
         return SET_INVALID;
 }
+
+void register_irc_plugin( const struct irc_plugin *p )
+{
+        irc_plugins = g_slist_prepend( irc_plugins, (gpointer) p );
+}

irc.h

@@ -28 +28 @@
 
 #define IRC_MAX_LINE 512
-#define IRC_MAX_ARGS 8
+#define IRC_MAX_ARGS 16
 
 #define IRC_LOGIN_TIMEOUT 60
@@ -86 +86 @@
         gint login_source_id; /* To slightly delay some events at login time. */
         
+        struct otr *otr; /* OTR state and book keeping, used by the OTR plugin.
+                            TODO: Some mechanism for plugindata. */
+        
         struct bee *b;
 } irc_t;
@@ -93 +96 @@
         /* Replaced with iu->last_channel IRC_USER_PRIVATE = 1, */
         IRC_USER_AWAY = 2,
+        
+        IRC_USER_OTR_ENCRYPTED = 0x10000,
+        IRC_USER_OTR_TRUSTED   = 0x20000,
 } irc_user_flags_t;
 
@@ -214 +220 @@
 } irc_channel_del_user_type_t;
 
+/* These are a glued a little bit to the core/bee layer and a little bit to
+   IRC. The first user is OTR, and I guess at some point we'll get to shape
+   this a little bit more as other uses come up. */
+typedef struct irc_plugin
+{
+        /* Called at the end of irc_new(). Can be used to add settings, etc. */
+        gboolean (*irc_new)( irc_t *irc );
+        /* At the end of irc_free(). */
+        void (*irc_free)( irc_t *irc );
+        
+        /* Problem with the following two functions is ordering if multiple
+           plugins are handling them. Let's keep fixing that problem for
+           whenever it becomes important. */
+        
+        /* Called by bee_irc_user_privmsg_cb(). Return NULL if you want to
+           abort sending the msg. */
+        char* (*filter_msg_out)( irc_user_t *iu, char *msg, int flags );
+        /* Called by bee_irc_user_msg(). Return NULL if you swallowed the
+           message and don't want anything to go to the user. */
+        char* (*filter_msg_in)( irc_user_t *iu, char *msg, int flags );
+        
+        /* From storage.c functions. Ideally these should not be used
+           and instead data should be stored in settings which will get
+           saved automatically. Consider these deprecated! */
+        void (*storage_load)( irc_t *irc );
+        void (*storage_save)( irc_t *irc );
+        void (*storage_remove)( const char *nick );
+} irc_plugin_t;
+
+extern GSList *irc_plugins; /* struct irc_plugin */
+
 /* irc.c */
 extern GSList *irc_connection_list;
@@ -238 +275 @@
 
 void irc_umode_set( irc_t *irc, const char *s, gboolean allow_priv );
+
+void register_irc_plugin( const struct irc_plugin *p );
 
 /* irc_channel.c */

irc_commands.c

@@ -635 +635 @@
         irc_send_msg_raw( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS OK" );
         
-        for( i = 0; commands[i].command; i ++ )
-                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", commands[i].command );
+        for( i = 0; root_commands[i].command; i ++ )
+                irc_send_msg_f( irc->root, "NOTICE", irc->user->nick, "COMPLETIONS %s", root_commands[i].command );
         
         for( h = global.help; h; h = h->next )

irc_im.c

@@ -192 +192 @@
 }
 
-static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at )
+static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at )
 {
         irc_t *irc = bee->ui_data;
@@ -199 +199 @@
         char *wrapped, *ts = NULL;
         irc_channel_t *ic = NULL;
+        char *msg = g_strdup( msg_ );
+        GSList *l;
         
         if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
@@ -224 +226 @@
         }
         
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->filter_msg_in )
+                {
+                        char *s = p->filter_msg_in( iu, msg, 0 );
+                        if( s )
+                        {
+                                if( s != msg )
+                                        g_free( msg );
+                                msg = s;
+                        }
+                        else
+                        {
+                                /* Modules can swallow messages. */
+                                return TRUE;
+                        }
+                }
+        }
+        
+        if( ( g_strcasecmp( set_getstr( &bee->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( bu->ic->flags & OPT_DOES_HTML ) && set_getbool( &bee->set, "strip_html" ) ) )
+        {
+                char *s = g_strdup( msg );
+                strip_html( s );
+                g_free( msg );
+                msg = s;
+        }
+        
         wrapped = word_wrap( msg, 425 );
         irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
@@ -229 +260 @@
         g_free( wrapped );
         g_free( prefix );
+        g_free( msg );
         g_free( ts );
         
@@ -349 +381 @@
         }
         
+        if( iu->pastebuf == NULL )
+                iu->pastebuf = g_string_new( msg );
+        else
+        {
+                b_event_remove( iu->pastebuf_timer );
+                g_string_append_printf( iu->pastebuf, "\n%s", msg );
+        }
+        
         if( set_getbool( &iu->irc->b->set, "paste_buffer" ) )
         {
                 int delay;
-                
-                if( iu->pastebuf == NULL )
-                        iu->pastebuf = g_string_new( msg );
-                else
-                {
-                        b_event_remove( iu->pastebuf_timer );
-                        g_string_append_printf( iu->pastebuf, "\n%s", msg );
-                }
                 
                 if( ( delay = set_getint( &iu->irc->b->set, "paste_buffer_delay" ) ) <= 5 )
@@ -369 +401 @@
         }
         else
-                return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
+        {
+                bee_irc_user_privmsg_cb( iu, 0, 0 );
+                
+                return TRUE;
+        }
 }
 
@@ -375 +411 @@
 {
         irc_user_t *iu = data;
-        
-        bee_user_msg( iu->irc->b, iu->bu, iu->pastebuf->str, 0 );
-        
-        g_string_free( iu->pastebuf, TRUE );
-        iu->pastebuf = 0;
+        char *msg = g_string_free( iu->pastebuf, FALSE );
+        GSList *l;
+        
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->filter_msg_out )
+                {
+                        char *s = p->filter_msg_out( iu, msg, 0 );
+                        if( s )
+                        {
+                                if( s != msg )
+                                        g_free( msg );
+                                msg = s;
+                        }
+                        else
+                        {
+                                /* Modules can swallow messages. */
+                                iu->pastebuf = NULL;
+                                g_free( msg );
+                                return FALSE;
+                        }
+                }
+        }
+        
+        bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
+        
+        g_free( msg );
+        iu->pastebuf = NULL;
         iu->pastebuf_timer = 0;
         

lib/events.h

@@ -81 +81 @@
 G_MODULE_EXPORT void b_event_remove(gint id);
 
-/* For now, closesocket() is only a function when using libevent. With GLib
-   it's a preprocessor macro. */
-#ifdef EVENTS_LIBEVENT
+/* With libevent, this one also cleans up event handlers if that wasn't already
+   done (the caller is expected to do so but may miss it sometimes). */
 G_MODULE_EXPORT void closesocket(int fd);
-#endif
 
 #endif /* _EVENTS_H_ */

lib/events_glib.c

@@ -147 +147 @@
                 g_source_remove(tag);
 }
+
+void closesocket( int fd )
+{
+        close( fd );
+}

lib/misc.c

@@ -157 +157 @@
         char *s = out, *cs;
         int i, matched;
+        int taglen;
         
         memset( out, 0, sizeof( out ) );
@@ -173 +174 @@
                                 in ++;
                         
+                        taglen = in - cs - 1;   /* not <0 because the above loop runs at least once */
                         if( *in )
                         {
-                                if( g_strncasecmp( cs+1, "br", 2) == 0 )
+                                if( g_strncasecmp( cs+1, "b", taglen) == 0 )
+                                        *(s++) = '\x02';
+                                else if( g_strncasecmp( cs+1, "/b", taglen) == 0 )
+                                        *(s++) = '\x02';
+                                else if( g_strncasecmp( cs+1, "i", taglen) == 0 )
+                                        *(s++) = '\x1f';
+                                else if( g_strncasecmp( cs+1, "/i", taglen) == 0 )
+                                        *(s++) = '\x1f';
+                                else if( g_strncasecmp( cs+1, "br", taglen) == 0 )
                                         *(s++) = '\n';
                                 in ++;

lib/ssl_bogus.c

@@ -27 +27 @@
 
 int ssl_errno;
+
+void ssl_init( void )
+{
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -66 +70 @@
         return 0;
 }
+
+int ssl_pending( void *conn )
+{
+        return 0;
+}

lib/ssl_client.h

@@ -47 +47 @@
 
 
+/* Perform any global initialization the SSL library might need. */
+G_MODULE_EXPORT void ssl_init( void );
+
 /* Connect to host:port, call the given function when the connection is
    ready to be used for SSL traffic. This is all done asynchronously, no

lib/ssl_gnutls.c

@@ -60 +60 @@
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
+
+void ssl_init( void )
+{
+        gnutls_global_init();
+        initialized = TRUE;
+        atexit( gnutls_global_deinit );
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -122 +129 @@
         if( !initialized )
         {
-                gnutls_global_init();
-                initialized = TRUE;
-                atexit( gnutls_global_deinit );
+                ssl_init();
         }
         

lib/ssl_nss.c

@@ -91 +91 @@
 
 
+void ssl_init( void )
+{
+        PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
+        NSS_NoDB_Init(NULL);
+        NSS_SetDomesticPolicy();
+        initialized = TRUE;
+}
+
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
@@ -107 +115 @@
         if( !initialized )
         {
-                PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1);
-                NSS_NoDB_Init(NULL);
-                NSS_SetDomesticPolicy();
+                ssl_init();
         }
 

lib/ssl_openssl.c

@@ -56 +56 @@
 static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
 
+
+void ssl_init( void )
+{
+        initialized = TRUE;
+        SSL_library_init();
+        // SSLeay_add_ssl_algorithms();
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -115 +122 @@
         if( !initialized )
         {
-                initialized = TRUE;
-                SSL_library_init();
-                //SSLeay_add_ssl_algorithms();
-                //OpenSSL_add_all_algorithms();
+                ssl_init();
         }
         

log.c

@@ -30 +30 @@
 static log_t logoutput;
 
-static void log_null(int level, char *logmessage);
-static void log_irc(int level, char *logmessage);
-static void log_syslog(int level, char *logmessage);
-static void log_console(int level, char *logmessage);
+static void log_null(int level, const char *logmessage);
+static void log_irc(int level, const char *logmessage);
+static void log_syslog(int level, const char *logmessage);
+static void log_console(int level, const char *logmessage);
 
 void log_init(void) {
@@ -97 +97 @@
 }
 
-void log_message(int level, char *message, ... ) {
+void log_message(int level, const char *message, ... ) {
 
         va_list ap;
@@ -122 +122 @@
 }
 
-void log_error(char *functionname) {
+void log_error(const char *functionname) {
         log_message(LOGLVL_ERROR, "%s: %s", functionname, strerror(errno));
         
@@ -128 +128 @@
 }
 
-static void log_null(int level, char *message) {
+static void log_null(int level, const char *message) {
         return;
 }
 
-static void log_irc(int level, char *message) {
+static void log_irc(int level, const char *message) {
         if(level == LOGLVL_ERROR)
                 irc_write_all(1, "ERROR :Error: %s", message);
@@ -147 +147 @@
 }
 
-static void log_syslog(int level, char *message) {
+static void log_syslog(int level, const char *message) {
         if(level == LOGLVL_ERROR)
                 syslog(LOG_ERR, "%s", message);
@@ -161 +161 @@
 }
 
-static void log_console(int level, char *message) {
+static void log_console(int level, const char *message) {
         if(level == LOGLVL_ERROR)
                 fprintf(stderr, "Error: %s\n", message);

log.h

@@ -44 +44 @@
 
 typedef struct log_t {
-        void (*error)(int level, char *logmessage);
-        void (*warning)(int level, char *logmessage); 
-        void (*informational)(int level, char *logmessage);
+        void (*error)(int level, const char *logmessage);
+        void (*warning)(int level, const char *logmessage); 
+        void (*informational)(int level, const char *logmessage);
 #ifdef DEBUG
-        void (*debug)(int level, char *logmessage);
+        void (*debug)(int level, const char *logmessage);
 #endif
 } log_t;
@@ -54 +54 @@
 void log_init(void);
 void log_link(int level, int output);
-void log_message(int level, char *message, ...) G_GNUC_PRINTF( 2, 3 );
-void log_error(char *functionname);
+void log_message(int level, const char *message, ...) G_GNUC_PRINTF( 2, 3 );
+void log_error(const char *functionname);
 
 #endif

nick.c

@@ -196 +196 @@
                    LC_CTYPE being set to something other than C/POSIX. */
                 if( part )
-                        part = asc = g_convert( part, -1, "ASCII//TRANSLIT//IGNORE",
-                                                "UTF-8", NULL, NULL, NULL );
+                        part = asc = g_convert_with_fallback( part, -1, "ASCII//TRANSLIT",
+                                                              "UTF-8", "", NULL, NULL, NULL );
                 
                 if( ret->len == 0 && part && isdigit( *part ) )

protocols/bee_user.c

@@ -265 +265 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( &ic->bee->set, "strip_html" ), "always" ) == 0 ) ||
-            ( ( ic->flags & OPT_DOES_HTML ) && set_getbool( &ic->bee->set, "strip_html" ) ) )
-                strip_html( msg );
-        
         if( bee->ui->user_msg && bu )
                 bee->ui->user_msg( bee, bu, msg, sent_at );

protocols/jabber/jabber.c

@@ -557 +557 @@
         
         ret->name = "jabber";
+    ret->mms = 0;                        /* no limit */
         ret->login = jabber_login;
         ret->init = jabber_init;

protocols/msn/msn.c

@@ -359 +359 @@
         
         ret->name = "msn";
+    ret->mms = 1409;         /* this guess taken from libotr UPGRADING file */
         ret->login = msn_login;
         ret->init = msn_init;

protocols/nogaim.h

@@ -68 +68 @@
 #define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
 #define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
+#define OPT_NOOTR       0x00001000 /* protocol not suitable for OTR */
 
 /* ok. now the fun begins. first we create a connection structure */
@@ -142 +143 @@
         const char *name;
         void *data;
+        /* Maximum Message Size of this protocol.
+         * - Introduced for OTR, in order to fragment large protocol messages.
+         * - 0 means "unlimited". */
+        unsigned int mms;
 
         /* Added this one to be able to add per-account settings, don't think

protocols/oscar/oscar.c

@@ -2612 +2612 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "oscar";
+    ret->mms = 2343;       /* this guess taken from libotr UPGRADING file */
         ret->away_states = oscar_away_states;
         ret->init = oscar_init;

protocols/twitter/twitter.c

@@ -534 +534 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         
+        ret->options = OPT_NOOTR;
         ret->name = "twitter";
         ret->login = twitter_login;

protocols/yahoo/yahoo.c

@@ -379 +379 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "yahoo";
+    ret->mms = 832;           /* this guess taken from libotr UPGRADING file */
         ret->init = byahoo_init;
         

query.c

@@ -106 +106 @@
         int count = 0;
         
+        if( !ic )
+                return;
+        
         q = irc->queries;
         def = query_default( irc );
@@ -148 +151 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( q->data );
+                if( q->yes )
+                        q->yes( q->data );
         }
         else
@@ -156 +160 @@
                 else
                         irc_usermsg( irc, "Rejected: %s", q->question );
-                q->no( q->data );
+                if( q->no )
+                        q->no( q->data );
         }
         q->data = NULL;

root_commands.c

@@ -55 +55 @@
         
         len = strlen( cmd[0] );
-        for( i = 0; commands[i].command; i++ )
-                if( g_strncasecmp( commands[i].command, cmd[0], len ) == 0 )
-                {
-                        if( commands[i+1].command &&
-                            g_strncasecmp( commands[i+1].command, cmd[0], len ) == 0 )
+        for( i = 0; root_commands[i].command; i++ )
+                if( g_strncasecmp( root_commands[i].command, cmd[0], len ) == 0 )
+                {
+                        if( root_commands[i+1].command &&
+                            g_strncasecmp( root_commands[i+1].command, cmd[0], len ) == 0 )
                                 /* Only match on the first letters if the match is unique. */
                                 break;
                         
-                        MIN_ARGS( commands[i].required_parameters );
+                        MIN_ARGS( root_commands[i].required_parameters );
                         
-                        commands[i].execute( irc, cmd );
+                        root_commands[i].execute( irc, cmd );
                         return;
                 }
@@ -1313 +1313 @@
 
 /* IMPORTANT: Keep this list sorted! The short command logic needs that. */
-const command_t commands[] = {
+command_t root_commands[] = {
         { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
@@ -1337 +1337 @@
         { "transfer",       0, cmd_transfer,       0 },
         { "yes",            0, cmd_yesno,          0 },
-        { NULL }
+        /* Not expecting too many plugins adding root commands so just make a
+           dumb array with some empty entried at the end. */
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
+        { NULL },
 };
+static const int num_root_commands = sizeof( root_commands ) / sizeof( command_t );
+
+gboolean root_command_add( const char *command, int params, void (*func)(irc_t *, char **args), int flags )
+{
+        int i;
+        
+        if( root_commands[num_root_commands-2].command )
+                /* Planning fail! List is full. */
+                return FALSE;
+        
+        for( i = 0; root_commands[i].command; i++ )
+        {
+                if( g_strcasecmp( root_commands[i].command, command ) == 0 )
+                        return FALSE;
+                else if( g_strcasecmp( root_commands[i].command, command ) > 0 )
+                        break;
+        }
+        memmove( root_commands + i + 1, root_commands + i,
+                 sizeof( command_t ) * ( num_root_commands - i - 1 ) );
+        
+        root_commands[i].command = g_strdup( command );
+        root_commands[i].required_parameters = params;
+        root_commands[i].execute = func;
+        root_commands[i].flags = flags;
+        
+        return TRUE;
+}

sock.h

@@ -11 +11 @@
 #define sock_make_blocking(fd) fcntl(fd, F_SETFL, 0)
 #define sockerr_again() (errno == EINPROGRESS || errno == EINTR)
-#ifndef EVENTS_LIBEVENT
-#define closesocket(a) close(a)
-#else
 void closesocket( int fd );
-#endif
 #else
 # include <winsock2.h>

storage.c

@@ -115 +115 @@
                 status = st->load(irc, password);
                 if (status == STORAGE_OK)
+                {
+                        GSList *l;
+                        for( l = irc_plugins; l; l = l->next )
+                        {
+                                irc_plugin_t *p = l->data;
+                                if( p->storage_load )
+                                        p->storage_load( irc );
+                        }
                         return status;
+                }
                 
                 if (status != STORAGE_NO_SUCH_USER) 
@@ -127 +136 @@
 {
         storage_status_t st;
+        GSList *l;
         
         if (password != NULL) {
@@ -140 +150 @@
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
         
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->storage_save )
+                        p->storage_save( irc );
+        }
+        
         if (password != NULL) {
                 irc_setpass(irc, NULL);
@@ -151 +168 @@
         GList *gl;
         storage_status_t ret = STORAGE_OK;
+        gboolean ok = FALSE;
+        GSList *l;
         
         /* Remove this account from all storage backends. If this isn't 
@@ -160 +179 @@
 
                 status = st->remove(nick, password);
+                ok |= status == STORAGE_OK;
                 if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
                         ret = status;
         }
+        
+        /* If at least one succeeded, remove plugin data. */
+        if( ok )
+                for( l = irc_plugins; l; l = l->next )
+                {
+                        irc_plugin_t *p = l->data;
+                        if( p->storage_remove )
+                                p->storage_remove( nick );
+                }
         
         return ret;

unix.c

@@ -29 +29 @@
 #include "base64.h"
 #include "commands.h"
+#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "lib/ssl_client.h"
 #include "md5.h"
 #include "misc.h"
@@ -68 +70 @@
         
         b_main_init();
+        
+        /* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
+           has a process-global config state whose initialization happpens
+           twice if libotr and gnutls are used together. libotr installs custom
+           memory management functions for libgcrypt while our gnutls module
+           uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
+        ssl_init();
+#ifdef OTR_BI
+        otr_init();
+#endif
+        /* And in case OTR is loaded as a plugin, it'll also get loaded after
+           this point. */
         
         srand( time( NULL ) ^ getpid() );