Changes in / [df1ae622:bb09b3c]

Files:

• Makefile (modified) (3 diffs)
• bitlbee.conf (modified) (1 diff)
• bitlbee.h (modified) (3 diffs)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (4 diffs)
• doc/README (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (8 diffs)
• ipc.c (modified) (8 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (15 diffs)
• irc.h (modified) (2 diffs)
• irc_commands.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)
• otr.c (added)
• otr.h (added)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/nogaim.c (modified) (8 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• protocols/yahoo/yahoo_httplib.c (modified) (1 diff)
• query.c (modified) (3 diffs)
• root_commands.c (modified) (3 diffs)
• set.c (modified) (1 diff)
• set.h (modified) (1 diff)
• sock.h (modified) (1 diff)
• storage.c (modified) (6 diffs)
• storage_text.c (modified) (1 diff)
• unix.c (modified) (2 diffs)
• user.h (modified) (1 diff)
• welcome.txt (added)

Makefile

@@ -11 +11 @@
 # Program variables
 objects = account.o bitlbee.o chat.o crypting.o help.o ipc.o irc.o irc_commands.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) user.o
-headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h query.h set.h sock.h storage.h user.h lib/events.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/nogaim.h
+headers = account.h bitlbee.h commands.h conf.h config.h crypting.h help.h ipc.h irc.h log.h nick.h otr.h query.h set.h sock.h storage.h user.h lib/events.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/nogaim.h
 subdirs = lib protocols
 
@@ -20 +20 @@
 OUTFILE=bitlbee.exe
 else
-objects += unix.o conf.o log.o
+objects += unix.o conf.o log.o otr.o
 OUTFILE=bitlbee
 endif
@@ -94 +94 @@
         mkdir -p $(DESTDIR)$(ETCDIR)
         install -m 0644 motd.txt $(DESTDIR)$(ETCDIR)/motd.txt
+        install -m 0644 welcome.txt $(DESTDIR)$(ETCDIR)/welcome.txt
         install -m 0644 bitlbee.conf $(DESTDIR)$(ETCDIR)/bitlbee.conf
 
 uninstall-etc:
         rm -f $(DESTDIR)$(ETCDIR)/motd.txt
+        rm -f $(DESTDIR)$(ETCDIR)/welcome.txt
         rm -f $(DESTDIR)$(ETCDIR)/bitlbee.conf
         -rmdir $(DESTDIR)$(ETCDIR)

bitlbee.conf

@@ -85 +85 @@
 # MotdFile = /etc/bitlbee/motd.txt
 
+## WelcomeFile
+##
+## Specify an alternative file for the welcome message displayed when joining the
+## control channel. Default value depends on the --etcdir argument to configure.
+##
+# WelcomeFile = /etc/bitlbee/welcome.txt
+
 ## ConfigDir
 ##

bitlbee.h

@@ -30 +30 @@
 #define _GNU_SOURCE /* Stupid GNU :-P */
 #endif
+
+/* Depend on Windows 2000 for now since we need getaddrinfo() */
+#define _WIN32_WINNT 0x0501
 
 /* Depend on Windows 2000 for now since we need getaddrinfo() */
@@ -141 +144 @@
 #include "misc.h"
 #include "proxy.h"
+#include "otr.h"
 
 typedef struct global {
@@ -152 +156 @@
         char *helpfile;
         int restart;
+        OtrlMessageAppOps otr_ops;   /* collects interface functions required by OTR */
 } global_t;
 

conf.c

@@ -60 +60 @@
         conf->pidfile = g_strdup( PIDFILE );
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
+        conf->welcomefile = g_strdup( ETCDIR "/welcome.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
@@ -258 +259 @@
                                 conf->motdfile = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "welcomefile" ) == 0 )
