Changeset 764c7d1

Timestamp:

2008-02-03T21:30:03Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

3c80a9d

Parents:

b5c8a34

Message:

OTR support, first checkin

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (2 diffs)
• configure (modified) (5 diffs)
• irc.c (modified) (2 diffs)
• irc.h (modified) (2 diffs)
• log.c (modified) (6 diffs)
• log.h (modified) (2 diffs)
• otr.c (added)
• otr.h (added)
• protocols/nogaim.c (modified) (4 diffs)
• root_commands.c (modified) (5 diffs)
• storage.c (modified) (6 diffs)
• unix.c (modified) (2 diffs)
• user.c (modified) (1 diff)
• user.h (modified) (1 diff)

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
 

bitlbee.c

@@ -139 +139 @@
         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.h

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

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

irc.c

@@ -126 +126 @@
         
         conf_loaddefaults( irc );
+
+        irc->otr_us = otrl_userstate_create();
+        irc->otr_mutex = g_mutex_new();
         
         return( irc );
@@ -276 +279 @@
                 }
         }
+        
+        otrl_userstate_free(irc->otr_us);
+        g_mutex_free(irc->otr_mutex);
+        
         g_free(irc);
         

irc.h

@@ -26 +26 @@
 #ifndef _IRC_H
 #define _IRC_H
+
+#include "otr.h"
 
 #define IRC_MAX_LINE 512
@@ -95 +97 @@
         gint w_watch_source_id;
         gint ping_source_id;
+        
+        OtrlUserState otr_us;
+        GMutex *otr_mutex;      /* for locking otr during keygen */
 } irc_t;
 

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/nogaim.c

@@ -630 +630 @@
         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 +648 @@
                                 imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
+                        g_free(msg);
                         return;
                 }
@@ -674 +681 @@
         irc_msgfrom( irc, u->nick, wrapped );
         g_free( wrapped );
+        g_free( msg );
 }
 
@@ -991 +999 @@
                 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;
 }

root_commands.c

@@ -29 +29 @@
 #include "bitlbee.h"
 #include "help.h"
+#include "otr.h"
 
 #include <string.h>
@@ -85 +86 @@
                 return;
         
+        if(!g_mutex_trylock(irc->otr_mutex)) {
+                irc_usermsg(irc, "keygen in progress, bitlbee comatose - please wait");
+                return;
+        }
+        
         for( i = 0; commands[i].command; i++ )
                 if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
@@ -91 +97 @@
                         {
                                 irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
+                                g_mutex_unlock(irc->otr_mutex);
                                 return;
                         }
                         commands[i].execute( irc, cmd );
+                        g_mutex_unlock(irc->otr_mutex);
                         return;
                 }
         
         irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        g_mutex_unlock(irc->otr_mutex);
 }
 
@@ -241 +250 @@
                 
                 irc_usermsg( irc, "Account successfully added" );
+                
+                otr_check_for_key(a);
         }
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
@@ -991 +1002 @@
         { "qlist",          0, cmd_qlist,          0 },
         { "join_chat",      2, cmd_join_chat,      0 },
+        { "otr",            1, cmd_otr,            0 }, 
         { NULL }
 };

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

@@ -56 +56 @@
 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 );