Changeset a13855a

Timestamp:

2008-02-06T16:42:23Z (16 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

5a71d9c

Parents:

3c80a9d

Message:

use peernicks and try to guess max message size

File:

• otr.c (modified) (7 diffs)

otr.c

@@ -43 +43 @@
 void op_log_message(void *opdata, const char *message);
 
-/* TODO: int op_max_message_size(void *opdata, ConnContext *context); */
-
-/* TODO: const char *op_account_name(void *opdata, const char *account,
-        const char *protocol); */
+int op_max_message_size(void *opdata, ConnContext *context);
+
+const char *op_account_name(void *opdata, const char *account, const char *protocol);
 
 
@@ -132 +131 @@
         global.otr_ops.still_secure = &op_still_secure;
         global.otr_ops.log_message = &op_log_message;
-        global.otr_ops.max_message_size = NULL;
-        global.otr_ops.account_name = NULL;
+        global.otr_ops.max_message_size = &op_max_message_size;
+        global.otr_ops.account_name = &op_account_name;
         global.otr_ops.account_name_free = NULL;
 }
@@ -221 +220 @@
 {
         irc_t *irc = a->irc;
-        char buf[45];
-        char *fp;
-        
-        fp = otrl_privkey_fingerprint(irc->otr_us, buf, a->user, a->prpl->name);
-        if(fp) {
-                irc_usermsg(irc, "otr: %s/%s ready with f'print %s",
-                        a->user, a->prpl->name, fp);
+        OtrlPrivKey *k;
+        
+        k = otrl_privkey_find(irc->otr_us, a->user, a->prpl->name);
+        if(k) {
+                irc_usermsg(irc, "otr: %s/%s ready",
+                        a->user, a->prpl->name);
         } else {
                 otr_keygen(irc, a->user, a->prpl->name);
@@ -242 +240 @@
     if(!g_mutex_trylock(ic->irc->otr_mutex)) {
         /* TODO: queue msgs received during keygen for later */
-                irc_usermsg(ic->irc, "msg from %s/%s during keygen - dropped",
-                        handle, ic->acc->prpl->name);
+                irc_usermsg(ic->irc, "msg from %s during keygen - dropped",
+                        peernick(ic->irc, handle, ic->acc->prpl->name));
                 return NULL;
         }
@@ -290 +288 @@
     
     if(!g_mutex_trylock(ic->irc->otr_mutex)) {
-        irc_usermsg(ic->irc, "msg to %s/%s during keygen - not sent",
-                handle, ic->acc->prpl->name);
+        irc_usermsg(ic->irc, "msg to %s during keygen - not sent",
+                peernick(ic->irc, handle, ic->acc->prpl->name));
         return 1;
     }
@@ -487 +485 @@
 {
         log_message(LOGLVL_INFO, "%s", message);
+}
+
+int op_max_message_size(void *opdata, ConnContext *context)
+{
+        /* TODO: make max_message_size a property of the prpl.
+                 the values here are taken from the libotr UPGRADING file */
+        if(!strcmp(context->protocol, "msn"))
+                return 1409;
+        if(!strcmp(context->protocol, "yahoo"))
+                return 832;
+        if(!strcmp(context->protocol, "oscar"))
+                return 2343;
+}
+
+const char *op_account_name(void *opdata, const char *account, const char *protocol)
+{
+        struct im_connection *ic = (struct im_connection *)opdata;
+
+        log_message(LOGLVL_DEBUG, "op_account_name '%s' '%s'", account, protocol);
+        
+        return peernick(ic->irc, account, protocol);
 }
 
@@ -947 +966 @@
         account_t *acc = (account_t *)data;
         
+        /* TODO: remember that we didn't want a key? */
         irc_usermsg(acc->irc, "proceeding without key, otr inoperable on %s/%s",
                 acc->user, acc->prpl->name);