+                        {
+                                g_free( conf->welcomefile );
+                                conf->welcomefile = g_strdup( ini->value );
+                        }
                         else if( g_strcasecmp( ini->key, "account_storage" ) == 0 )
                         {

conf.h

@@ -45 +45 @@
         char *pidfile;
         char *motdfile;
+        char *welcomefile;
         char *primary_storage;
         char **migrate_storage;

configure

@@ -32 +32 @@
 gcov=0
 plugins=1
+otr=auto
 
 events=glib
@@ -73 +74 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
+--otr=0/1       Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events
@@ -452 +454 @@
 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
+        echo '#define WITH_OTR' >> config.h
+        echo "EFLAGS+=-L${otrprefix}/lib -lotr" >> Makefile.settings
+        echo "CFLAGS+=-I${otrprefix}/include" >> Makefile.settings
+else
+        echo '#undef WITH_OTR' >> config.h
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
         echo
@@ -606 +630 @@
 fi
 
+if [ "$otr" = "1" ]; then
+        echo '  Off-the-Record (OTR) Messaging enabled.'
+else
+        echo '  Off-the-Record (OTR) Messaging disabled.'
+fi
+
 echo '  Using event handler: '$events
 echo '  Using SSL library: '$ssl

doc/README

@@ -67 +67 @@
 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 will be included by default if the
+configure script finds libotr in one of the usual places. You can pass
+--otr=1 or --otr=0 to force it on or off, respectively.
 
 These days, MSN Messenger clients have to connect to the MS Passport servers
@@ -143 +147 @@
 
 
-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

@@ -349 +349 @@
                 </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, 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 already been received from the given user, responds with the specified secret. Otherwise, a challenge for the secret will be sent. If the protocol succeeds (i.e. both parties gave the same secret), the fingerprint will be trusted.
+                                </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">
@@ -533 +682 @@
         </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>
+
         <bitlbee-setting name="control_channel" type="string" scope="global">
                 <default>&amp;bitlbee</default>
@@ -619 +778 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="halfop_buddies" type="string" scope="global">
+                <default>encrypted</default>
+                <possible-values>encrypted, trusted, notaway, online, false</possible-values>
+
+                <description>
+                        <para>
+                                Specifies under which circumstances BitlBee should give the "halfop" mode flag (+h) to buddies.
+                        </para>
+                        
+                        <para>
+                                If "false", the flag is never set. On "notaway", the flag is removed for users marked as "away" and set for all others. On "encrypted", the flag is set for users with whom we have an encrypted connection. On "trusted", it is set only for encrypted connections using a trusted key. On "online", the flag is set whenever the user is online; only meaningful in conjunction with "show_offline".
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="ignore_auth_requests" type="boolean" scope="account">
                 <default>true</default>
@@ -627 +801 @@
                         </para>
                 </description>
-
         </bitlbee-setting>
 
@@ -661 +834 @@
                 </description>
 
+        </bitlbee-setting>
+
+        <bitlbee-setting name="op_buddies" type="string" scope="global">
+                <default>trusted</default>
+                <possible-values>encrypted, trusted, notaway, online, false</possible-values>
+
+                <description>
+                        <para>
+                                Specifies under which circumstances BitlBee should give the "op" mode flag (+o) to buddies.
+                        </para>
+                        
+                        <para>
+                                If "false", the flag is never set. On "notaway", the flag is removed for users marked as "away" and set for all others. On "encrypted", the flag is set for users with whom we have an encrypted connection. On "trusted", it is set only for encrypted connections using a trusted key. On "online", the flag is set whenever the user is online; only meaningful in conjunction with "show_offline".
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="op_root" type="bool" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can set the desired state for root using this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="op_user" type="bool" scope="global">
+                <default>true</default>
+
+                <description>
+                        <para>
+                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can set the desired state for yourself using this setting.
+                        </para>
+                </description>
+        </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>
 
@@ -695 +918 @@
                         </para>
                 </description>
-
         </bitlbee-setting>
 
@@ -881 +1103 @@
                 <description>
                         <para>
-                                If enabled causes BitlBee to also show offline users in Channel. Online-users will get op, away-users voice and offline users none of both. This option takes effect as soon as you reconnect.
+                                If enabled causes BitlBee to also show offline users in Channel. You may want to adjust the settings "voice_buddies", "halfop_buddies" and "op_buddies" according to your liking. A reasonable candidate is "voice_buddies=online", "halfop_buddies=false", "op_buddies=notaway".
+                        </para>
+                        <para>
+                                This option takes effect as soon as you reconnect.
                         </para>
                 </description>
@@ -1004 +1229 @@
                         </para>
                 </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="voice_buddies" type="string" scope="global">
+                <default>notaway</default>
+                <possible-values>encrypted, trusted, notaway, online, false</possible-values>
+
+                <description>
+                        <para>
+                                Specifies under which circumstances BitlBee should give the "voice" mode flag (+v) to buddies.
+                        </para>
+                        
+                        <para>
+                                If "false", the flag is never set. On "notaway", the flag is removed for users marked as "away" and set for all others. On "encrypted", the flag is set for users with whom we have an encrypted connection. On "trusted", it is set only for encrypted connections using a trusted key. On "online", the flag is set whenever the user is online; only meaningful in conjunction with "show_offline".
+                        </para>
+                </description>
+
         </bitlbee-setting>
 

ipc.c

@@ -33 +33 @@
 
 GSList *child_list = NULL;
+static char *statefile = NULL;
 
 static void ipc_master_cmd_client( irc_t *data, char **cmd )
@@ -62 +63 @@
 }
 
