Changeset 6d9f0ba for otr.c

Timestamp:

2013-08-02T11:15:21Z (11 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

22ec21d

Parents:

b939cff

Message:

implement otr_error_message callback

File:

• otr.c (modified) (3 diffs)

otr.c

@@ -87 +87 @@
         const char *message, gcry_error_t err);
 
+const char *op_otr_error_message(void *opdata, ConnContext *ctx,
+        OtrlErrorCode err_code);
+
 /** otr sub-command handlers: **/
 
@@ -229 +232 @@
         /* stuff added with libotr 4.0.0 */
         otr_ops.received_symkey = NULL;         /* we don't use the extra key */
-        otr_ops.otr_error_message = NULL;       // TODO?
+        otr_ops.otr_error_message = &op_otr_error_message;
         otr_ops.otr_error_message_free = NULL;
-        otr_ops.resent_msg_prefix = NULL;       // don't need?
+        otr_ops.resent_msg_prefix = NULL;       /* default: [resent] */
         otr_ops.resent_msg_prefix_free = NULL;
         otr_ops.handle_smp_event = &op_handle_smp_event;
@@ -861 +864 @@
                 /* ignore  XXX log? */
                 break;
+        }
+}
+
+const char *op_otr_error_message(void *opdata, ConnContext *ctx,
+        OtrlErrorCode err_code)
+{
+        switch(err_code) {
+        case OTRL_ERRCODE_ENCRYPTION_ERROR:
+                return "i failed to encrypt a message";
+        case OTRL_ERRCODE_MSG_NOT_IN_PRIVATE:
+                return "you sent an encrypted message i didn't expect";
+        case OTRL_ERRCODE_MSG_UNREADABLE:
+                return "could not read encrypted message";
+        case OTRL_ERRCODE_MSG_MALFORMED:
+                return "you sent a malformed OTR message";
+        default:
+                return "i suffered an unexpected OTR error";
         }
 }