From 2594488451920dd9a553d9cb13c6e94c8b84d9de Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 12 Oct 2023 19:48:51 +0300 Subject: Jabber: no need to economy on matches --- protocols/JabberG/src/jabber_iq.cpp | 18 +++++------------- protocols/JabberG/src/jabber_message_manager.cpp | 8 ++------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp index 850e755420..a5c5419991 100644 --- a/protocols/JabberG/src/jabber_iq.cpp +++ b/protocols/JabberG/src/jabber_iq.cpp @@ -219,17 +219,13 @@ bool CJabberIqManager::HandleIq(int nIqId, const TiXmlElement *pNode) pInfo->m_szChildTagXmlns = XmlGetAttr(pNode, "xmlns"); } - if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_TO) - pInfo->m_szTo = XmlGetAttr(pNode, "to"); + pInfo->m_szId = XmlGetAttr(pNode, "id"); + pInfo->m_szTo = XmlGetAttr(pNode, "to"); + pInfo->m_szFrom = XmlGetAttr(pNode, "from"); - if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_FROM) - pInfo->m_szFrom = XmlGetAttr(pNode, "from"); if (pInfo->m_szFrom && (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_HCONTACT)) pInfo->m_hContact = ppro->HContactFromJID(pInfo->m_szFrom); - if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_ID_STR) - pInfo->m_szId = XmlGetAttr(pNode, "id"); - if (pInfo->m_pHandler) (ppro->*(pInfo->m_pHandler))(pNode, pInfo); delete pInfo; @@ -273,12 +269,8 @@ bool CJabberIqManager::HandleIqPermanent(const TiXmlElement *pNode) iqInfo.m_szChildTagXmlns = szXmlns; iqInfo.m_szId = XmlGetAttr(pNode, "id"); iqInfo.m_pUserData = pInfo->m_pUserData; - - if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_TO) - iqInfo.m_szTo = XmlGetAttr(pNode, "to"); - - if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_FROM) - iqInfo.m_szFrom = XmlGetAttr(pNode, "from"); + iqInfo.m_szTo = XmlGetAttr(pNode, "to"); + iqInfo.m_szFrom = XmlGetAttr(pNode, "from"); if ((pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_HCONTACT) && (iqInfo.m_szFrom)) iqInfo.m_hContact = ppro->HContactFromJID(iqInfo.m_szFrom); diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp index b1db1f299a..edbb42018e 100644 --- a/protocols/JabberG/src/jabber_message_manager.cpp +++ b/protocols/JabberG/src/jabber_message_manager.cpp @@ -85,12 +85,8 @@ bool CJabberMessageManager::HandleMessagePermanent(const TiXmlElement *node, Thr messageInfo.m_szChildTagXmlns = szXmlns; messageInfo.m_pUserData = it->m_pUserData; messageInfo.m_szFrom = XmlGetAttr(node, "from"); // is necessary for ppro->debugLogA() below, that's why we must parse it even if JABBER_MESSAGE_PARSE_FROM flag is not set - - if (it->m_dwParamsToParse & JABBER_MESSAGE_PARSE_ID_STR) - messageInfo.m_szId = XmlGetAttr(node, "id"); - - if (it->m_dwParamsToParse & JABBER_IQ_PARSE_TO) - messageInfo.m_szTo = XmlGetAttr(node, "to"); + messageInfo.m_szId = XmlGetAttr(node, "id"); + messageInfo.m_szTo = XmlGetAttr(node, "to"); if (it->m_dwParamsToParse & JABBER_MESSAGE_PARSE_HCONTACT) messageInfo.m_hContact = ppro->HContactFromJID(messageInfo.m_szFrom); -- cgit v1.2.3