-static void ipc_master_cmd_deaf( irc_t *data, char **cmd )
-{
-        if( global.conf->runmode == RUNMODE_DAEMON )
-        {
-                b_event_remove( global.listen_watch_source_id );
-                close( global.listen_socket );
-                
-                global.listen_socket = global.listen_watch_source_id = -1;
-        
-                ipc_to_children_str( "OPERMSG :Closed listening socket, waiting "
-                                     "for all users to disconnect." );
-        }
-        else
-        {
-                ipc_to_children_str( "OPERMSG :The DEAF command only works in "
-                                     "normal daemon mode. Try DIE instead." );
-        }
-}
-
 void ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
@@ -116 +98 @@
         { "hello",      0, ipc_master_cmd_client,     0 },
         { "die",        0, ipc_master_cmd_die,        0 },
-        { "deaf",       0, ipc_master_cmd_deaf,       0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "wall",       1, NULL,                      IPC_CMD_TO_CHILDREN },
@@ -460 +441 @@
 }
 
-#ifndef _WIN32
 char *ipc_master_save_state()
 {
@@ -501 +481 @@
 }
 
+void ipc_master_set_statefile( char *fn )
+{
+        statefile = g_strdup( fn );
+}
+
 
 static gboolean new_ipc_client( gpointer data, gint serversock, b_input_condition cond )
@@ -521 +506 @@
 }
 
+#ifndef _WIN32
 int ipc_master_listen_socket()
 {
@@ -557 +543 @@
 }
 #else
-int ipc_master_listen_socket()
-{
         /* FIXME: Open named pipe \\.\BITLBEE */
-        return 0;
-}
 #endif
 
-int ipc_master_load_state( char *statefile )
+int ipc_master_load_state()
 {
         struct bitlbee_child *child;
@@ -572 +554 @@
         if( statefile == NULL )
                 return 0;
-        
         fp = fopen( statefile, "r" );
         unlink( statefile );    /* Why do it later? :-) */

ipc.h

@@ -58 +58 @@
 
 char *ipc_master_save_state();
-int ipc_master_load_state( char *statefile );
+void ipc_master_set_statefile( char *fn );
+int ipc_master_load_state();
 int ipc_master_listen_socket();
 

irc.c

@@ -29 +29 @@
 #include "crypting.h"
 #include "ipc.h"
+#include <sys/types.h>
+#include <sys/wait.h>
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
+static void irc_welcome( irc_t* irc );
 
 GSList *irc_connection_list = NULL;
@@ -177 +180 @@
 
         irc_connection_list = g_slist_append( irc_connection_list, irc );
+
         
         s = set_add( &irc->set, "away", NULL,  set_eval_away_status, irc );
         s->flags |= SET_NULL_OK;
-        s = set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
         s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "auto_reconnect", "true", set_eval_bool, irc );
@@ -187 +190 @@
         s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
         s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
+        s = set_add( &irc->set, "color_encrypted", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc );
         s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
@@ -193 +197 @@
         s = set_add( &irc->set, "display_timestamps", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        s = set_add( &irc->set, "halfop_buddies", "encrypted", set_eval_halfop_buddies, irc );
         s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
-        s = set_add( &irc->set, "ops", "both", set_eval_ops, irc );
+        s = set_add( &irc->set, "op_buddies", "trusted", set_eval_op_buddies, irc );
+        s = set_add( &irc->set, "op_root", "true", set_eval_op_root, irc );
+        s = set_add( &irc->set, "otr_policy", "oppurtunistic", set_eval_otr_policy, irc );
         s = set_add( &irc->set, "password", NULL, set_eval_password, irc );
         s->flags |= SET_NULL_OK;
@@ -203 +210 @@
         s = set_add( &irc->set, "show_offline", "false", set_eval_bool, irc );
         s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc );
-        s = set_add( &irc->set, "status", NULL,  set_eval_away_status, irc );
-        s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "strip_html", "true", NULL, irc );
         s = set_add( &irc->set, "timezone", "local", set_eval_timezone, irc );
         s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
         s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "voice_buddies", "notaway", set_eval_voice_buddies, irc);
         
         conf_loaddefaults( irc );
-        
+
+        irc->otr = otr_new();
+
         /* Evaluator sets the iconv/oconv structures. */
         set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
@@ -363 +371 @@
         
         g_free( irc->last_target );
+
+        otr_free(irc->otr);
         
         g_free( irc );
-        
+
         if( global.conf->runmode == RUNMODE_INETD ||
             global.conf->runmode == RUNMODE_FORKDAEMON ||
@@ -734 +744 @@
 } 
 
