mcabber: mcabber/mcabber/xmpp.c comparison

comparison mcabber/mcabber/xmpp.c @ 2346:7921c8d671c8

Implemented another helper function jid_get_resource_name

author	franky
date	Tue, 14 May 2019 22:19:33 +0200
parents	462f4359391c
children	db8de1b464d3

comparison

equal deleted inserted replaced

-:462f4359391c
+:7921c8d671c8
 // Is it a vCard request to a regular user?
 // (vCard requests are sent to bare JIDs, except in MUC rooms...)
 vcard2user = (reqtype == iqreq_vcard &&
 !roster_find(fjid, jidsearch, ROSTER_TYPE_ROOM));
-if (strchr(fjid, JID_RESOURCE_SEPARATOR) || vcard2user) {
+if (g_utf8_strchr(fjid, -1, JID_RESOURCE_SEPARATOR) || vcard2user) {
 // This is a full JID or a vCard request to a contact
 xmpp_iq_request(fjid, xmlns);
 scr_LogPrint(LPRINT_NORMAL, "Sent %s request to <%s>", strreqtype, fjid);
 return;
 }
 int otr_msg = 0;
 char *otr_msg_string = NULL;
 #endif
 char *barejid;
 #if defined HAVE_GPGME || defined XEP0085
-char *rname;
+const char *rname;
 GSList *sl_buddy;
 #endif
 #ifdef XEP0085
 LmMessageNode *event;
 struct xep0085 *xep85 = NULL;
 subtype = LM_MESSAGE_SUB_TYPE_CHAT;
 }
 barejid = jidtodisp(fjid);
 #if defined HAVE_GPGME || defined HAVE_LIBOTR || defined XEP0085
-rname = strchr(fjid, JID_RESOURCE_SEPARATOR);
+rname = jid_get_resource_name(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 (otr_enabled() && !otrinject) {
 if (type == ROSTER_TYPE_USER) {
 otr_msg_string = otr_send(text, barejid, &otr_msg);
 //  chatstates_reset_probed(fulljid)
 // If the XEP has been probed for this contact, set it back to unknown so
 // that we probe it again.  The parameter must be a full jid (w/ resource).
 #if defined XEP0085
-static void chatstates_reset_probed(const char *fulljid)
+static void chatstates_reset_probed(const char *bare_jid,
-{
+const char *resource_name)
-char *rname, *barejid;
+{
 GSList *sl_buddy;
 struct xep0085 *xep85;
-rname = strchr(fulljid, JID_RESOURCE_SEPARATOR);
+sl_buddy = roster_find(bare_jid, jidsearch, ROSTER_TYPE_USER);
-if (!rname++)
-return;
+// only reset if we found the buddy and it has a resource
+if (!sl_buddy || !resource_name)
-barejid = jidtodisp(fulljid);
+return;
-sl_buddy = roster_find(barejid, jidsearch, ROSTER_TYPE_USER);
-g_free(barejid);
+xep85 = buddy_resource_xep85(sl_buddy->data, resource_name);
-if (!sl_buddy)
-return;
-xep85 = buddy_resource_xep85(sl_buddy->data, rname);
 if (xep85 && xep85->support == CHATSTATES_SUPPORT_PROBED)
 xep85->support = CHATSTATES_SUPPORT_UNKNOWN;
 }
 #endif
 if (success) {
 const char *password, *resource;
 char *username;
 username   = jid_get_username(settings_opt_get("jid"));
 password   = settings_opt_get("password");
-resource   = strchr(lm_connection_get_jid(connection),
+resource   = jid_get_resource_name(lm_connection_get_jid(connection));
-JID_RESOURCE_SEPARATOR);
-if (resource)
-resource++;
 if (!lm_connection_authenticate(lconnection, username, password, resource,
 connection_auth_cb, NULL, FALSE, &error)) {
 scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s",
 error->message);
 char *decrypted_pgp = NULL;
 char *decrypted_otr = NULL;
 int otr_msg = 0, free_msg = 0;
 bjid = jidtodisp(from);
+rname = jid_get_resource_name(from);
-rname = strchr(from, JID_RESOURCE_SEPARATOR);
-if (rname) rname++;
 #ifdef HAVE_GPGME
 if (gpg_enabled()) {
 if (enc) {
 decrypted_pgp = gpg_decrypt(enc);
 static LmHandlerResult handle_messages(LmMessageHandler *handler,
 LmConnection *connection,
 LmMessage *m, gpointer user_data)
 {
 const char *from = lm_message_get_from(m);
-char *bjid, *res;
+char *bjid;
+const char *res;
 LmMessageNode *x;
 const char *body = NULL;
 const char *enc = NULL;
 const char *subject = NULL;
 time_t timestamp = 0L;
 if (!from) {
 scr_LogPrint(LPRINT_DEBUG, "handle_messages: message with missing from attribute");
 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 // Get the bare-JID/room (bjid) and the resource/nickname (res)
-bjid = g_strdup(from);
+bjid = jidtodisp(from);
-res = strchr(bjid, JID_RESOURCE_SEPARATOR);
+res = jid_get_resource_name(from);
-if (res) *res++ = 0;
 mstype = lm_message_get_sub_type(m);
 // Timestamp?
 timestamp = lm_message_node_get_timestamp(m->node);
 x = lm_message_node_get_child(m->node, "error");
 display_server_error(x, from);
 #ifdef XEP0085
 // If the XEP85/22 support is probed, set it back to unknown so that
 // we probe it again.
-chatstates_reset_probed(from);
+chatstates_reset_probed(bjid, res);
 #endif
 } else {
 handle_state_events(bjid, res, m->node);
 }
 if (!from) {
 scr_LogPrint(LPRINT_LOGNORM, "Malformed carbon copy!");
 goto handle_messages_return;
 }
 g_free(bjid);
-bjid = g_strdup(from);
+bjid = jidtodisp(from);
-res = strchr(bjid, JID_RESOURCE_SEPARATOR);
+res = jid_get_resource_name(from);
-if (res) *res++ = 0;
 // Try to handle forwarded chat state messages
 handle_state_events(from, res, x);
 scr_LogPrint(LPRINT_DEBUG, "Received incoming carbon from <%s>", from);
 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
-rname = strchr(from, JID_RESOURCE_SEPARATOR);
+rname = jid_get_resource_name(from);
-if (rname) rname++;
 if (settings_opt_get_int("ignore_self_presence")) {
 const char *self_fjid = lm_connection_get_jid(connection);
 if (self_fjid && !strcasecmp(self_fjid, from)) {
 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // Ignoring self presence

Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 2346:7921c8d671c8