Changeset f3597a1

Timestamp:

2008-02-14T21:01:21Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

6c91e6e

Parents:

ef93a2f

Message:

revert keygen behaviour to old (lax) behavior

Files:

• otr.c (modified) (5 diffs)
• root_commands.c (modified) (2 diffs)

otr.c

@@ -164 +164 @@
 /* find a private key by fingerprint prefix (given as any number of hex strings) */
 OtrlPrivKey *match_privkey(irc_t *irc, const char **args);
-
-/* to log out accounts during keygen */
-extern void cmd_account(irc_t *irc, char **cmd);
 
 
@@ -301 +298 @@
         
     if(!g_static_rec_mutex_trylock(&ic->irc->otr_mutex)) {
-                irc_usermsg(ic->irc, "otr keygen in progress - msg from %s dropped",
+                user_t *u = user_findhandle(ic, handle);
+                
+                /* fallback for non-otr clients */
+                if(u && !u->encrypted) {
+                        return g_strdup(msg);
+                }
+                
+                irc_usermsg(ic->irc, "encrypted msg from %s during keygen - dropped",
                         peernick(ic->irc, handle, ic->acc->prpl->name));
                 return NULL;
@@ -350 +354 @@
         
     if(!g_static_rec_mutex_trylock(&ic->irc->otr_mutex)) {
-                irc_usermsg(ic->irc, "otr keygen in progress - msg to %s not sent",
+                user_t *u = user_findhandle(ic, handle);
+                
+                /* Fallback for non-otr clients.
+                   Yes, this better shouldn't send private stuff in the clear... */
+                if(u && !u->encrypted) {
+                        return ic->acc->prpl->buddy_msg(ic, (char *)handle, (char *)msg, flags);
+                }
+                
+                irc_usermsg(ic->irc, "encrypted message to %s during keygen - not sent",
                         peernick(ic->irc, handle, ic->acc->prpl->name));
                 return 1;
@@ -1466 +1478 @@
 void otr_keygen(irc_t *irc, const char *handle, const char *protocol)
 {
-        char *account_off[] = {"account", "off", NULL};
         GError *err;
         GThread *thr;
         struct kgdata *kg;
         gint ev;
+        
+        irc_usermsg(irc, "generating new private key for %s/%s...", handle, protocol);
         
         kg = g_new0(struct kgdata, 1);
@@ -1509 +1522 @@
         }
 
-        /* tell the user what's happening, go comatose, and start the keygen */
-        irc_usermsg(irc, "going comatose for otr key generation, this will take a moment");
-        irc_usermsg(irc, "all accounts logging out, user commands disabled");
-        cmd_account(irc, account_off);
-        irc_usermsg(irc, "generating new otr privkey for %s/%s...",
-                handle, protocol);
-        
         thr = g_thread_create(&otr_keygen_thread_func, kg, FALSE, &err);
         if(!thr) {

root_commands.c

@@ -136 +136 @@
 }
 
-void cmd_account( irc_t *irc, char **cmd );
+static void cmd_account( irc_t *irc, char **cmd );
 
 static void cmd_identify( irc_t *irc, char **cmd )
@@ -213 +213 @@
 }
 
-void cmd_account( irc_t *irc, char **cmd )
+static void cmd_account( irc_t *irc, char **cmd )
 {
         account_t *a;