+const char *user_mode_prefix( irc_t *irc, user_t *u )
+{
+        static char op[] = "@";
+        static char halfop[] = "%";
+        static char voice[] = "+";
+        static char none[] = "";
+
+        int or = set_getbool(&irc->set, "op_root");
+        int ou = set_getbool(&irc->set, "op_user");
+        char *ob = set_getstr(&irc->set, "op_buddies");
+        char *hb = set_getstr(&irc->set, "halfop_buddies");
+        char *vb = set_getstr(&irc->set, "voice_buddies");
+
+        if( (!strcmp(u->nick, irc->mynick) && or) ||
+            (!strcmp(u->nick, irc->nick) && ou) ||
+        (!u->away && !strcmp(ob, "notaway")) ||
+        (u->encrypted && !strcmp(ob, "encrypted")) ||
+        (u->encrypted>1 && !strcmp(ob, "trusted"))
+      )
+                return op;
+        else if( (!u->away && !strcmp(hb, "notaway")) ||
+             (u->encrypted && !strcmp(hb, "encrypted")) ||
+             (u->encrypted>1 && !strcmp(hb, "trusted"))
+               )
+                return halfop;
+        else if( (!u->away && !strcmp(vb, "notaway")) ||
+             (u->encrypted && !strcmp(vb, "encrypted")) ||
+             (u->encrypted>1 && !strcmp(vb, "trusted"))
+               )
+                return voice;
+        else
+                return none;
+}
+                        
 void irc_names( irc_t *irc, char *channel )
 {
@@ -739 +783 @@
         char namelist[385] = "";
         struct groupchat *c = NULL;
-        char *ops = set_getstr( &irc->set, "ops" );
         
         /* RFCs say there is no error reply allowed on NAMES, so when the
@@ -754 +797 @@
                         }
                         
-                        if( u->ic && !u->away && set_getbool( &irc->set, "away_devoice" ) )
-                                strcat( namelist, "+" );
-                        else if( ( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) == 0 ) ) ||
-                                 ( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) == 0 ) ) )
-                                strcat( namelist, "@" );
-                        
+                        strcat( namelist, user_mode_prefix(irc, u) );
                         strcat( namelist, u->nick );
                         strcat( namelist, " " );
@@ -770 +808 @@
                 /* root and the user aren't in the channel userlist but should
                    show up in /NAMES, so list them first: */
-                sprintf( namelist, "%s%s %s%s ", strcmp( ops, "root" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->mynick,
-                                                 strcmp( ops, "user" ) == 0 || strcmp( ops, "both" ) ? "@" : "", irc->nick );
+                sprintf( namelist, "%s%s %s%s ", set_getbool(&irc->set, "op_root") ? "@" : "", irc->mynick,
+                                                 set_getbool(&irc->set, "op_user") ? "@" : "", irc->nick );
                 
                 for( l = c->in_room; l; l = l->next ) if( ( u = user_findhandle( c->ic, l->data ) ) )
@@ -781 +819 @@
                         }
                         
+                        strcat( namelist, user_mode_prefix(irc, u) );
                         strcat( namelist, u->nick );
                         strcat( namelist, " " );
@@ -822 +861 @@
         irc_reply( irc,   3, ":%s", IRCD_INFO );
         irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
-        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
+        irc_reply( irc,   5, "PREFIX=(ohv)@%%+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
                              "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
                              CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
@@ -828 +867 @@
         irc->umode[0] = '\0';
         irc_umode_set( irc, "+" UMODE, 1 );
-
-        u = user_add( irc, irc->mynick );
+u = user_add( irc, irc->mynick );
         u->host = g_strdup( irc->myhost );
         u->realname = g_strdup( ROOT_FN );
@@ -851 +889 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\n"
-                          "If you've never used BitlBee before, please do read the help "
-                          "information using the \x02help\x02 command. Lots of FAQs are "
-                          "answered there.\n"
-                          "If you already have an account on this server, just use the "
-                          "\x02identify\x02 command to identify yourself." );
+        irc_welcome( irc );
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
@@ -871 +904 @@
                 root_command( irc, send_cmd );
                 g_free( send_cmd[1] );
+        }
+}
+
+static void irc_welcome( irc_t *irc )
+{
+        FILE *f;
+        
+        f = fopen( global.conf->welcomefile, "r" );
+        if( !f )
+        {
+                irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\n"
+                                  "If you've never used BitlBee before, please do read the help "
+                                  "information using the \x02help\x02 command. Lots of FAQs are "
+                                  "answered there.\n"
+                                  "OTR users please note: Private key files are owned by the user "
+                                  "BitlBee is running as.\n"
+                                  "If you already have an account on this server, just use the "
+                                  "\x02identify\x02 command to identify yourself." );
+        }
+        else
+        {
+                char linebuf[380];
+                
+                while( fgets( linebuf, 380, f ) )
+                {
+                        irc_usermsg( irc, linebuf );
+                }
+                
+                fclose( f );
         }
 }

