mcabber: comparison mcabber/mcabber/xmpp.c

equal deleted inserted replaced

-:392cf37d5966
+:8819bab88053
 update_roster = TRUE;
 #endif
 }
 static void gotmessage(LmMessageSubType type, const char *from,
-const char *body, const char *enc, const char *subject,
+const char *body, const char *enc,
-time_t timestamp, LmMessageNode *node_signed)
+const char *subject, time_t timestamp,
+LmMessageNode *node_signed, gboolean carbon)
 {
 char *bjid;
 const char *rname;
 char *decrypted_pgp = NULL;
 char *decrypted_otr = NULL;
 fullbody = g_strdup_printf("[%s]\n%s", subject, body);
 else
 fullbody = g_strdup_printf("[%s]\n", subject);
 body = fullbody;
 }
+// XXX/TODO: pass the carbon status (Mikael)
 hk_message_in(bjid, rname, timestamp, body, type, encrypted);
 g_free(fullbody);
 }
 gotmessage_return:
 const char *body = NULL;
 const char *enc = NULL;
 const char *subject = NULL;
 time_t timestamp = 0L;
 LmMessageSubType mstype;
+gboolean skip_process = FALSE;
+LmMessageNode *ns_signed = NULL;
 mstype = lm_message_get_sub_type(m);
 body = lm_message_node_get_child_value(m->node, "body");
 handle_state_events(from, m->node);
 }
 // Check for carbons!
 x = lm_message_node_find_xmlns(m->node, NS_CARBONS_2);
-char carbons = 0;
+gboolean carbons = FALSE;
 if (x) {
-carbons = 1;
+carbons = TRUE;
 // Parse a message that is send to one of our other resources
 if (!g_strcmp0(x->name, "received")) {
 // Go 1 level deeper to the forwarded message
 x = lm_message_node_find_xmlns(x, "urn:xmpp:forward:0");
 x = lm_message_node_get_child(x, "message");
 from = lm_message_node_get_attribute(x, "from");
+if (!from) {
+scr_LogPrint(LPRINT_LOGNORM, "Malformed carbon copy!");
+goto handle_messages_return;
+}
 g_free(bjid);
 bjid = g_strdup(from);
 res = strchr(bjid, JID_RESOURCE_SEPARATOR);
 if (res) *res++ = 0;
-scr_WriteIncomingMessage(bjid, body, timestamp, HBB_PREFIX_IN, 0);
+if (body && *body && !subject && !enc)
-scr_LogPrint(LPRINT_DEBUG, "carbon from:%s",
+ns_signed = lm_message_node_find_xmlns(x, NS_SIGNED);
-lm_message_node_get_attribute(x, "from"));
+else
+skip_process = TRUE;
+// We (probably) cannot handle encrypted forwarded messages
+if (lm_message_node_find_xmlns(x, NS_ENCRYPTED))
+skip_process = TRUE;
+// Try to handle forwarded chat state messages
+if (!skip_process)
+handle_state_events(from, x);
+scr_LogPrint(LPRINT_DEBUG, "Received incoming carbon from <%s>", from);
 } else if (!g_strcmp0(x->name, "sent")) {
 x = lm_message_node_find_xmlns(x, "urn:xmpp:forward:0");
 x = lm_message_node_get_child(x, "message");
 const char *to= lm_message_node_get_attribute(x, "to");
+if (!to) {
+scr_LogPrint(LPRINT_LOGNORM, "Malformed carbon copy!");
+goto handle_messages_return;
+}
 g_free(bjid);
-bjid = g_strdup(to);
+bjid = jidtodisp(to);
-res = strchr(bjid, JID_RESOURCE_SEPARATOR);
-if (res) *res++ = 0;
+if (body && *body)
+hk_message_out(bjid, NULL, timestamp, body, 0, NULL);
-scr_write_outgoing_message(bjid, body, 0, NULL);
-}
+scr_LogPrint(LPRINT_DEBUG, "Received outgoing carbon for <%s>", to);
-}
+goto handle_messages_return;
+}
+} else { // Not a Carbon
-if (from && (body || subject) && !carbons)
+ns_signed = lm_message_node_find_xmlns(m->node, NS_SIGNED);
+}
+// Do not process the message if some fields are missing
+if (!from || (!body && !subject))
+skip_process = TRUE;
+if (!skip_process) {
 gotmessage(mstype, from, body, enc, subject, timestamp,
-lm_message_node_find_xmlns(m->node, NS_SIGNED));
+ns_signed, carbons);
+}
+// We're done if it was a Carbon forwarded message
+if (carbons)
+goto handle_messages_return;
 // Report received message if message delivery receipt was requested
 if (lm_message_node_get_child(m->node, "request") &&
 (roster_getsubscription(bjid) & sub_from)) {
 const gchar *mid;
 got_invite(from, jid, reason, password, FALSE);
 }
 }
 }
+handle_messages_return:
 g_free(bjid);
 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 static LmHandlerResult cb_caps(LmMessageHandler *h, LmConnection *c,

changeset 2151	8819bab88053
parent 2141	e702073612de
child 2152	2ce6dd6861ea