mcabber-crew: comparison mcabber/src/jabglue.c

equal deleted inserted replaced

-:af035a304bec
+:3b338a5c01fc
 #include "settings.h"
 #include "hbuf.h"
 #include "histolog.h"
 #include "commands.h"
 #include "pgp.h"
+#include "otr.h"
 #define JABBERPORT      5222
 #define JABBERSSLPORT   5223
 #define RECONNECTION_TIMEOUT    60L
 srand(now);
 msg_idn += 1U + (unsigned int) (9.0 * (rand() / (RAND_MAX + 1.0)));
 return g_strdup_printf("%u%d", msg_idn, (int)(now%10L));
 }
-//  jb_send_msg(jid, test, type, subject, msgid, *encrypted)
+//  jb_send_msg(jid, text, type, subject, msgid, *encrypted)
 // When encrypted is not NULL, the function set *encrypted to 1 if the
 // message has been PGP-encrypted.  If encryption enforcement is set and
 // encryption fails, *encrypted is set to -1.
 void jb_send_msg(const char *fjid, const char *text, int type,
 const char *subject, const char *msgid, gint *encrypted)
 {
 xmlnode x;
 gchar *strtype;
+int otr_msg = 0;
 #if defined HAVE_GPGME || defined JEP0022 || defined JEP0085
 char *rname, *barejid;
 GSList *sl_buddy;
 #endif
 #if defined JEP0022 || defined JEP0085
 if (type == ROSTER_TYPE_ROOM)
 strtype = TMSG_GROUPCHAT;
 else
 strtype = TMSG_CHAT;
-#if defined HAVE_GPGME || defined JEP0022 || defined JEP0085
+#if defined HAVE_GPGME || defined HAVE_LIBOTR || defined JEP0022 || defined JEP0085
 rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
 barejid = jidtodisp(fjid);
 sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
 // If we can get a resource name, we use it.  Else we use NULL,
 // which hopefully will give us the most likely resource.
 if (rname)
 rname++;
+#ifdef HAVE_LIBOTR
+if (msgid && strcmp(msgid, "otrinject") == 0)
+msgid = NULL;
+else {
+otr_msg = otr_send((char **)&text, barejid);
+if (!text) {
+g_free(barejid);
+if (encrypted)
+*encrypted = -1;
+return;
+}
+}
+if (otr_msg && encrypted) {
+*encrypted = 1;
+}
+#endif
 #ifdef HAVE_GPGME
 if (type == ROSTER_TYPE_USER && sl_buddy && gpg_enabled()) {
 if (!settings_pgp_getdisabled(barejid)) { // not disabled for this contact?
 guint force;
 xmlnode xmldata_signed)
 {
 char *bjid;
 const char *rname, *s;
 char *decrypted = NULL;
+int otr_msg = 0, free_msg = 0;
 bjid = jidtodisp(from);
 rname = strchr(from, JID_RESOURCE_SEPARATOR);
 if (rname) rname++;
 }
 }
 // Check signature of an unencrypted message
 if (xmldata_signed && gpg_enabled())
 check_signature(bjid, rname, xmldata_signed, decrypted);
+#endif
+#ifdef HAVE_LIBOTR
+otr_msg = otr_receive((char **)&body, bjid, &free_msg);
+if(!body){
+g_free(bjid);
+return;
+}
 #endif
 // Check for unexpected groupchat messages
 // If we receive a groupchat message from a room we're not a member of,
 // this is probably a server issue and the best we can do is to send
 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
 }
 g_free(bjid);
 g_free(decrypted);
+if(free_msg)
+g_free((char *)body);
 buddylist_build();
 scr_DrawRoster();
 return;
 }
 if (!settings_opt_get_int("block_unsubscribed") ||
 (roster_getsubscription(bjid) & sub_from) ||
 (type && strcmp(type, "chat")) ||
 ((s = settings_opt_get("server")) != NULL && !strcasecmp(bjid, s))) {
 hk_message_in(bjid, rname, timestamp, body, type,
-(decrypted ? TRUE : FALSE));
+((decrypted || otr_msg) ? TRUE : FALSE));
 } else {
 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid);
 }
 g_free(bjid);
 g_free(decrypted);
+if(free_msg)
+g_free((char *)body);
 }
 static const char *defaulterrormsg(int code)
 {
 const char *desc;

changeset 1299	3b338a5c01fc
parent 1290	e42f48103609
child 1304	8ada97e5eb75