irc.h

@@ -27 +27 @@
 #define _IRC_H
 
+#include "otr.h"
+
 #define IRC_MAX_LINE 512
-#define IRC_MAX_ARGS 8
+#define IRC_MAX_ARGS 16
 
 #define IRC_LOGIN_TIMEOUT 60
@@ -94 +96 @@
         gint w_watch_source_id;
         gint ping_source_id;
+        
+        otr_t *otr;            /* OTR state and book keeping */
 } irc_t;
 

irc_commands.c

@@ -604 +604 @@
         { "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-        { "deaf",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wall",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

lib/misc.c

@@ -157 +157 @@
         char *s = out, *cs;
         int i, matched;
+        int taglen;
         
         memset( out, 0, strlen( in ) + 1 );
@@ -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", 2) == 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;
+        SSLeay_add_ssl_algorithms();
+}
 
 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
@@ -115 +121 @@
         if( !initialized )
         {
-                initialized = TRUE;
-                SSLeay_add_ssl_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

protocols/jabber/jabber.c

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

protocols/msn/msn.c

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

protocols/msn/ns.c

@@ -271 +271 @@
                 if( num_parts == 5 )
                 {
-                        int i, groupcount;
-                        
-                        groupcount = atoi( cmd[4] );
-                        if( groupcount > 0 )
-                        {
-                                /* valgrind says this is leaking memory, I'm guessing
-                                   that this happens during server redirects. */
-                                if( md->grouplist )
-                                {
-                                        for( i = 0; i < md->groupcount; i ++ )
-                                                g_free( md->grouplist[i] );
-                                        g_free( md->grouplist );
-                                }
-                                
-                                md->groupcount = groupcount;
+                        md->buddycount = atoi( cmd[3] );
+                        md->groupcount = atoi( cmd[4] );
+                        if( md->groupcount > 0 )
                                 md->grouplist = g_new0( char *, md->groupcount );
-                        }
-                        
-                        md->buddycount = atoi( cmd[3] );
+                        
                         if( !*cmd[3] || md->buddycount == 0 )
                                 msn_logged_in( ic );

protocols/nogaim.c

@@ -725 +725 @@
         }
         
-        /* early if-clause for show_offline even if there is some redundant code here because this isn't LISP but C ;) */
-        if( set_getbool( &ic->irc->set, "show_offline" ) && set_getbool( &ic->irc->set, "away_devoice" ) )
+        /* LISPy... */
+        if( ( u->online ) &&                                            /* Don't touch offline people */
+            ( ( u->online != oo ) ||                                    /* Do joining people */
+              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* Do people changing state */
         {
                 char *from;
@@ -740 +742 @@
                 }
 
-                /* if we use show_offline, we op online users, voice away users, and devoice/deop offline users */
-                if( flags & OPT_LOGGED_IN )
-                {
-                        /* user is "online" (either really online or away) */
-                        irc_write( ic->irc, ":%s MODE %s %cv%co %s %s", from, ic->irc->channel,
-                                                                  u->away?'+':'-', u->away?'-':'+', u->nick, u->nick );
-                }
-                else
-                {
-                        /* user is offline */
-                        irc_write( ic->irc, ":%s MODE %s -vo %s %s", from, ic->irc->channel, u->nick, u->nick );
-                }
-        }
-        else
-        { 
-                /* LISPy... */
-                if( ( set_getbool( &ic->irc->set, "away_devoice" ) ) &&         /* Don't do a thing when user doesn't want it */
-                    ( u->online ) &&                                            /* Don't touch offline people */
-                    ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
-                      ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* (De)voice people changing state */
-                {
-                        char *from;
-
-                        if( set_getbool( &ic->irc->set, "simulate_netsplit" ) )
-                        {
-                                from = g_strdup( ic->irc->myhost );
-                        }
-                        else
-                        {
-                                from = g_strdup_printf( "%s!%s@%s", ic->irc->mynick, ic->irc->mynick,
-                                                                    ic->irc->myhost );
-                        }
+                if(!strcmp(set_getstr(&ic->irc->set, "voice_buddies"), "online")) {
+                        irc_write( ic->irc, ":%s MODE %s +v %s", from, ic->irc->channel, u->nick );
+                }
+                if(!strcmp(set_getstr(&ic->irc->set, "halfop_buddies"), "online")) {
+                        irc_write( ic->irc, ":%s MODE %s +h %s", from, ic->irc->channel, u->nick );
+                }
+                if(!strcmp(set_getstr(&ic->irc->set, "op_buddies"), "online")) {
+                        irc_write( ic->irc, ":%s MODE %s +o %s", from, ic->irc->channel, u->nick );
+                }
+
+                if(!strcmp(set_getstr(&ic->irc->set, "voice_buddies"), "notaway")) {
                         irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
-                                                                  u->away?'-':'+', u->nick );
-                        g_free( from );
-                }
+                                                                 u->away?'-':'+', u->nick );
+                }
+                if(!strcmp(set_getstr(&ic->irc->set, "halfop_buddies"), "notaway")) {
+                        irc_write( ic->irc, ":%s MODE %s %ch %s", from, ic->irc->channel,
+                                                                 u->away?'-':'+', u->nick );
+                }
+                if(!strcmp(set_getstr(&ic->irc->set, "op_buddies"), "notaway")) {
+                        irc_write( ic->irc, ":%s MODE %s %co %s", from, ic->irc->channel,
+                                                                 u->away?'-':'+', u->nick );
+                }
+
+                g_free( from );
         }
 }
