Changes in / [ca60550:4eb4c0f]

Files:

• Makefile (modified) (2 diffs)
• bitlbee.c (modified) (1 diff)
• bitlbee.conf (modified) (1 diff)
• bitlbee.h (modified) (2 diffs)
• conf.c (modified) (2 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (5 diffs)
• doc/README (modified) (2 diffs)
• doc/user-guide/commands.xml (modified) (5 diffs)
• irc.c (modified) (13 diffs)
• irc.h (modified) (2 diffs)
• lib/misc.c (modified) (3 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/nogaim.c (modified) (7 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• query.c (modified) (2 diffs)
• root_commands.c (modified) (3 diffs)
• set.c (modified) (2 diffs)
• set.h (modified) (1 diff)
• storage.c (modified) (6 diffs)
• unix.c (modified) (2 diffs)
• user.c (modified) (1 diff)
• user.h (modified) (2 diffs)
• welcome.txt (added)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o 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
+objects = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o otr.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o 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 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
 
@@ -84 +84 @@
         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.c

@@ -143 +143 @@
         log_link( LOGLVL_ERROR, LOGOUTPUT_IRC );
         log_link( LOGLVL_WARNING, LOGOUTPUT_IRC );
+    /* TODO: Remove debugging log_link's */
+        log_link( LOGLVL_INFO, LOGOUTPUT_IRC );
+        log_link( LOGLVL_DEBUG, LOGOUTPUT_IRC );
         
         return( 0 );

bitlbee.conf

@@ -73 +73 @@
 # 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

@@ -137 +137 @@
 #include "misc.h"
 #include "proxy.h"
+#include "otr.h"
 
 typedef struct global {
@@ -148 +149 @@
         char *helpfile;
         int restart;
+        OtrlMessageAppOps otr_ops;   /* collects interface functions required by OTR */
 } global_t;
 

conf.c

@@ -59 +59 @@
         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;
@@ -243 +244 @@
                                 g_free( conf->motdfile );
                                 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

@@ -30 +30 @@
 gcov=0
 plugins=1
+otr=auto
 
 events=glib
@@ -70 +71 @@
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
 --plugins=0/1   Disable/enable plugins support          $plugins
+--otr=0/1/auto  Disable/enable OTR encryption support   $otr
 
 --events=...    Event handler (glib, libevent)          $events
@@ -174 +176 @@
         if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
                 cat<<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
-CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
+EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0 gthread-2.0`
+CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0 gthread-2.0`
 EOF
         else
@@ -385 +387 @@
 fi
 
+if [ "$otr" = "auto" ]; then
+        for i in /lib /usr/lib /usr/local/lib; do
+                if [ -f $i/libotr.a ]; then
+                        otr=1
+                        break
+                fi
+        done
+fi
+if [ "$otr" = 0 ]; then
+        echo '#undef WITH_OTR' >> config.h
+else
+        echo '#define WITH_OTR' >> config.h
+        echo "EFLAGS+=-lotr" >> Makefile.settings
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
@@ -504 +521 @@
 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

@@ -49 +49 @@
 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
 through HTTPS. BitlBee can use several SSL libraries for this: GnuTLS, NSS
@@ -152 +156 @@
 
 
-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

@@ -244 +244 @@
                 </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 and context. 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>
+                
+        </bitlbee-command>
 
         <bitlbee-command name="set">
@@ -398 +534 @@
         </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="debug" type="boolean" scope="global">
                 <default>false</default>
@@ -464 +611 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="halfop_buddies" type="string" scope="global">
+                <default>encrypted</default>
+                <possible-values>encrypted, trusted, notaway, 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.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="lcnicks" type="boolean" scope="global">
                 <default>true</default>
@@ -486 +649 @@
         </bitlbee-setting>
 
-        <bitlbee-setting name="ops" type="string" scope="global">
-                <default>both</default>
-                <possible-values>both, root, user, none</possible-values>
-
-                <description>
-                        <para>
-                                Some people prefer themself and root to have operator status in &amp;bitlbee, other people don't. You can change these states using this setting.
-                        </para>
-
-                        <para>
-                                The value "both" means both user and root get ops. "root" means, well, just root. "user" means just the user. "none" means nobody will get operator status.
+        <bitlbee-setting name="op_buddies" type="string" scope="global">
+                <default>trusted</default>
+                <possible-values>encrypted, trusted, notaway, 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.
+                        </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>
@@ -680 +878 @@
                         </para>
                 </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="voice_buddies" type="string" scope="global">
+                <default>trusted</default>
+                <possible-values>encrypted, trusted, notaway, 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.
+                        </para>
+                </description>
+
         </bitlbee-setting>
 

irc.c

@@ -28 +28 @@
 #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;
@@ -102 +105 @@
 
         irc_connection_list = g_slist_append( irc_connection_list, irc );
-        
-        set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
+
         set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
         set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
@@ -110 +112 @@
         set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
         set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
+        set_add( &irc->set, "color_encrypted", "true", set_eval_bool, irc );
         set_add( &irc->set, "debug", "false", set_eval_bool, irc );
         set_add( &irc->set, "default_target", "root", NULL, irc );
         set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
         set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        set_add( &irc->set, "halfop_buddies", "encrypted", set_eval_halfop_buddies, irc );
         set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
-        set_add( &irc->set, "ops", "both", set_eval_ops, irc );
+        set_add( &irc->set, "op_buddies", "trusted", set_eval_op_buddies, irc );
+        set_add( &irc->set, "op_root", "true", set_eval_op_root, irc );
+        set_add( &irc->set, "op_user", "true", set_eval_op_user, irc );
+        set_add( &irc->set, "otr_policy", "opportunistic", set_eval_otr_policy, irc );
         set_add( &irc->set, "password", NULL, passchange, irc );
         set_add( &irc->set, "private", "true", set_eval_bool, irc );
@@ -124 +131 @@
         set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
         set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
+        set_add( &irc->set, "voice_buddies", "notaway",  set_eval_voice_buddies, irc );
         
         conf_loaddefaults( irc );
+
+        irc->otr = otr_new();
         
         return( irc );
@@ -264 +274 @@
         g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->watches);
+        
+        otr_free(irc->otr);
         
         g_free(irc);
@@ -620 +632 @@
 } 
 
+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 )
 {
@@ -625 +671 @@
         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
@@ -640 +685 @@
                         }
                         
