Changeset e4752a6

Timestamp:

2013-08-03T13:06:30Z (11 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

51f937e

Parents:

e65039a

Message:

cleanup and docs

File:

• otr.c (modified) (6 diffs)

otr.c

@@ -14 +14 @@
     <configdir>/<nick>.otr_keys
     <configdir>/<nick>.otr_fprints
+    <configdir>/<nick>.otr_instags  <- don't copy this one between hosts
     
   top-level todos: (search for TODO for more ;-))
@@ -19 +20 @@
     per-account policy settings
     per-user policy settings
+    add a way to select recipient instance
 */
 
@@ -632 +634 @@
 void op_gone_insecure(void *opdata, ConnContext *context)
 {
+        /* XXX on 'otr disconnect', this gets called for every instance and we
+         * get the message multiple times... */
+
         struct im_connection *ic =
                 check_imc(opdata, context->accountname, context->protocol);
@@ -871 +876 @@
                         "unreadable encrypted message received");
                 break;
+        case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
+                display_otr_message(opdata, ctx,
+                        "malformed OTR message received");
+                break;
+        case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
+                display_otr_message(opdata, ctx,
+                        "OTR error message received: %s", message);
+                break;
+        case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
+                display_otr_message(opdata, ctx,
+                        "unencrypted message received: %s", message);
+                break;
+        case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
+                display_otr_message(opdata, ctx,
+                        "unrecognized OTR message received");
+                break;
         case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
                 display_otr_message(opdata, ctx,
                         "OTR message for a different instance received");
-                break;
-        case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
-                display_otr_message(opdata, ctx,
-                        "malformed OTR message received");
-                break;
-        case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
-                display_otr_message(opdata, ctx,
-                        "OTR error message received: %s", message);
-                break;
-        case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
-                display_otr_message(opdata, ctx,
-                        "unencrypted message received: %s", message);
-                break;
-        case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
-                display_otr_message(opdata, ctx,
-                        "unrecognized OTR message received");
                 break;
         default:
@@ -1694 +1699 @@
 
         /* list all contexts */
+        /* XXX remove this, or split off as its own command */
+        /* XXX show instags? */
         irc_rootmsg(irc, "%s", "");
         irc_rootmsg(irc, "\x1f" "connection contexts:\x1f (bold=currently encrypted)");
@@ -1722 +1729 @@
 void show_otr_context_info(irc_t *irc, ConnContext *ctx)
 {
-        // XXX show all contexts
+        // XXX show all instags/subcontexts
 
         switch(ctx->otr_offer) {