@@ -784 +774 @@
         char *wrapped, *ts = NULL;
         user_t *u;
-        
+
+        /* pass the message through OTR */
+        msg = otr_handle_message(ic, handle, msg);
+        if(!msg) {
+                /* this was an internal OTR protocol message */
+                return;
+        }
+
         u = user_findhandle( ic, handle );
-        
         if( !u )
         {
@@ -796 +792 @@
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
+                        g_free(msg);
                         return;
                 }
@@ -829 +826 @@
         {
                 char *new = g_strconcat( ts, msg, NULL );
-                g_free( ts );
-                ts = msg = new;
+                g_free( msg );
+                msg = new;
         }
         
@@ -836 +833 @@
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
+        g_free( msg );
         g_free( ts );
 }
@@ -1112 +1110 @@
 /* Misc. BitlBee stuff which shouldn't really be here */
 
-char *set_eval_away_devoice( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        int st;
-        
-        if( !is_bool( value ) )
-                return SET_INVALID;
-        
-        st = bool2int( value );
-        
-        /* Horror.... */
-        
-        if( st != set_getbool( &irc->set, "away_devoice" ) )
-        {
-                char list[80] = "";
-                user_t *u = irc->users;
-                int i = 0, count = 0;
-                char pm;
-                char v[80];
-                
-                if( st )
-                        pm = '+';
-                else
-                        pm = '-';
-                
-                while( u )
-                {
-                        if( u->ic && u->online && !u->away )
-                        {
-                                if( ( strlen( list ) + strlen( u->nick ) ) >= 79 )
-                                {
-                                        for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                                        irc_write( irc, ":%s MODE %s %c%s%s",
-                                                   irc->myhost,
-                                                   irc->channel, pm, v, list );
-                                        
-                                        *list = 0;
-                                        count = 0;
-                                }
-                                
-                                sprintf( list + strlen( list ), " %s", u->nick );
-                                count ++;
-                        }
-                        u = u->next;
-                }
-                
-                /* $v = 'v' x $i */
-                for( i = 0; i < count; v[i++] = 'v' ); v[i] = 0;
-                irc_write( irc, ":%s MODE %s %c%s%s", irc->myhost,
-                                                            irc->channel, pm, v, list );
-        }
-        
-        return value;
-}
-
 char *set_eval_timezone( set_t *set, char *value )
 {
@@ -1269 +1212 @@
                 msg = buf;
         }
-        
-        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
-        g_free( buf );
-        
+
+        /* if compiled without otr support, this just calls the prpl buddy_msg */
+        st = otr_send_message(ic, handle, msg, flags);
+        
+        g_free(buf);
         return st;
 }

protocols/nogaim.h

@@ -132 +132 @@
          * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
+    /* 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
@@ -326 +330 @@
 /* Misc. stuff */
 char *set_eval_timezone( set_t *set, char *value );
-char *set_eval_away_devoice( set_t *set, char *value );
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
 void cancel_auto_reconnect( struct account *a );

protocols/oscar/oscar.c

@@ -2548 +2548 @@
         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/yahoo/libyahoo2.c

@@ -69 +69 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 #endif
 

protocols/yahoo/yahoo.c

@@ -355 +355 @@
         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;
         

protocols/yahoo/yahoo_httplib.c

@@ -51 +51 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
+# define write(a,b,c) send(a,b,c,0)
+# define read(a,b,c)  recv(a,b,c,0)
 # define snprintf _snprintf
 #endif

query.c

@@ -103 +103 @@
         int count = 0;
         
+        if(!ic)
+                return;
+        
         q = irc->queries;
         def = query_default( irc );
@@ -145 +148 @@
                 else
                         irc_usermsg( irc, "Accepted: %s", q->question );
-                q->yes( q->data );
+                if( q->yes )
+                        q->yes( q->data );
         }
         else