-                        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, " " );
@@ -656 +696 @@
                 /* 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 ) ) )
@@ -667 +707 @@
                         }
                         
+                        strcat( namelist, user_mode_prefix(irc, u) );
                         strcat( namelist, u->nick );
                         strcat( namelist, " " );
@@ -708 +749 @@
         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=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
+        irc_reply( irc,   5, "PREFIX=(ohv)@%%+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
         irc->umode[0] = '\0';
@@ -735 +776 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there." );
+        irc_welcome( irc );
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )
@@ -741 +782 @@
         
         irc->status |= USTATUS_LOGGED_IN;
+}
+
+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\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQs are answered there.\n\nOTR users please note: Private key files are owned by the user BitlBee is running as." );
+        }
+        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;
 

lib/misc.c

@@ -112 +112 @@
         { "gt",     ">" },
         { "amp",    "&" },
+        { "apos",   "'" },
         { "quot",   "\"" },
         { "aacute", "á" },
@@ -143 +144 @@
         char *s = out, *cs;
         int i, matched;
+        int taglen;
         
         memset( out, 0, strlen( in ) + 1 );
@@ -159 +161 @@
                                 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 ++;

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

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

protocols/msn/msn.c

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

protocols/nogaim.c

@@ -603 +603 @@
         
         /* 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 */
+        if( ( u->online ) &&                                            /* Don't touch offline people */
+            ( ( ( u->online != oo ) && !u->away ) ||                    /* Do joining people */
+              ( ( u->online == oo ) && ( oa == !u->away ) ) ) )         /* Do people changing state */
         {
                 char *from;
@@ -619 +618 @@
                                                             ic->irc->myhost );
                 }
-                irc_write( ic->irc, ":%s MODE %s %cv %s", from, ic->irc->channel,
-                                                          u->away?'-':'+', 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 );
+                }
+                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 );
         }
@@ -630 +639 @@
         char *wrapped;
         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 )
         {
@@ -642 +657 @@
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
+                        g_free(msg);
                         return;
                 }
@@ -674 +690 @@
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
+        g_free( msg );
 }
 
