From ccd1d2cf194034faa91ee353e544a9337d3fa993 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 13 Apr 2019 17:54:12 +0300
Subject: Jabber:

- Miranda to generate globally unique packet ids;
- unused member IJabberInterface::AddTemporaryIqHandler removed;
- two rarely used params removed from CJabberProto::AddIQ && CJabberIqManager::AddHandler
- code cleaning
---
 protocols/JabberG/src/jabber.cpp           |  4 ++++
 protocols/JabberG/src/jabber_adhoc.cpp     |  8 ++++----
 protocols/JabberG/src/jabber_api.cpp       | 11 -----------
 protocols/JabberG/src/jabber_byte.cpp      | 13 +++++--------
 protocols/JabberG/src/jabber_caps.cpp      |  6 ++++--
 protocols/JabberG/src/jabber_disco.cpp     | 15 ++++++---------
 protocols/JabberG/src/jabber_ft.cpp        | 14 ++++++++------
 protocols/JabberG/src/jabber_groupchat.cpp |  2 +-
 protocols/JabberG/src/jabber_ibb.cpp       |  4 ++--
 protocols/JabberG/src/jabber_icolib.cpp    |  8 ++++----
 protocols/JabberG/src/jabber_iq.cpp        |  7 ++-----
 protocols/JabberG/src/jabber_iq.h          |  4 +---
 protocols/JabberG/src/jabber_iqid.cpp      | 24 ++++++++++++------------
 protocols/JabberG/src/jabber_omemo.cpp     |  2 +-
 protocols/JabberG/src/jabber_privacy.cpp   | 17 ++++++++---------
 protocols/JabberG/src/jabber_proto.cpp     | 27 ++++++++++++++++-----------
 protocols/JabberG/src/jabber_proto.h       |  6 ++----
 protocols/JabberG/src/jabber_thread.cpp    | 11 +++++------
 protocols/JabberG/src/jabber_util.cpp      | 11 +++++------
 protocols/JabberG/src/jabber_xml.cpp       |  5 +----
 protocols/JabberG/src/jabber_xml.h         |  1 +
 protocols/JabberG/src/stdafx.h             | 10 +++++++---
 22 files changed, 99 insertions(+), 111 deletions(-)

(limited to 'protocols')

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 2317ee00e8..854d565e1f 100755
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -156,6 +156,10 @@ int CMPlugin::Load()
 	bPlatform = 0;
 	#endif
 
+	char tmp[8];
+	Utils_GetRandom(tmp, sizeof(tmp));
+	bin2hex(tmp, sizeof(tmp), szRandom);
+
 	Miranda_GetVersionText(szCoreVersion, _countof(szCoreVersion));
 
 	CallService(MS_UTILS_GETCOUNTRYLIST, (WPARAM)&g_cbCountries, (LPARAM)&g_countries);
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 9502aee3ed..4685038a02 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -103,7 +103,7 @@ void CJabberProto::OnIqResult_CommandExecution(const TiXmlElement *iqNode, CJabb
 
 void CJabberProto::AdHoc_RequestListOfCommands(char *szResponder, HWND hwndDlg)
 {
-	m_ThreadInfo->send(XmlNodeIq(AddIQ(&CJabberProto::OnIqResult_ListOfCommands, JABBER_IQ_TYPE_GET, szResponder, 0, -1, hwndDlg))
+	m_ThreadInfo->send(XmlNodeIq(AddIQ(&CJabberProto::OnIqResult_ListOfCommands, JABBER_IQ_TYPE_GET, szResponder, hwndDlg))
 		<< XQUERY(JABBER_FEAT_DISCO_ITEMS) << XATTR("node", JABBER_FEAT_COMMANDS));
 }
 
@@ -118,7 +118,7 @@ int CJabberProto::AdHoc_ExecuteCommand(HWND hwndDlg, char*, JabberAdHocData *dat
 		if (node) {
 			const char *jid2 = XmlGetAttr(itemNode, "jid");
 			m_ThreadInfo->send(
-				XmlNodeIq(AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, jid2, 0, -1, hwndDlg))
+				XmlNodeIq(AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, jid2, hwndDlg))
 				<< XCHILDNS("command", JABBER_FEAT_COMMANDS) << XATTR("node", node) << XATTR("action", "execute"));
 
 			EnableDlgItem(hwndDlg, IDC_SUBMIT, FALSE);
@@ -279,7 +279,7 @@ int CJabberProto::AdHoc_SubmitCommandForm(HWND hwndDlg, JabberAdHocData *dat, ch
 	auto *xNode = XmlFirstChild(commandNode, "x");
 
 	const char *jid2 = XmlGetAttr(dat->AdHocNode, "from");
-	XmlNodeIq iq(AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, jid2, 0, -1, hwndDlg));
+	XmlNodeIq iq(AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, jid2, hwndDlg));
 	TiXmlElement *command = iq << XCHILDNS("command", JABBER_FEAT_COMMANDS);
 
 	const char *sessionId = XmlGetAttr(commandNode, "sessionid");
@@ -371,7 +371,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 			}
 			else {
 				dat->proto->m_ThreadInfo->send(
-					XmlNodeIq(dat->proto->AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, pStartupParams->m_szJid, 0, -1, hwndDlg))
+					XmlNodeIq(dat->proto->AddIQ(&CJabberProto::OnIqResult_CommandExecution, JABBER_IQ_TYPE_SET, pStartupParams->m_szJid, hwndDlg))
 					<< XCHILDNS("command", JABBER_FEAT_COMMANDS)
 					<< XATTR("node", pStartupParams->m_szNode) << XATTR("action", "execute"));
 
diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp
index 4d52cfa41b..42c91b1ce8 100644
--- a/protocols/JabberG/src/jabber_api.cpp
+++ b/protocols/JabberG/src/jabber_api.cpp
@@ -163,17 +163,6 @@ HJHANDLER CJabberProto::AddIqHandler(JABBER_HANDLER_FUNC Func, int iIqTypes, con
 	return (HJHANDLER)m_iqManager.AddPermanentHandler(&CJabberProto::ExternalIqHandler, iIqTypes, 0, szXmlns, FALSE, szTag, d, free, iPriority);
 }
 
-HJHANDLER CJabberProto::AddTemporaryIqHandler(JABBER_HANDLER_FUNC Func, int iIqTypes, int iIqId, void *pUserData, DWORD dwTimeout, int iPriority)
-{
-	sHandlerData *d = (sHandlerData*)malloc(sizeof(sHandlerData));
-	d->Func = Func;
-	d->pUserData = pUserData;
-	CJabberIqInfo *pInfo = AddIQ(&CJabberProto::ExternalTempIqHandler, iIqTypes, nullptr, 0, iIqId, d, iPriority);
-	if (pInfo && dwTimeout > 0)
-		pInfo->SetTimeout(dwTimeout);
-	return (HJHANDLER)pInfo;
-}
-
 HJHANDLER CJabberProto::AddSendHandler(JABBER_HANDLER_FUNC Func, void *pUserData, int iPriority)
 {
 	sHandlerData *d = (sHandlerData*)malloc(sizeof(sHandlerData));
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 5d89502c94..c72ebaaea6 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -161,7 +161,7 @@ void CJabberProto::ByteSendThread(JABBER_BYTE_TRANSFER *jbt)
 			jbt->szProxyJid = nullptr;
 			jbt->hProxyEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
 
-			CJabberIqInfo *pInfo = AddIQ(&CJabberProto::IqResultProxyDiscovery, JABBER_IQ_TYPE_GET, proxyJid, 0, -1, jbt);
+			CJabberIqInfo *pInfo = AddIQ(&CJabberProto::IqResultProxyDiscovery, JABBER_IQ_TYPE_GET, proxyJid, jbt);
 			nIqId = pInfo->GetIqId();
 			XmlNodeIq iq(pInfo);
 			iq << XQUERY(JABBER_FEAT_BYTESTREAMS);
@@ -184,7 +184,7 @@ void CJabberProto::ByteSendThread(JABBER_BYTE_TRANSFER *jbt)
 		}
 	}
 