@@ -153 +157 @@
                 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

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "otr.h"
 #include "chat.h"
 
@@ -414 +415 @@
                 
                 irc_usermsg( irc, "Account successfully added" );
+                
+                if(otr_check_for_key(a)) {
+                        irc_usermsg(irc, "otr: you will be notified when it completes");
+                }
         }
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
@@ -1177 +1182 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "otr",            1, cmd_otr,            0 }, 
         { "chat",           1, cmd_chat,           0 },
         { NULL }

set.c

@@ -225 +225 @@
 }
 
-char *set_eval_ops( set_t *set, char *value )
+char* set_eval_op_root( set_t *set, char* value )
 {
         irc_t *irc = set->data;
-        
-        if( g_strcasecmp( value, "user" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+o-o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "root" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-o+o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "both" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+oo", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "none" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-oo", irc->nick, irc->mynick );
+        char* ret = set_eval_bool(set, value);
+        int b = bool2int(ret);
+
+        irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
+                                               irc->channel, b?"+o":"-o", irc->mynick);
+
+        return ret;
+}
+
+char* set_eval_op_user( set_t *set, char* value )
+{
+        irc_t *irc = set->data;
+        char* ret = set_eval_bool(set, value);
+        int b = bool2int(ret);
+
+        irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
+                                               irc->channel, b?"+o":"-o", irc->nick);
+
+        return ret;
+}
+
+/* generalized version of set_eval_op/voice_buddies */
+char *set_eval_mode_buddies( set_t *set, char *value, char modeflag )
+{
+        irc_t *irc = set->data;
+        char op[64], deop[64];
+        int nop=0, ndeop=0;
+        user_t *u;
+        int mode;
+        
+        if(!strcmp(value, "false"))
+                mode=0;
+        else if(!strcmp(value, "encrypted"))
+                mode=1;
+        else if(!strcmp(value, "trusted"))
+                mode=2;
+        else if(!strcmp(value, "notaway"))
+                mode=3;
         else
                 return SET_INVALID;
-        
+
+        /* sorry for calling them op/deop - too lazy for search+replace :P */
+        op[0]='\0';
+        deop[0]='\0';
+        for(u=irc->users; u; u=u->next) {
+                /* we're only concerned with online buddies */
+                if(!u->ic || !u->online)
+                        continue;
+
+                /* just in case... */
+                if(strlen(u->nick) >= 64)
+                        continue;
+                
+                /* dump out ops/deops when the corresponding name list fills up */
+                if(strlen(op)+strlen(u->nick)+2 > 64) {
+                        char *flags = g_strnfill(nop, modeflag);
+                        irc_write( irc, ":%s!%s@%s MODE %s +%s%s", irc->mynick, irc->mynick, irc->myhost,
+                                                               irc->channel, flags, op );
+                    op[0]='\0';
+            nop=0;
+                    g_free(flags);
+                }
+                if(strlen(deop)+strlen(u->nick)+2 > 64) {
+                        char *flags = g_strnfill(ndeop, modeflag);
+                        irc_write( irc, ":%s!%s@%s MODE %s -%s%s", irc->mynick, irc->mynick, irc->myhost,
+                                                               irc->channel, flags, deop );
+                    deop[0]='\0';
+            ndeop=0;
+                    g_free(flags);
+                }
+                
+                switch(mode) {
+                /* "false" */
+                case 0:
+                        g_strlcat(deop, " ", 64);
+                        g_strlcat(deop, u->nick, 64);
+                        ndeop++;
+                        break;
+                /* "encrypted" */
+                case 1:
+                        if(u->encrypted) {
+                                g_strlcat(op, " ", 64);
+                                g_strlcat(op, u->nick, 64);
+                                nop++;
+                        } else {
+                                g_strlcat(deop, " ", 64);
+                                g_strlcat(deop, u->nick, 64);
+                                ndeop++;
+                        }
+                        break;
+                /* "trusted" */
+                case 2:
+                        if(u->encrypted > 1) {
+                                g_strlcat(op, " ", 64);
+                                g_strlcat(op, u->nick, 64);
+                                nop++;
+                        } else {
+                                g_strlcat(deop, " ", 64);
+                                g_strlcat(deop, u->nick, 64);
+                                ndeop++;
+                        }
+                        break;
+                /* "notaway" */
+                case 3:
+                        if(u->away) {
+                                g_strlcat(deop, " ", 64);
+                                g_strlcat(deop, u->nick, 64);
+                                ndeop++;
+                        } else {
+                                g_strlcat(op, " ", 64);
+                                g_strlcat(op, u->nick, 64);
+                                nop++;
+                        }
+                }
+        }
+        /* dump anything left in op/deop lists */
+        if(*op) {
+                char *flags = g_strnfill(nop, modeflag);
+                irc_write( irc, ":%s!%s@%s MODE %s +%s%s", irc->mynick, irc->mynick, irc->myhost,
+                                                               irc->channel, flags, op );
+                g_free(flags);
+        }
+        if(*deop) {
+                char *flags = g_strnfill(ndeop, modeflag);
+                irc_write( irc, ":%s!%s@%s MODE %s -%s%s", irc->mynick, irc->mynick, irc->myhost,
+                                                   irc->channel, flags, deop );
+        g_free(flags);
+    }
+
         return value;
 }