@@ -914 +931 @@
 
 
-/* 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( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
-                st = 1;
-        else if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
-                st = 0;
-        else if( sscanf( value, "%d", &st ) != 1 )
-                return( NULL );
-        
-        st = st != 0;
-        
-        /* 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( set_eval_bool( set, value ) );
-}
-
-
-
-
 /* The plan is to not allow straight calls to prpl functions anymore, but do
    them all from some wrappers. We'll start to define some down here: */
@@ -991 +944 @@
                 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

@@ -136 +136 @@
          * - 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
@@ -317 +321 @@
 
 /* Misc. stuff */
-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

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

@@ -354 +354 @@
         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

@@ -102 +102 @@
         int count = 0;
         
+        if(!ic)
+                return;
+        
         q = irc->queries;
         def = query_default( irc );
@@ -140 +143 @@
         if( ans )
         {
-                imcb_log( q->ic, "Accepted: %s", q->question );
-                q->yes( NULL, q->data );
+                if(q->ic)
+                        imcb_log( q->ic, "Accepted: %s", q->question );
+                else
+                        irc_usermsg( irc, "Accepted: %s", q->question );
+                if(q->yes)
+                        q->yes( q->ic ? (gpointer)q->ic : (gpointer)irc, q->data );
         }
         else
         {
-                imcb_log( q->ic, "Rejected: %s", q->question );
-                q->no( NULL, q->data );
+                if(q->ic)
+                        imcb_log( q->ic, "Rejected: %s", q->question );
+                else
+                        irc_usermsg( irc, "Rejected: %s", q->question );
+                if(q->no)
+                        q->no( q->ic ? (gpointer)q->ic : (gpointer)irc, q->data );
         }
         q->data = NULL;

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "otr.h"
 
 #include <string.h>
@@ -241 +242 @@
                 
                 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 )
@@ -992 +997 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "otr",            1, cmd_otr,            0 }, 
         { NULL }
 };

set.c

@@ -209 +209 @@
 }
 
-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 NULL;
         
+        /* 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');
 }
 
@@ -245 +371 @@
         return value;
 }
+
+/* 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

@@ -96 +96 @@
 /* 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_charset( set_t *set, char *value );
+char *set_eval_otr_policy( set_t *set, char *value );
 
 #endif /* __SET_H__ */

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "crypting.h"
+#include "otr.h"
 
 extern storage_t storage_text;
@@ -115 +116 @@
                 if (status == STORAGE_OK) {
                         irc_setpass(irc, password);
+                        otr_load(irc);          /* load our OTR userstate */
                         return status;
                 }
                 
-                if (status != STORAGE_NO_SUCH_USER) 
+                if (status != STORAGE_NO_SUCH_USER) {
                         return status;
+                }
         }
         
@@ -127 +130 @@
 storage_status_t storage_save (irc_t *irc, int overwrite)
 {
-        return ((storage_t *)global.storage->data)->save(irc, overwrite);
+        storage_status_t st;
+        
+        otr_save(irc);
+        st = ((storage_t *)global.storage->data)->save(irc, overwrite);
+        return st;
 }
 
@@ -147 +154 @@
                         ret = status;
         }
+        if (ret == STORAGE_OK) {
+                otr_remove(nick);
+        }
         
         return ret;
@@ -157 +167 @@
         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. 
@@ -186 +198 @@
 
         storage_remove(onick, password);
+        otr_rename(onick, nnick);
 
         return STORAGE_OK;

unix.c

@@ -27 +27 @@
 #include "commands.h"
 #include "crypting.h"
+#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
@@ -54 +55 @@
         b_main_init();
         nogaim_init();
+        otr_init();
         
         srand( time( NULL ) ^ getpid() );

user.c

@@ -141 +141 @@
 }
 
-user_t *user_findhandle( struct im_connection *ic, char *handle )
+user_t *user_findhandle( struct im_connection *ic, const char *handle )
 {
         user_t *u;

user.h

@@ -37 +37 @@
         char is_private;
         char online;
+        char encrypted;
         
         char *handle;
@@ -56 +57 @@
 int user_del( irc_t *irc, char *nick );
 G_MODULE_EXPORT user_t *user_find( irc_t *irc, char *nick );
-G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT user_t *user_findhandle( struct im_connection *ic, const char *handle );
 void user_rename( irc_t *irc, char *oldnick, char *newnick );