Changeset 3064ea4

Timestamp:

2008-02-16T15:20:58Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

1221ef0

Parents:

dc9797f

Message:

rework keygen messages and add some notices

Files:

• irc.c (modified) (1 diff)
• otr.c (modified) (10 diffs)
• otr.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)

irc.c

@@ -788 +788 @@
         
         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." );
+        #ifdef WITH_OTR
+        irc_usermsg( irc, "\nOTR users please note: Private key files are owned by the user BitlBee is running as." );
+        #endif
         
         if( global.conf->runmode == RUNMODE_FORKDAEMON || global.conf->runmode == RUNMODE_DAEMON )

otr.c

@@ -230 +230 @@
         gcry_error_t e;
         gcry_error_t enoent = gcry_error_from_errno(ENOENT);
+        int kg=0;
 
         log_message(LOGLVL_DEBUG, "otr_load '%s'", irc->nick);
@@ -246 +247 @@
         /* check for otr keys on all accounts */
         for(a=irc->accounts; a; a=a->next) {
-                otr_check_for_key(a);
+                kg = otr_check_for_key(a) || kg;
+        }
+        if(kg) {
+                irc_usermsg(irc, "Notice: "
+                        "The accounts above do not have OTR encryption keys associated with them, yet. "
+                    "These keys are now being generated in the background. "
+                    "You will be notified as they are completed. "
+                    "It is not necessary to wait; "
+                    "BitlBee can be used normally during key generation. "
+                    "You may safely ignore this message if you don't know what OTR is. ;)");
         }
 }
@@ -291 +301 @@
 }
 
-void otr_check_for_key(account_t *a)
+int otr_check_for_key(account_t *a)
 {
         irc_t *irc = a->irc;
@@ -299 +309 @@
         if(k) {
                 irc_usermsg(irc, "otr: %s/%s ready", a->user, a->prpl->name);
+                return 0;
         } if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_usermsg(irc, "otr: keygen for %s/%s in progress", a->user, a->prpl->name);
+                irc_usermsg(irc, "otr: keygen for %s/%s already in progress", a->user, a->prpl->name);
+                return 0;
         } else {
+                irc_usermsg(irc, "otr: starting background keygen for %s/%s", a->user, a->prpl->name);
                 otr_keygen(irc, a->user, a->prpl->name);
+                return 1;
         }
 }
@@ -1245 +1259 @@
         }
         if(count==0)
-                irc_usermsg(irc, "  no fingerprints");
+                irc_usermsg(irc, "  (none)");
 }
 
@@ -1385 +1399 @@
         OtrlPrivKey *key;
         char human[45];
-
-        /* list all privkeys */
+        kg_t *kg;
+
+        /* list all privkeys (including ones being generated) */
         irc_usermsg(irc, "\x1fprivate keys:\x1f");
         for(key=irc->otr->us->privkey_root; key; key=key->next) {
@@ -1407 +1422 @@
                         irc_usermsg(irc, "    %s", human);
         }
+        for(kg=irc->otr->todo; kg; kg=kg->next) {
+                irc_usermsg(irc, "  %s/%s - DSA", kg->accountname, kg->protocol);
+                irc_usermsg(irc, "    (being generated)");
+        }
+        if(key == irc->otr->us->privkey_root && kg == irc->otr->todo)
+                irc_usermsg(irc, "  (none)");
 
         /* list all contexts */
@@ -1431 +1452 @@
                 g_free(userstring);
         }
+        if(ctx == irc->otr->us->context_root)
+                irc_usermsg(irc, "  (none)");
 }
 
@@ -1499 +1522 @@
         if(keygen_in_progress(irc, handle, protocol))
                 return;
-        
-        irc_usermsg(irc, "generating new private key for %s/%s...", handle, protocol);
 
         /* see if we already have a keygen child running. if not, start one and put a
@@ -1687 +1708 @@
                         acc->user, acc->prpl->name);
         } else {
+                irc_usermsg(acc->irc, "starting background keygen for %s/%s",
+                        acc->user, acc->prpl->name);
+                irc_usermsg(acc->irc, "you will be notified when it completes");
                 otr_keygen(acc->irc, acc->user, acc->prpl->name);
         }

otr.h

@@ -86 +86 @@
 
 /* called from account_add() */
-void otr_check_for_key(struct account *a);
+int otr_check_for_key(struct account *a);
 
 /* called from imcb_buddy_msg() */

root_commands.c

@@ -243 +243 @@
                 irc_usermsg( irc, "Account successfully added" );
                 
-                otr_check_for_key(a);
+                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 )