+
+char *set_eval_op_buddies( set_t *set, char *value )
+{
+        return set_eval_mode_buddies(set, value, 'o');
+}
+
+char *set_eval_halfop_buddies( set_t *set, char *value )
+{
+        return set_eval_mode_buddies(set, value, 'h');
+}
+
+char *set_eval_voice_buddies( set_t *set, char *value )
+{
+        return set_eval_mode_buddies(set, value, 'v');
+}
+
+/* possible values: never, opportunistic, manual, always */
+char *set_eval_otr_policy( set_t *set, char *value )
+{
+        if ( !strcmp(value, "never") )
+                return value;
+        if ( !strcmp(value, "opportunistic") )
+                return value;
+        if ( !strcmp(value, "manual") )
+                return value;
+        if ( !strcmp(value, "always") )
+                return value;
+        return NULL;
+}
+

set.h

@@ -100 +100 @@
 /* Some not very generic evaluators that really shouldn't be here... */
 char *set_eval_to_char( set_t *set, char *value );
-char *set_eval_ops( set_t *set, char *value );
+char *set_eval_op_root( set_t *set, char *value );
+char *set_eval_op_user( set_t *set, char *value );
+char *set_eval_op_buddies( set_t *set, char *value );
+char *set_eval_halfop_buddies( set_t *set, char *value );
+char *set_eval_voice_buddies( set_t *set, char *value );
+char *set_eval_otr_policy( set_t *set, char *value );
 
 #endif /* __SET_H__ */

sock.h

@@ -16 +16 @@
 #else
 # include <winsock2.h>
-# include <ws2tcpip.h>
+# ifndef _MSC_VER
+#  include <ws2tcpip.h>
+# endif
 # if !defined(BITLBEE_CORE) && defined(_MSC_VER)
 #   pragma comment(lib,"bitlbee.lib")
 # endif
 # include <io.h>
+# define read(a,b,c) recv(a,b,c,0)
+# define write(a,b,c) send(a,b,c,0)
+# define umask _umask
+# define mode_t int
 # define sock_make_nonblocking(fd) { int non_block = 1; ioctlsocket(fd, FIONBIO, &non_block); }
 # define sock_make_blocking(fd) { int non_block = 0; ioctlsocket(fd, FIONBIO, &non_block); }

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "crypting.h"
+#include "otr.h"
 
 extern storage_t storage_text;
@@ -116 +117 @@
 
                 status = st->load(irc, password);
-                if (status == STORAGE_OK)
+                if (status == STORAGE_OK) {
+                        otr_load(irc);
                         return status;
-                
+                }
                 if (status != STORAGE_NO_SUCH_USER) 
                         return status;
@@ -139 +141 @@
                 return STORAGE_NO_SUCH_USER;
         }
-        
+
+        otr_save(irc);
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
         
@@ -165 +168 @@
                         ret = status;
         }
+        if (ret == STORAGE_OK) {
+                otr_remove(nick);
+        }
         
         return ret;
@@ -178 +184 @@
         storage_t *primary_storage = gl->data;
         irc_t *irc;
-
+        
         /* First, try to rename in the current write backend, assuming onick 
          * is stored there */
         status = primary_storage->rename(onick, nnick, password);
-        if (status != STORAGE_NO_SUCH_USER)
+        if (status != STORAGE_NO_SUCH_USER) {
+                otr_rename(onick, nnick);
                 return status;
+        }
 
         /* Try to load from a migration backend and save to the current backend. 
@@ -207 +215 @@
 
         storage_remove(onick, password);
+        otr_rename(onick, nnick);
 
         return STORAGE_OK;

storage_text.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "crypting.h"
-#ifdef _WIN32
-# define umask _umask
-# define mode_t int
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
 
 static void text_init (void)

unix.c

@@ -29 +29 @@
 #include "base64.h"
 #include "commands.h"
+#include "crypting.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"
@@ -63 +66 @@
         b_main_init();
         nogaim_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();
+        otr_init();
         
         srand( time( NULL ) ^ getpid() );

user.h

@@ -38 +38 @@
         char is_private;
         char online;
+        char encrypted;
         
         char *handle;