-	CJabberIqInfo *pInfo = AddIQ(&CJabberProto::ByteInitiateResult, JABBER_IQ_TYPE_SET, jbt->dstJID, 0, -1, jbt);
+	CJabberIqInfo *pInfo = AddIQ(&CJabberProto::ByteInitiateResult, JABBER_IQ_TYPE_SET, jbt->dstJID, jbt);
 	nIqId = pInfo->GetIqId();
 	char szPort[8];
 	{
@@ -538,18 +538,15 @@ int CJabberProto::ByteSendProxyParse(HNETLIBCONN hConn, JABBER_BYTE_TRANSFER *jb
 			jbt->hProxyEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
 			jbt->bStreamActivated = FALSE;
 
-			int iqId = SerialNext();
+			auto *pIq = AddIQ(&CJabberProto::IqResultStreamActivate, JABBER_IQ_TYPE_SET, jbt->streamhostJID);
 
 			char listJid[256];
-			mir_snprintf(listJid, "ftproxy_%d", iqId);
+			mir_snprintf(listJid, "ftproxy_%d", pIq->GetIqId());
 
 			JABBER_LIST_ITEM *item = ListAdd(LIST_FTIQID, listJid);
 			item->jbt = jbt;
 
-			m_ThreadInfo->send(
-				XmlNodeIq(AddIQ(&CJabberProto::IqResultStreamActivate, JABBER_IQ_TYPE_SET, jbt->streamhostJID, 0, iqId))
-				<< XQUERY(JABBER_FEAT_BYTESTREAMS) << XATTR("sid", jbt->sid) << XCHILD("activate", jbt->dstJID));
-
+			m_ThreadInfo->send(XmlNodeIq(pIq) << XQUERY(JABBER_FEAT_BYTESTREAMS) << XATTR("sid", jbt->sid) << XCHILD("activate", jbt->dstJID));
 			WaitForSingleObject(jbt->hProxyEvent, INFINITE);
 
 			CloseHandle(jbt->hProxyEvent);
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 50a94e6204..b4c4ad2923 100755
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -264,7 +264,8 @@ JabberCapsBits CJabberProto::GetResourceCapabilities(const char *jid, pResourceS
 
 		if (jcbMainCaps == JABBER_RESOURCE_CAPS_UNINIT) {
 			// send disco#info query
-			CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, jid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);
+			CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, jid);
+			pInfo->SetParamsToParse(JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);
 			pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);
 			pCaps->SetCaps(JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());
 			r->m_dwDiscoInfoRequestTime = pInfo->GetRequestTime();
@@ -318,7 +319,8 @@ JabberCapsBits CJabberProto::GetResourceCapabilities(const char *jid, pResourceS
 
 void CJabberProto::RequestOldCapsInfo(pResourceStatus &r, const char *fullJid)
 {
-	CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);
+	CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid);
+	pInfo->SetParamsToParse(JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);
 	pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);
 	r->m_dwDiscoInfoRequestTime = pInfo->GetRequestTime();
 
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index 8abcf1bfcc..c299941589 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -175,12 +175,12 @@ void CJabberProto::OnIqResultServiceDiscoveryItems(const TiXmlElement *iqNode, C
 
 void CJabberProto::OnIqResultServiceDiscoveryRootInfo(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
 {
-	if (!pInfo->m_pUserData) return;
+	if (!pInfo->GetUserData()) return;
 
 	mir_cslockfull lck(m_SDManager.cs());
 	if (pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT) {
 		for (auto *feature : TiXmlFilter(XmlFirstChild(iqNode, "query"), "feature")) {
-			if (!mir_strcmp(XmlGetAttr(feature, "var"), (char*)pInfo->m_pUserData)) {
+			if (!mir_strcmp(XmlGetAttr(feature, "var"), (char*)pInfo->GetUserData())) {
 				CJabberSDNode *pNode = m_SDManager.AddPrimaryNode(pInfo->GetReceiver(), XmlGetAttr(iqNode, "node"));
 				SendBothRequests(pNode);
 				break;
@@ -194,7 +194,7 @@ void CJabberProto::OnIqResultServiceDiscoveryRootInfo(const TiXmlElement *iqNode
 
 void CJabberProto::OnIqResultServiceDiscoveryRootItems(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
 {
-	if (!pInfo->m_pUserData)
+	if (!pInfo->GetUserData())
 		return;
 
 	TiXmlDocument packet;
@@ -203,8 +203,7 @@ void CJabberProto::OnIqResultServiceDiscoveryRootItems(const TiXmlElement *iqNod
 		for (auto *item : TiXmlFilter(XmlFirstChild(iqNode, "query"), "item")) {
 			const char *szJid = XmlGetAttr(item, "jid");
 			const char *szNode = XmlGetAttr(item, "node");
-			CJabberIqInfo *pNewInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootInfo, JABBER_IQ_TYPE_GET, szJid);
-			pNewInfo->m_pUserData = pInfo->m_pUserData;
+			CJabberIqInfo *pNewInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootInfo, JABBER_IQ_TYPE_GET, szJid, pInfo->GetUserData());
 			pNewInfo->SetTimeout(30000);
 
 			XmlNodeIq iq(pNewInfo);
@@ -335,16 +334,14 @@ void CJabberProto::PerformBrowse(HWND hwndDlg)
 		}
 	}
 	else if (!mir_wstrcmp(szJid, _T(SD_FAKEJID_CONFERENCES))) {
-		CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootItems, JABBER_IQ_TYPE_GET, m_ThreadInfo->conn.server);
-		pInfo->m_pUserData = (void*)JABBER_FEAT_MUC;
+		CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootItems, JABBER_IQ_TYPE_GET, m_ThreadInfo->conn.server, (void*)JABBER_FEAT_MUC);
 		pInfo->SetTimeout(30000);
 		XmlNodeIq iq(pInfo);
 		iq << XQUERY(JABBER_FEAT_DISCO_ITEMS);
 		m_ThreadInfo->send(iq);
 	}
 	else if (!mir_wstrcmp(szJid, _T(SD_FAKEJID_AGENTS))) {
-		CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootItems, JABBER_IQ_TYPE_GET, m_ThreadInfo->conn.server);
-		pInfo->m_pUserData = (void*)L"jabber:iq:gateway";
+		CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnIqResultServiceDiscoveryRootItems, JABBER_IQ_TYPE_GET, m_ThreadInfo->conn.server, L"jabber:iq:gateway");
 		pInfo->SetTimeout(30000);
 		XmlNodeIq iq(pInfo);
 		iq << XQUERY(JABBER_FEAT_DISCO_ITEMS);
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index c63f50aa96..e832925e2a 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -97,7 +97,9 @@ void CJabberProto::FtInitiate(char* jid, filetransfer *ft)
 	if (wchar_t *p = wcsrchr(filename, '\\'))
 		filename = p + 1;
 
-	XmlNodeIq iq(AddIQ(&CJabberProto::OnFtSiResult, JABBER_IQ_TYPE_SET, MakeJid(jid, rs), JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_TO, -1, ft));
+	auto *pIq = AddIQ(&CJabberProto::OnFtSiResult, JABBER_IQ_TYPE_SET, MakeJid(jid, rs), ft);
+	pIq->SetParamsToParse(JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_TO);
+	XmlNodeIq iq(pIq);
 	TiXmlElement *si = iq << XCHILDNS("si", JABBER_FEAT_SI) << XATTR("id", sid)
 		<< XATTR("mime-type", "binary/octet-stream") << XATTR("profile", JABBER_FEAT_SI_FT);
 	si << XCHILDNS("file", JABBER_FEAT_SI_FT) << XATTR("name", T2Utf(filename))
@@ -124,7 +126,7 @@ void CJabberProto::OnFtSiResult(const TiXmlElement *iqNode, CJabberIqInfo *pInfo
 	if (!ft)
 		return;
 
-	if ((pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT) && pInfo->m_szFrom && pInfo->m_szTo) {
+	if ((pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT) && pInfo->GetFrom() && pInfo->GetTo()) {
 		if (auto *siNode = XmlFirstChild(iqNode, "si")) {
 			// fix for very smart clients, like gajim
 			BOOL bDirect = m_bBsDirect;
@@ -138,8 +140,8 @@ void CJabberProto::OnFtSiResult(const TiXmlElement *iqNode, CJabberIqInfo *pInfo
 								// Start Bytestream session
 								JABBER_BYTE_TRANSFER *jbt = new JABBER_BYTE_TRANSFER;
 								memset(jbt, 0, sizeof(JABBER_BYTE_TRANSFER));
-								jbt->srcJID = mir_strdup(pInfo->m_szTo);
-								jbt->dstJID = mir_strdup(pInfo->m_szFrom);
+								jbt->srcJID = mir_strdup(pInfo->GetTo());
+								jbt->dstJID = mir_strdup(pInfo->GetFrom());
 								jbt->sid = mir_strdup(ft->sid);
 								jbt->pfnSend = &CJabberProto::FtSend;
 								jbt->pfnFinal = &CJabberProto::FtSendFinal;
@@ -151,8 +153,8 @@ void CJabberProto::OnFtSiResult(const TiXmlElement *iqNode, CJabberIqInfo *pInfo
 							else if (!mir_strcmp(valueNode->GetText(), JABBER_FEAT_IBB)) {
 								JABBER_IBB_TRANSFER *jibb = (JABBER_IBB_TRANSFER *)mir_alloc(sizeof(JABBER_IBB_TRANSFER));
 								memset(jibb, 0, sizeof(JABBER_IBB_TRANSFER));
-								jibb->srcJID = mir_strdup(pInfo->m_szTo);
-								jibb->dstJID = mir_strdup(pInfo->m_szFrom);
+								jibb->srcJID = mir_strdup(pInfo->GetTo());
+								jibb->dstJID = mir_strdup(pInfo->GetFrom());
 								jibb->sid = mir_strdup(ft->sid);
 								jibb->pfnSend = &CJabberProto::FtIbbSend;
 								jibb->pfnFinal = &CJabberProto::FtSendFinal;
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index cf2205a912..7e18ceae1b 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -613,7 +613,7 @@ public:
 						if (*server) {
 							sttRoomListAppend(GetDlgItem(m_hwnd, IDC_ROOM), RoomInfo::ROOM_WAIT, TranslateT("Loading..."), TranslateT("Please wait for room list to download."), L"");
 
-							CJabberIqInfo *pInfo = m_proto->AddIQ(&CJabberProto::OnIqResultDiscovery, JABBER_IQ_TYPE_GET, T2Utf(server), 0, -1, (void*)GetDlgItem(m_hwnd, IDC_ROOM));
+							CJabberIqInfo *pInfo = m_proto->AddIQ(&CJabberProto::OnIqResultDiscovery, JABBER_IQ_TYPE_GET, T2Utf(server), (void*)GetDlgItem(m_hwnd, IDC_ROOM));
 							pInfo->SetTimeout(30000);
 							XmlNodeIq iq(pInfo);
 							iq << XQUERY(JABBER_FEAT_DISCO_ITEMS);
diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp
index c0eadf883e..59edaf6a5f 100644
--- a/protocols/JabberG/src/jabber_ibb.cpp
+++ b/protocols/JabberG/src/jabber_ibb.cpp
@@ -98,7 +98,7 @@ void CJabberProto::IbbSendThread(JABBER_IBB_TRANSFER *jibb)
 	jibb->state = JIBB_SENDING;
 
 	m_ThreadInfo->send(
-		XmlNodeIq(AddIQ(&CJabberProto::OnIbbInitiateResult, JABBER_IQ_TYPE_SET, jibb->dstJID, 0, -1, jibb))
+		XmlNodeIq(AddIQ(&CJabberProto::OnIbbInitiateResult, JABBER_IQ_TYPE_SET, jibb->dstJID, jibb))
 		<< XCHILDNS("open", JABBER_FEAT_IBB) << XATTR("sid", jibb->sid) << XATTRI("block-size", JABBER_IBB_BLOCK_SIZE)
 		<< XATTR("stanza", "message"));
 
@@ -115,7 +115,7 @@ void CJabberProto::IbbSendThread(JABBER_IBB_TRANSFER *jibb)
 			jibb->hEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
 
 			m_ThreadInfo->send(
-				XmlNodeIq(AddIQ(&CJabberProto::OnIbbCloseResult, JABBER_IQ_TYPE_SET, jibb->dstJID, 0, -1, jibb))
+				XmlNodeIq(AddIQ(&CJabberProto::OnIbbCloseResult, JABBER_IQ_TYPE_SET, jibb->dstJID, jibb))
 				<< XCHILDNS("close", JABBER_FEAT_IBB) << XATTR("sid", jibb->sid));
 
 			WaitForSingleObject(jibb->hEvent, INFINITE);
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 603a891d23..e3b9b58054 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -503,8 +503,8 @@ static IconItem sharedIconList4[] =
 
 void g_IconsInit()
 {
-	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber"), sharedIconList1, GLOBAL_SETTING_PREFIX);
-	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs"), sharedIconList2, GLOBAL_SETTING_PREFIX);
-	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, GLOBAL_SETTING_PREFIX);
-	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, GLOBAL_SETTING_PREFIX);
+	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber"), sharedIconList1, GLOBAL_SETTING_MODULE);
+	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs"), sharedIconList2, GLOBAL_SETTING_MODULE);
+	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, GLOBAL_SETTING_MODULE);
+	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, GLOBAL_SETTING_MODULE);
 }
diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index ca1f0b1e17..fc0f50d997 100644
--- a/protocols/JabberG/src/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
@@ -201,15 +201,12 @@ void CJabberIqManager::ExpireAll()
 		ExpireInfo(pInfo);
 }
 
-CJabberIqInfo* CJabberIqManager::AddHandler(JABBER_IQ_HANDLER pHandler, int nIqType, const char *szReceiver, DWORD dwParamsToParse, int nIqId, void *pUserData, int iPriority)
+CJabberIqInfo* CJabberIqManager::AddHandler(JABBER_IQ_HANDLER pHandler, int nIqType, const char *szReceiver, void *pUserData, int iPriority)
 {
 	CJabberIqInfo *pInfo = new CJabberIqInfo();
 	pInfo->m_pHandler = pHandler;
-	if (nIqId == -1)
-		nIqId = ppro->SerialNext();
-	pInfo->m_nIqId = nIqId;
+	pInfo->m_nIqId = ppro->SerialNext();
 	pInfo->m_nIqType = nIqType;
-	pInfo->m_dwParamsToParse = dwParamsToParse;
 	pInfo->m_pUserData = pUserData;
 	pInfo->m_dwRequestTime = GetTickCount();
 	pInfo->m_dwTimeout = JABBER_DEFAULT_IQ_REQUEST_TIMEOUT;
diff --git a/protocols/JabberG/src/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h
index f7210f45eb..f457a55496 100644
--- a/protocols/JabberG/src/jabber_iq.h
+++ b/protocols/JabberG/src/jabber_iq.h
@@ -61,8 +61,6 @@ protected:
 	DWORD         m_dwTimeout;
 	char*         m_szReceiver;
 	int           m_iPriority;
-
-public:
 	void*         m_pUserData;
 	int           m_nIqType;
 	const char*   m_szFrom;
@@ -166,7 +164,7 @@ public:
 	void Shutdown();
 
 	// fucking params, maybe just return CJabberIqRequestInfo pointer ?
-	CJabberIqInfo* AddHandler(JABBER_IQ_HANDLER pHandler, int nIqType, const char *szReceiver, DWORD dwParamsToParse, int nIqId, void *pUserData, int iPriority);
+	CJabberIqInfo* AddHandler(JABBER_IQ_HANDLER pHandler, int nIqType, const char *szReceiver, void *pUserData, int iPriority);
 	CJabberIqPermanentInfo* AddPermanentHandler(JABBER_PERMANENT_IQ_HANDLER pHandler, int nIqTypes, DWORD dwParamsToParse, const char *szXmlns, BOOL bAllowPartialNs, const char *szTag, void *pUserData = nullptr, IQ_USER_DATA_FREE_FUNC pUserDataFree = nullptr, int iPriority = JH_PRIORITY_DEFAULT);
 
 	// returns TRUE when pInfo found, or FALSE otherwise
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 5b82a7d45b..e5a231f64c 100755
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -105,7 +105,7 @@ void CJabberProto::OnIqResultNestedRosterGroups(const TiXmlElement *iqNode, CJab
 	// roster request
 	char *szUserData = mir_strdup(szGroupDelimiter ? szGroupDelimiter : "\\");
 	m_ThreadInfo->send(
-		XmlNodeIq(AddIQ(&CJabberProto::OnIqResultGetRoster, JABBER_IQ_TYPE_GET, nullptr, 0, -1, (void*)szUserData))
+		XmlNodeIq(AddIQ(&CJabberProto::OnIqResultGetRoster, JABBER_IQ_TYPE_GET, nullptr, szUserData))
 			<< XCHILDNS("query", JABBER_FEAT_IQ_ROSTER));
 }
 
@@ -1505,12 +1505,12 @@ void CJabberProto::OnIqResultSetBookmarks(const TiXmlElement *iqNode, CJabberIqI
 // last activity (XEP-0012) support
 void CJabberProto::OnIqResultLastActivity(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
 {
-	pResourceStatus r(ResourceInfoFromJID(pInfo->m_szFrom));
+	pResourceStatus r(ResourceInfoFromJID(pInfo->GetFrom()));
 	if (r == nullptr)
 		return;
 
 	time_t lastActivity = -1;
-	if (pInfo->m_nIqType == JABBER_IQ_TYPE_RESULT) {
+	if (pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT) {
 		if (auto *xmlLast = XmlGetChildByTag(iqNode, "query", "xmlns", JABBER_FEAT_LAST_ACTIVITY)) {
 			int nSeconds = xmlLast->IntAttribute("seconds");
 			lastActivity = (nSeconds == 0) ? 0 : time(0) - nSeconds;
@@ -1528,10 +1528,10 @@ void CJabberProto::OnIqResultLastActivity(const TiXmlElement *iqNode, CJabberIqI
 // entity time (XEP-0202) support
 void CJabberProto::OnIqResultEntityTime(const TiXmlElement *pIqNode, CJabberIqInfo *pInfo)
 {
-	if (!pInfo->m_hContact)
+	if (!pInfo->GetHContact())
 		return;
 
-	if (pInfo->m_nIqType == JABBER_IQ_TYPE_RESULT) {
+	if (pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT) {
 		auto *xmlTime = XmlGetChildByTag(pIqNode, "time", "xmlns", JABBER_FEAT_ENTITY_TIME);
 		if (xmlTime) {
 			const char *szTzo = XmlGetChildText(xmlTime, "tzo");
@@ -1544,22 +1544,22 @@ void CJabberProto::OnIqResultEntityTime(const TiXmlElement *pIqNode, CJabberIqIn
 				if (GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT)
 					nTz -= tzinfo.DaylightBias / 30;
 
-				setByte(pInfo->m_hContact, "Timezone", (signed char)nTz);
+				setByte(pInfo->GetHContact(), "Timezone", (signed char)nTz);
 
 				const char *szTz = XmlGetChildText(xmlTime, "tz");
 				if (szTz)
-					setUString(pInfo->m_hContact, "TzName", szTz);
+					setUString(pInfo->GetHContact(), "TzName", szTz);
 				else
-					delSetting(pInfo->m_hContact, "TzName");
+					delSetting(pInfo->GetHContact(), "TzName");
 				return;
 			}
 		}
 	}
-	else if (pInfo->m_nIqType == JABBER_IQ_TYPE_ERROR) {
-		if (getWord(pInfo->m_hContact, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)
+	else if (pInfo->GetIqType() == JABBER_IQ_TYPE_ERROR) {
+		if (getWord(pInfo->GetHContact(), "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)
 			return;
 	}
 
-	delSetting(pInfo->m_hContact, "Timezone");
-	delSetting(pInfo->m_hContact, "TzName");
+	delSetting(pInfo->GetHContact(), "Timezone");
+	delSetting(pInfo->GetHContact(), "TzName");
 }
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp
index dce6f4cc7e..cab97f697d 100755
--- a/protocols/JabberG/src/jabber_omemo.cpp
+++ b/protocols/JabberG/src/jabber_omemo.cpp
@@ -1934,7 +1934,7 @@ bool CJabberProto::OmemoCheckSession(MCONTACT hContact)
 	while (id) {
 		if (!checked) {
 			pending_check = true;
-			XmlNodeIq iq(AddIQ(&CJabberProto::OmemoOnIqResultGetBundle, JABBER_IQ_TYPE_GET, nullptr, 0UL, -1, &id));
+			XmlNodeIq iq(AddIQ(&CJabberProto::OmemoOnIqResultGetBundle, JABBER_IQ_TYPE_GET, nullptr, &id));
 
 			char szBareJid[JABBER_MAX_JID_LEN];
 			iq << XATTR("from", JabberStripJid(m_ThreadInfo->fullJID, szBareJid, _countof_portable(szBareJid)));
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 5aeb3690dd..14508b7c92 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -46,12 +46,11 @@ BOOL CJabberProto::OnIqRequestPrivacyLists(const TiXmlElement*, CJabberIqInfo *p
 
 void CJabberProto::OnIqResultPrivacyListModify(const TiXmlElement*, CJabberIqInfo *pInfo)
 {
-	if (!pInfo->m_pUserData)
+	CPrivacyListModifyUserParam *pParam = (CPrivacyListModifyUserParam *)pInfo->GetUserData();
+	if (pParam == nullptr)
 		return;
 
-	CPrivacyListModifyUserParam *pParam = (CPrivacyListModifyUserParam *)pInfo->m_pUserData;
-
-	if (pInfo->m_nIqType != JABBER_IQ_TYPE_RESULT)
+	if (pInfo->GetIqType() != JABBER_IQ_TYPE_RESULT)
 		pParam->m_bAllOk = FALSE;
 
 	InterlockedDecrement(&pParam->m_dwCount);
@@ -243,7 +242,7 @@ void CJabberProto::OnIqResultPrivacyListDefault(const TiXmlElement *iqNode, CJab
 
 void CJabberProto::OnIqResultPrivacyLists(const TiXmlElement *iqNode, CJabberIqInfo *pInfo)
 {
-	if (pInfo->m_nIqType != JABBER_IQ_TYPE_RESULT)
+	if (pInfo->GetIqType() != JABBER_IQ_TYPE_RESULT)
 		return;
 
 	auto *query = XmlFirstChild(iqNode, "query");
@@ -1621,7 +1620,7 @@ public:
 		}
 		EnableWindow(GetDlgItem(m_hwnd, IDC_ACTIVATE), FALSE);
 		SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_ACTIVATE), GWLP_USERDATA, (LONG_PTR)pList);
-		XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListActive, JABBER_IQ_TYPE_SET, nullptr, 0, -1, pList));
+		XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListActive, JABBER_IQ_TYPE_SET, nullptr, pList));
 		TiXmlElement *query = iq << XQUERY(JABBER_FEAT_PRIVACY_LISTS);
 		TiXmlElement *active = query << XCHILD("active");
 		if (pList)
@@ -1648,7 +1647,7 @@ public:
 		EnableWindow(GetDlgItem(m_hwnd, IDC_SET_DEFAULT), FALSE);
 		SetWindowLongPtr(GetDlgItem(m_hwnd, IDC_SET_DEFAULT), GWLP_USERDATA, (LONG_PTR)pList);
 
-		XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListDefault, JABBER_IQ_TYPE_SET, nullptr, 0, -1, pList));
+		XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListDefault, JABBER_IQ_TYPE_SET, nullptr, pList));
 		TiXmlElement *query = iq << XQUERY(JABBER_FEAT_PRIVACY_LISTS);
 		TiXmlElement *defaultTag = query << XCHILD("default");
 		if (pList)
@@ -1878,7 +1877,7 @@ public:
 
 					pUserData->m_dwCount++;
 
-					XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListModify, JABBER_IQ_TYPE_SET, nullptr, 0, -1, pUserData));
+					XmlNodeIq iq(m_proto->AddIQ(&CJabberProto::OnIqResultPrivacyListModify, JABBER_IQ_TYPE_SET, nullptr, pUserData));
 					TiXmlElement *query = iq << XQUERY(JABBER_FEAT_PRIVACY_LISTS);
 					TiXmlElement *listTag = query << XCHILD("list") << XATTR("name", pList->GetListName());
 
@@ -2006,7 +2005,7 @@ INT_PTR __cdecl CJabberProto::menuSetPrivacyList(WPARAM, LPARAM, LPARAM iList)
 			pList = pList->GetNext();
 	}
 
-	XmlNodeIq iq(AddIQ(&CJabberProto::OnIqResultPrivacyListActive, JABBER_IQ_TYPE_SET, nullptr, 0, -1, pList));
+	XmlNodeIq iq(AddIQ(&CJabberProto::OnIqResultPrivacyListActive, JABBER_IQ_TYPE_SET, nullptr, pList));
 	TiXmlElement *query = iq << XQUERY(JABBER_FEAT_PRIVACY_LISTS);
 	TiXmlElement *active = query << XCHILD("active");
 	if (pList)
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 7b3a62b12a..ec65a52654 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -613,12 +613,14 @@ int CJabberProto::GetInfo(MCONTACT hContact, int /*infoType*/)
 	JabberStripJid(jid, szBareJid, _countof(szBareJid));
 
 	if (m_ThreadInfo) {
-		m_ThreadInfo->send(
-			XmlNodeIq(AddIQ(&CJabberProto::OnIqResultEntityTime, JABBER_IQ_TYPE_GET, jid, JABBER_IQ_PARSE_HCONTACT))
-			<< XCHILDNS("time", JABBER_FEAT_ENTITY_TIME));
+		auto *pInfo = AddIQ(&CJabberProto::OnIqResultEntityTime, JABBER_IQ_TYPE_GET, jid);
+		pInfo->SetParamsToParse(JABBER_IQ_PARSE_HCONTACT);
+		m_ThreadInfo->send(XmlNodeIq(pInfo) << XCHILDNS("time", JABBER_FEAT_ENTITY_TIME));
 
 		// XEP-0012, last logoff time
-		m_ThreadInfo->send(XmlNodeIq(AddIQ(&CJabberProto::OnIqResultLastActivity, JABBER_IQ_TYPE_GET, jid, JABBER_IQ_PARSE_FROM)) << XQUERY(JABBER_FEAT_LAST_ACTIVITY));
+		pInfo = AddIQ(&CJabberProto::OnIqResultLastActivity, JABBER_IQ_TYPE_GET, jid);
+		pInfo->SetParamsToParse(JABBER_IQ_PARSE_FROM);
+		m_ThreadInfo->send(XmlNodeIq(pInfo) << XQUERY(JABBER_FEAT_LAST_ACTIVITY));
 
 		JABBER_LIST_ITEM *item = nullptr;
 		if ((item = ListGetItemPtr(LIST_VCARD_TEMP, jid)) == nullptr)
@@ -643,14 +645,17 @@ int CJabberProto::GetInfo(MCONTACT hContact, int /*infoType*/)
 					pResourceStatus r(it);
 					CMStringA tmp(MakeJid(szBareJid, r->m_szResourceName));
 
-					if (r->m_jcbCachedCaps & JABBER_CAPS_DISCO_INFO)
-						m_ThreadInfo->send(
-							XmlNodeIq(AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, tmp, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE | JABBER_IQ_PARSE_HCONTACT)) 
-							<< XQUERY(JABBER_FEAT_DISCO_INFO));
+					if (r->m_jcbCachedCaps & JABBER_CAPS_DISCO_INFO) {
+						pInfo = AddIQ(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, tmp);
+						pInfo->SetParamsToParse(JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE | JABBER_IQ_PARSE_HCONTACT);
+						m_ThreadInfo->send(XmlNodeIq(pInfo) << XQUERY(JABBER_FEAT_DISCO_INFO));
+					}
 
-					if (mir_strcmp(tmp, jid)) // skip current resource, we've already sent this iq to it
-						m_ThreadInfo->send(
-							XmlNodeIq(AddIQ(&CJabberProto::OnIqResultLastActivity, JABBER_IQ_TYPE_GET, tmp, JABBER_IQ_PARSE_FROM)) << XQUERY(JABBER_FEAT_LAST_ACTIVITY));
+					if (mir_strcmp(tmp, jid)) { // skip current resource, we've already sent this iq to it
+						pInfo = AddIQ(&CJabberProto::OnIqResultLastActivity, JABBER_IQ_TYPE_GET, tmp);
+						pInfo->SetParamsToParse(JABBER_IQ_PARSE_FROM);
+						m_ThreadInfo->send(XmlNodeIq(pInfo) << XQUERY(JABBER_FEAT_LAST_ACTIVITY));
+					}
 				}
 			}
 		}
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 97bcef405d..d91582c5eb 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -491,9 +491,9 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 
 	//---- jabber_iq.c -------------------------------------------------------------------
 
-	__forceinline CJabberIqInfo* AddIQ(JABBER_IQ_HANDLER pHandler, int nIqType = JABBER_IQ_TYPE_GET, const char *szReceiver = nullptr, DWORD dwParamsToParse = 0, int nIqId = -1, void *pUserData = nullptr, int iPriority = JH_PRIORITY_DEFAULT)
+	__forceinline CJabberIqInfo* AddIQ(JABBER_IQ_HANDLER pHandler, int nIqType = JABBER_IQ_TYPE_GET, const char *szReceiver = nullptr, void *pUserData = nullptr, int iPriority = JH_PRIORITY_DEFAULT)
 	{
-		return m_iqManager.AddHandler(pHandler, nIqType, szReceiver, dwParamsToParse, nIqId, pUserData, iPriority);
+		return m_iqManager.AddHandler(pHandler, nIqType, szReceiver, pUserData, iPriority);
 	}
 
 	void   __cdecl ExpirerThread(void*);
@@ -835,7 +835,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 
 	//---- jabber_xml.c ------------------------------------------------------------------
 
-	int    OnXmlParse(char* buffer);
 	void   OnConsoleProcessXml(const TiXmlElement *node, DWORD flags);
 
 	//---- jabber_xmlns.c ----------------------------------------------------------------
@@ -903,7 +902,6 @@ public:
 	HJHANDLER STDMETHODCALLTYPE AddPresenceHandler(JABBER_HANDLER_FUNC Func, void *pUserData, int iPriority) override;
 	HJHANDLER STDMETHODCALLTYPE AddMessageHandler(JABBER_HANDLER_FUNC Func, int iMsgTypes, const char *szXmlns, const char *szTag, void *pUserData, int iPriority) override;
 	HJHANDLER STDMETHODCALLTYPE AddIqHandler(JABBER_HANDLER_FUNC Func, int iIqTypes, const char *szXmlns, const char *szTag, void *pUserData, int iPriority) override;
-	HJHANDLER STDMETHODCALLTYPE AddTemporaryIqHandler(JABBER_HANDLER_FUNC Func, int iIqTypes, int iIqId, void *pUserData, DWORD dwTimeout, int iPriority) override;
 	HJHANDLER STDMETHODCALLTYPE AddSendHandler(JABBER_HANDLER_FUNC Func, void *pUserData, int iPriority) override;
 	int       STDMETHODCALLTYPE RemoveHandler(HJHANDLER hHandler) override;
 
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 486fd6fbcc..880e6eb0f9 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -424,13 +424,13 @@ LBL_FatalError:
 				else if (nSelRes == 0) {
 					if (m_bSendKeepAlive) {
 						if (info.jabberServerCaps & JABBER_CAPS_PING) {
-							CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnPingReply, JABBER_IQ_TYPE_GET, nullptr, 0, -1, this);
+							CJabberIqInfo *pInfo = AddIQ(&CJabberProto::OnPingReply, JABBER_IQ_TYPE_GET, nullptr, this);
 							pInfo->SetTimeout(m_iConnectionKeepAliveTimeout);
 							info.send(XmlNodeIq(pInfo) << XATTR("from", info.fullJID) << XCHILDNS("ping", JABBER_FEAT_PING));
 						}
 					}
-					else
-						info.send(" \t "); //TODO: why do we need this ?
+					else info.send(" \t ");
+					
 					if (m_bEnableStreamMgmt)
 						m_StrmMgmt.RequestAck();
 				}
@@ -1298,9 +1298,8 @@ void CJabberProto::OnProcessMessage(const TiXmlElement *node, ThreadData *info)
 				auto *idNode = XmlFirstChild(xNode, "id");
 				if (XmlFirstChild(xNode, "delivered") != nullptr || XmlFirstChild(xNode, "offline") != nullptr) {
 					int id = -1;
-					if (idNode != nullptr && idNode->GetText() != nullptr)
-						if (!strncmp(idNode->GetText(), JABBER_IQID, mir_strlen(JABBER_IQID)))
-							id = atoi((idNode->GetText()) + mir_strlen(JABBER_IQID));
+					if (idNode != nullptr)
+						id = JabberGetPacketID(idNode->GetText());
 
 					if (id != -1)
 						ProtoBroadcastAck(hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE)id, 0);
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 1d569e09a6..b1169e26ab 100755
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -514,12 +514,11 @@ void CJabberProto::SendPresence(int status, bool bSendToAll)
 ///////////////////////////////////////////////////////////////////////////////
 // JabberGetPacketID - converts the xml id attribute into an integer
 
-int JabberGetPacketID(const TiXmlElement *n)
+int JabberGetPacketID(const char *str)
 {
-	const char *str = XmlGetAttr(n, "id");
-	if (str)
-		if (!strncmp(str, JABBER_IQID, _countof(JABBER_IQID) - 1))
-			return atoi(str + _countof(JABBER_IQID) - 1);
+	if (mir_strlen(str) >= 20)
+		if (!memcmp(str, "mir", 3) && !memcmp(g_plugin.szRandom, str+3, 16) && str[19] == '_')
+			return atoi(str + 20);
 
 	return -1;
 }
@@ -527,7 +526,7 @@ int JabberGetPacketID(const TiXmlElement *n)
 char* JabberId2string(int id)
 {
 	char text[100];
-	mir_snprintf(text, JABBER_IQID "%d", id);
+	mir_snprintf(text, "mir%s_%d", g_plugin.szRandom, id);
 	return mir_strdup(text);
 }
 
diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp
index 6fa1c31610..b981aab7fb 100644
--- a/protocols/JabberG/src/jabber_xml.cpp
+++ b/protocols/JabberG/src/jabber_xml.cpp
@@ -129,8 +129,5 @@ TiXmlElement* __fastcall operator<<(TiXmlElement *node, const XQUERY &child)
 
 void XmlAddAttrID(TiXmlElement *hXml, int id)
 {
-	char text[100];
-	mir_snprintf(text, JABBER_IQID "%d", id);
-	hXml->SetAttribute("id", text);
+	hXml->SetAttribute("id", ptrA(JabberId2string(id)).get());
 }
-
diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h
index 230be83e14..d0babbcfb4 100644
--- a/protocols/JabberG/src/jabber_xml.h
+++ b/protocols/JabberG/src/jabber_xml.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _JABBER_XML_H_
 
 void XmlAddAttrID(TiXmlElement*, int id);
+
 class XmlNode : public TiXmlDocument, private MNonCopyable
 {
 protected:
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index ecb24700bc..d7710f32a6 100755
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -116,6 +116,8 @@ struct CJabberProto;
 
 struct CMPlugin : public ACCPROTOPLUGIN<CJabberProto>
 {
+	char szRandom[17];
+
 	CMPlugin();
 
 	int Load() override;
@@ -147,11 +149,9 @@ protected:
  * Global constants
  *******************************************************************/
 
-#define GLOBAL_SETTING_PREFIX	"JABBER"
 #define GLOBAL_SETTING_MODULE	"JABBER"
 
 #define JABBER_DEFAULT_PORT 5222
-#define JABBER_IQID "mir_"
 #define JABBER_MAX_JID_LEN  1024
 
 #define JABBER_GC_MSG_QUIT				LPGEN("I'm happy Miranda NG user. Get it at https://miranda-ng.org/.")
@@ -747,9 +747,13 @@ void   JabberHttpUrlDecode(wchar_t *str);
 int    JabberCombineStatus(int status1, int status2);
 time_t JabberIsoToUnixTime(const char *stamp);
 char*  JabberStripJid(const char *jid, char *dest, size_t destLen);
-int    JabberGetPacketID(const TiXmlElement *n);
+int    JabberGetPacketID(const char*);
 char*  JabberId2string(int id);
 
+__inline int JabberGetPacketID(const TiXmlElement *n)
+{	return JabberGetPacketID(XmlGetAttr(n, "id"));
+}
+
 char*  time2str(time_t _time, char *buf, size_t bufLen);
 time_t str2time(const char*);
 
-- 
cgit v1.2.3