Changeset 0e078a7

Timestamp:

2010-09-19T20:04:32Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

4752063

Parents:

10d89be

Message:

complain when trying smp without an otr channel

File:

• otr.c (modified) (2 diffs)

otr.c

@@ -1064 +1064 @@
         if(!context) {
                 /* huh? out of memory or what? */
+                irc_usermsg(irc, "smp: failed to get otr context for %s", u->nick);
+                otrl_message_abort_smp(us, ops, u->bu->ic, context);
+                otrl_sm_state_free(context->smstate);
                 return;
         }
@@ -1174 +1177 @@
         
         ctx = otrl_context_find(irc->otr->us, u->bu->handle,
-                u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 1, NULL, NULL, NULL);
-        if(!ctx) {
-                /* huh? out of memory or what? */
+                u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
+        if(!ctx || ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
+                irc_usermsg(irc, "smp: otr inactive with %s, try \x02otr connect"
+                                " %s\x02", nick, nick);
                 return;
         }