jabber code clean up

req code review



git-svn-id: http://svn.miranda-ng.org/main/trunk@11074 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 1761 insertions, 1761 deletions

diff --git a/protocols/IcqOscarJ/src/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index 050aea947a..13d3958ec8 100644
--- a/protocols/IcqOscarJ/src/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
@@ -1,1755 +1,1755 @@
-// ---------------------------------------------------------------------------80

-//                ICQ plugin for Miranda Instant Messenger

-//                ________________________________________

-//

-// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede

-// Copyright © 2001-2002 Jon Keating, Richard Hughes

-// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater

-// Copyright © 2004-2010 Joe Kucera

-// Copyright © 2012-2014 Miranda NG Team

-//

-// This program is free software; you can redistribute it and/or

-// modify it under the terms of the GNU General Public License

-// as published by the Free Software Foundation; either version 2

-// of the License, or (at your option) any later version.

-//

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License for more details.

-//

-// You should have received a copy of the GNU General Public License

-// along with this program; if not, write to the Free Software

-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-// -----------------------------------------------------------------------------

-

-#include "icqoscar.h"

-

-static int unpackServerListItem(BYTE **pbuf, WORD *pwLen, char *pszRecordName, WORD *pwGroupId, WORD *pwItemId, WORD *pwItemType, WORD *pwTlvLength);

-

-

-void CIcqProto::handleServCListFam(BYTE *pBuffer, WORD wBufferLength, snac_header* pSnacHeader, serverthread_info *info)

-{

-	switch (pSnacHeader->wSubtype) {

-	case ICQ_LISTS_ACK: // UPDATE_ACK

-		if (wBufferLength >= 2) {

-			WORD wError;

-			cookie_servlist_action* sc;

-

-			unpackWord(&pBuffer, &wError);

-

-			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // look for action cookie

-				debugLogA("Received expected server list ack, action: %d, result: %d", sc->dwAction, wError);

-				FreeCookie(pSnacHeader->dwRef); // release cookie

-

-				if (sc->dwAction == SSA_ACTION_GROUP) { // group cookie, handle sub-items

-					int i;

-

-					debugLogA("Server-List: Grouped action contains %d actions.", sc->dwGroupCount);

-

-					pBuffer -= 2; // revoke unpack

-					if (wBufferLength != 2 * sc->dwGroupCount)

-						debugLogA("Error: Server list ack does not contain expected amount of result codes (%u != %u)", wBufferLength / 2, sc->dwGroupCount);

-

-					for (i = 0; i < sc->dwGroupCount; i++) {

-						if (wBufferLength >= 2) { // get proper result code

-							unpackWord(&pBuffer, &wError);

-							wBufferLength -= 2;

-						}

-						else // missing result code, give some special

-							wError = -1;

-

-						debugLogA("Action: %d, ack result: %d", sc->pGroupItems[i]->dwAction, wError);

-

-						// call normal ack handler

-						handleServerCListAck(sc->pGroupItems[i], wError);

-					}

-					// Release cookie

-					SAFE_FREE((void**)&sc->pGroupItems);

-					SAFE_FREE((void**)&sc);

-				}

-				else // single ack

-					handleServerCListAck(sc, wError);

-			}

-			else debugLogA("Received unexpected server list ack %u", wError);

-		}

-		break;

-

-	case ICQ_LISTS_SRV_REPLYLISTS:

-		/* received server-list rights */

-		handleServerCListRightsReply(pBuffer, wBufferLength);

-		debugLogA("Server sent SNAC(x13,x03) - SRV_REPLYLISTS");

-		break;

-

-	case ICQ_LISTS_LIST: // SRV_REPLYROSTER

-		{

-			cookie_servlist_action* sc;

-			BOOL blWork = bIsSyncingCL;

-			bIsSyncingCL = TRUE; // this is not used if cookie takes place

-

-			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // we do it by reliable cookie

-				if (!sc->lParam) { // is this first packet ?

-					ResetSettingsOnListReload();

-					sc->lParam = 1;

-				}

-				handleServerCListReply(pBuffer, wBufferLength, pSnacHeader->wFlags, info);

-				if (!(pSnacHeader->wFlags & 0x0001)) // was that last packet ?

-					ReleaseCookie(pSnacHeader->dwRef); // yes, release cookie

-			}

-			else { // use old fake

-				if (!blWork) // this can fail on some crazy situations

-					ResetSettingsOnListReload();

-

-				handleServerCListReply(pBuffer, wBufferLength, pSnacHeader->wFlags, info);

-			}

-		}

-		break;

-

-	case ICQ_LISTS_UPTODATE: // SRV_REPLYROSTEROK

-		bIsSyncingCL = FALSE;

-		{

-			cookie_servlist_action* sc;

-			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // we requested servlist check

-				debugLogA("Server stated roster is ok.");

-				ReleaseCookie(pSnacHeader->dwRef);

-				LoadServerIDs();

-			}

-			else debugLogA("Server sent unexpected SNAC(x13,x0F) - SRV_REPLYROSTEROK");

-

-			// This will activate the server side list

-			sendRosterAck(); // this must be here, cause of failures during cookie alloc

-			handleServUINSettings(wListenPort, info);

-		}

-		break;

-

-	case ICQ_LISTS_CLI_MODIFYSTART:

-		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_CLI_MODIFYSTART, "Server is modifying contact list");

-		break;

-

-	case ICQ_LISTS_CLI_MODIFYEND:

-		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_CLI_MODIFYEND, "End of server modification");

-		break;

-

-	case ICQ_LISTS_ADDTOLIST:

-	case ICQ_LISTS_UPDATEGROUP:

-	case ICQ_LISTS_REMOVEFROMLIST:

-		{

-			int nItems = 0;

-

-			while (wBufferLength >= 10) {

-				WORD wGroupId, wItemId, wItemType, wTlvLen;

-				uid_str szRecordName;

-

-				if (unpackServerListItem(&pBuffer, &wBufferLength, szRecordName, &wGroupId, &wItemId, &wItemType, &wTlvLen)) {

-					BYTE *buf = pBuffer;

-					oscar_tlv_chain *pChain = NULL;

-

-					nItems++;

-

-					// parse possible item's data

-					if (wBufferLength >= wTlvLen && wTlvLen > 0) {

-						pChain = readIntoTLVChain(&buf, wTlvLen, 0);

-						pBuffer += wTlvLen;

-						wBufferLength -= wTlvLen;

-					}

-					else if (wTlvLen > 0)

-						wBufferLength = 0;

-

-					// process item change

-					if (pSnacHeader->wSubtype == ICQ_LISTS_ADDTOLIST)

-						handleServerCListItemAdd(szRecordName, wGroupId, wItemId, wItemType, pChain);

-					else if (pSnacHeader->wSubtype == ICQ_LISTS_UPDATEGROUP)

-						handleServerCListItemUpdate(szRecordName, wGroupId, wItemId, wItemType, pChain);

-					else if (pSnacHeader->wSubtype == ICQ_LISTS_REMOVEFROMLIST)

-						handleServerCListItemDelete(szRecordName, wGroupId, wItemId, wItemType, pChain);

-

-					// release memory

-					disposeChain(&pChain);

-				}

-			}

-			{

-				// log packet basics

-				char *szChange;

-

-				if (pSnacHeader->wSubtype == ICQ_LISTS_ADDTOLIST)

-					szChange = "Server added %u item(s) to list";

-				else if (pSnacHeader->wSubtype == ICQ_LISTS_UPDATEGROUP)

-					szChange = "Server updated %u item(s) on list";

-				else if (pSnacHeader->wSubtype == ICQ_LISTS_REMOVEFROMLIST)

-					szChange = "Server removed %u item(s) from list";

-

-				char szLogText[MAX_PATH];

-				mir_snprintf(szLogText, MAX_PATH, szChange, nItems);

-				debugLogA("Server sent SNAC(x13,x%02x) - %s", pSnacHeader->wSubtype, szLogText);

-			}

-		}

-		break;

-

-	case ICQ_LISTS_AUTHREQUEST:

-		handleRecvAuthRequest(pBuffer, wBufferLength);

-		break;

-

-	case ICQ_LISTS_SRV_AUTHRESPONSE:

-		handleRecvAuthResponse(pBuffer, wBufferLength);

-		break;

-

-	case ICQ_LISTS_AUTHGRANTED:

-		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_AUTHGRANTED, "User granted us future authorization");

-		break;

-

-	case ICQ_LISTS_YOUWEREADDED:

-		handleRecvAdded(pBuffer, wBufferLength);

-		break;

-

-	case ICQ_LISTS_ERROR:

-		if (wBufferLength >= 2) {

-			WORD wError;

-			cookie_servlist_action* sc;

-

-			unpackWord(&pBuffer, &wError);

-

-			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // look for action cookie

-				debugLogA("Received server list error, action: %d, result: %d", sc->dwAction, wError);

-				FreeCookie(pSnacHeader->dwRef); // release cookie

-

-				if (sc->dwAction == SSA_CHECK_ROSTER) { // the serv-list is unavailable turn it off

-					icq_LogMessage(LOG_ERROR, LPGEN("Server contact list is unavailable, Miranda will use local contact list."));

-					m_bSsiEnabled = 0;

-					handleServUINSettings(wListenPort, info);

-				}

-				/// FIXME: properly release pending operations & cookie memory

-				SAFE_FREE((void**)&sc);

-			}

-			else LogFamilyError(ICQ_LISTS_FAMILY, wError);

-		}

-		break;

-

-	default:

-		debugLogA("Warning: Ignoring SNAC(x%02x,x%02x) - Unknown SNAC (Flags: %u, Ref: %u)", ICQ_LISTS_FAMILY, pSnacHeader->wSubtype, pSnacHeader->wFlags, pSnacHeader->dwRef);

-		break;

-	}

-}

-

-

-static int unpackServerListItem(BYTE **pbuf, WORD *pwLen, char *pszRecordName, WORD *pwGroupId, WORD *pwItemId, WORD *pwItemType, WORD *pwTlvLength)

-{

-	WORD wRecordNameLen;

-

-	// The name of the entry. If this is a group header, then this

-	// is the name of the group. If it is a plain contact list entry,

-	// then it's the UIN of the contact.

-	unpackWord(pbuf, &wRecordNameLen);

-	if (*pwLen < 10 + wRecordNameLen || wRecordNameLen >= MAX_PATH)

-		return 0; // Failure

-

-	unpackString(pbuf, pszRecordName, wRecordNameLen);

-	if (pszRecordName)

-		pszRecordName[wRecordNameLen] = '\0';

-

-	// The group identifier this entry belongs to. If 0, this is meta information or

-	// a contact without a group

-	unpackWord(pbuf, pwGroupId);

-

-	// The ID of this entry. Group headers have ID 0. Otherwise, this

-	// is a random number generated when the user is added to the

-	// contact list, or when the user is ignored. See CLI_ADDBUDDY.

-	unpackWord(pbuf, pwItemId);

-

-	// This field indicates what type of entry this is

-	unpackWord(pbuf, pwItemType);

-

-	// The length in bytes of the following TLV chain

-	unpackWord(pbuf, pwTlvLength);

-

-	*pwLen -= wRecordNameLen + 10;

-

-	return 1; // Success

-}

-

-

-void CIcqProto::handleServerCListRightsReply(BYTE *buf, WORD wLen)

-{

-	/* received list rights, store the item limits for future use */

-	oscar_tlv_chain* chain;

-

-	memset(m_wServerListLimits, -1, sizeof(m_wServerListLimits));

-	m_wServerListGroupMaxContacts = 0;

-	m_wServerListRecordNameMaxLength = 0xFFFF;

-

-	if (chain = readIntoTLVChain(&buf, wLen, 0)) {

-		// determine max number of contacts in a group

-		m_wServerListGroupMaxContacts = chain->getWord(0x0C, 1);

-		// determine length limit for server-list item's name

-		m_wServerListRecordNameMaxLength = chain->getWord(0x06, 1);

-

-		if (oscar_tlv *pTLV = chain->getTLV(0x04, 1)) { // limits for item types

-			WORD *pLimits = (WORD*)pTLV->pData;

-			for (int i = 0; i < pTLV->wLen / 2; i++) {

-				m_wServerListLimits[i] = (pLimits[i] & 0xFF) << 8 | (pLimits[i] >> 8);

-

-				if (i + 1 >= SIZEOF(m_wServerListLimits))

-					break;

-			}

-

-			debugLogA("SSI: Max %d contacts (%d per group), %d groups, %d permit, %d deny, %d ignore items.", m_wServerListLimits[SSI_ITEM_BUDDY], m_wServerListGroupMaxContacts, m_wServerListLimits[SSI_ITEM_GROUP], m_wServerListLimits[SSI_ITEM_PERMIT], m_wServerListLimits[SSI_ITEM_DENY], m_wServerListLimits[SSI_ITEM_IGNORE]);

-		}

-

-		disposeChain(&chain);

-	}

-}

-

-DWORD CIcqProto::updateServerGroupData(WORD wGroupId, void *groupData, int groupSize, DWORD dwOperationFlags)

-{

-	cookie_servlist_action* ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-	if (!ack) {

-		debugLogA("Updating of group on server list failed (malloc error)");

-		return 0;

-	}

-	ack->dwAction = SSA_GROUP_UPDATE;

-	ack->szGroupName = getServListGroupName(wGroupId);

-	ack->wGroupId = wGroupId;

-	

-	DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, ack);

-	return icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, ack->wGroupId, ack->szGroupName, groupData, groupSize, dwOperationFlags);

-}

-

-void CIcqProto::handleServerCListAck(cookie_servlist_action* sc, WORD wError)

-{

-	switch (sc->dwAction) {

-	case SSA_VISIBILITY:

-		if (wError)

-			debugLogA("Server visibility update failed, error %d", wError);

-		break;

-

-	case SSA_CONTACT_UPDATE:

-		servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, wError ? PENDING_RESULT_FAILED : PENDING_RESULT_SUCCESS);

-		if (wError) {

-			debugLogA("Updating of server contact failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Updating of server contact failed."));

-		}

-		break;

-

-	case SSA_PRIVACY_ADD:

-		if (wError) {

-			debugLogA("Adding of privacy item to server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Adding of privacy item to server list failed."));

-		}

-		break;

-

-	case SSA_PRIVACY_REMOVE:

-		if (wError) {

-			debugLogA("Removing of privacy item from server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Removing of privacy item from server list failed."));

-		}

-		FreeServerID(sc->wContactId, SSIT_ITEM); // release server id

-		break;

-

-	case SSA_CONTACT_ADD:

-		if (wError) {

-			if (wError == 0xE) { // server refused to add contact w/o auth, add with

-				debugLogA("Contact could not be added without authorization, add with await auth flag.");

-

-				setByte(sc->hContact, "Auth", 1); // we need auth

-				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, sc->hContact, sc);

-				icq_sendServerContact(sc->hContact, dwCookie, ICQ_LISTS_ADDTOLIST, sc->wGroupId, sc->wContactId, SSOP_ITEM_ACTION | SSOF_CONTACT, 500, NULL);

-

-				sc = NULL; // we do not want it to be freed now

-				break;

-			}

-			FreeServerID(sc->wContactId, SSIT_ITEM);

-

-			debugLogA("Adding of contact to server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Adding of contact to server list failed."));

-

-			servlistPendingRemoveContact(sc->hContact, 0, sc->wGroupId, PENDING_RESULT_FAILED);

-

-			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here

-		}

-		else {

-			void* groupData;

-			int groupSize;

-

-			setWord(sc->hContact, DBSETTING_SERVLIST_ID, sc->wContactId);

-			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, sc->wGroupId);

-

-			servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, PENDING_RESULT_SUCCESS);

-

-			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) { // the group is not empty, just update it

-				updateServerGroupData(sc->wGroupId, groupData, groupSize, SSOF_END_OPERATION);

-				SAFE_FREE((void**)&groupData);

-			}

-			else { // this should never happen

-				debugLogA("Group update failed.");

-				servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here

-			}

-		}

-		break;

-

-	case SSA_GROUP_ADD:

-		if (wError) {

-			FreeServerID(sc->wGroupId, SSIT_GROUP);

-			debugLogA("Adding of group to server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Adding of group to server list failed."));

-

-			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_FAILED);

-		}

-		else { // group added, we need to update master group

-			void* groupData;

-			int groupSize;

-

-			setServListGroupName(sc->wGroupId, sc->szGroupName); // add group to namelist

-			{ // add group to known

-				char *szCListGroup = getServListGroupCListPath(sc->wGroupId);

-

-				// create link to the original CList group

-				setServListGroupLinkID(sc->szGroup, sc->wGroupId);

-

-				servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_SUCCESS);

-				SAFE_FREE((void**)&szCListGroup);

-			}

-

-			groupData = collectGroups(&groupSize);

-			groupData = SAFE_REALLOC(groupData, groupSize + 2);

-			*(((WORD*)groupData) + (groupSize >> 1)) = sc->wGroupId; // add this new group id

-			groupSize += 2;

-

-			cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-			if (ack) {

-				ack->dwAction = SSA_GROUP_UPDATE;

-

-				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, ack);

-				icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, 0, ack->szGroupName, groupData, groupSize, SSOF_END_OPERATION);

-			}

-			else // end server modifications here

-				servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100);

-

-			SAFE_FREE((void**)&groupData);

-		}

-		if (sc->szGroup != sc->szGroupName)

-			SAFE_FREE((void**)&sc->szGroup);

-

-		SAFE_FREE((void**)&sc->szGroupName);

-		break;

-

-	case SSA_CONTACT_REMOVE:

-		if (!wError) {

-			void* groupData;

-			int groupSize;

-

-			setWord(sc->hContact, DBSETTING_SERVLIST_ID, 0); // clear the values

-			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, 0);

-

-			FreeServerID(sc->wContactId, SSIT_ITEM);

-

-			servlistPendingRemoveContact(sc->hContact, 0, sc->wGroupId, PENDING_RESULT_SUCCESS);

-

-			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) { // the group is still not empty, just update it

-				updateServerGroupData(sc->wGroupId, groupData, groupSize, SSOF_END_OPERATION);

-			}

-			else // the group is empty, delete it

-			{

-				char *szGroup = getServListGroupCListPath(sc->wGroupId);

-

-				servlistRemoveGroup(szGroup, sc->wGroupId);

-				SAFE_FREE((void**)&szGroup);

-			}

-			SAFE_FREE((void**)&groupData); // free the memory

-		}

-		else {

-			debugLogA("Removing of contact from server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Removing of contact from server list failed."));

-

-			servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, PENDING_RESULT_FAILED);

-

-			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here

-		}

-		break;

-

-	case SSA_GROUP_UPDATE:

-		if (wError) {

-			debugLogA("Updating of group on server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Updating of group on server list failed."));

-		}

-		SAFE_FREE((void**)&sc->szGroupName);

-		break;

-

-	case SSA_GROUP_REMOVE:

-		SAFE_FREE((void**)&sc->szGroupName);

-		if (wError) {

-			debugLogA("Removing of group from server list failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Removing of group from server list failed."));

-

-			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_FAILED);

-

-			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here

-			SAFE_FREE((void**)&sc->szGroup);

-		}

-		else { // group removed, we need to update master group

-			void* groupData;

-			int groupSize;

-

-			setServListGroupName(sc->wGroupId, NULL); // clear group from namelist

-			FreeServerID(sc->wGroupId, SSIT_GROUP);

-			removeGroupPathLinks(sc->wGroupId);

-

-			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_SUCCESS);

-			SAFE_FREE((void**)&sc->szGroup);

-

-			groupData = collectGroups(&groupSize);

-			sc->wGroupId = 0;

-			sc->dwAction = SSA_GROUP_UPDATE;

-			sc->szGroupName = NULL;

-			DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, sc);

-

-			icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, 0, sc->szGroupName, groupData, groupSize, SSOF_END_OPERATION);

-			// end server modifications here

-

-			sc = NULL; // we do not want to be freed here

-

-			SAFE_FREE((void**)&groupData);

-		}

-		break;

-

-	case SSA_CONTACT_SET_GROUP:

-		// we moved contact to another group

-		if (sc->lParam == -1) // the first was an error

-			break;

-

-		if (wError) {

-			if (wError == 0x0E && sc->lParam == 1) { // second ack - adding failed with error 0x0E, try to add with AVAIT_AUTH flag

-				if (!getByte(sc->hContact, "Auth", 0)) { // we tried without AWAIT_AUTH, try again with it

-					debugLogA("Contact could not be added without authorization, add with await auth flag.");

-					setByte(sc->hContact, "Auth", 1); // we need auth

-				}

-				else { // we tried with AWAIT_AUTH, try again without

-					debugLogA("Contact count not be added awaiting authorization, try authorized.");

-					setByte(sc->hContact, "Auth", 0);

-				}

-				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, sc->hContact, sc);

-				icq_sendServerContact(sc->hContact, dwCookie, ICQ_LISTS_ADDTOLIST, sc->wNewGroupId, sc->wNewContactId, SSOP_ITEM_ACTION | SSOF_CONTACT, 400, NULL);

-

-				sc->lParam = 2; // do not cycle

-				sc = NULL; // we do not want to be freed here

-				break;

-			}

-			FreeServerID(sc->wNewContactId, SSIT_ITEM);

-			debugLogA("Moving of user to another group on server list failed, error %d", wError);

-			icq_LogMessage(LOG_ERROR, LPGEN("Moving of user to another group on server list failed."));

-

-			servlistPendingRemoveContact(sc->hContact, 0, (WORD)(sc->lParam ? sc->wGroupId : sc->wNewGroupId), PENDING_RESULT_FAILED);

-

-			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here

-

-			if (!sc->lParam) { // is this first ack ?

-				sc->lParam = -1;

-				sc = NULL; // this can't be freed here

-			}

-			break;

-		}

-

-		if (sc->lParam) { // is this the second ack ?

-			void* groupData;

-			int groupSize;

-			int bEnd = 1; // shall we end the sever modifications

-

-			setWord(sc->hContact, DBSETTING_SERVLIST_ID, sc->wNewContactId);

-			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, sc->wNewGroupId);

-

-			servlistPendingRemoveContact(sc->hContact, sc->wNewContactId, sc->wNewGroupId, PENDING_RESULT_SUCCESS);

-

-			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) // update the group we moved from

-			{ // the group is still not empty, just update it

-				updateServerGroupData(sc->wGroupId, groupData, groupSize, 0);

-				SAFE_FREE((void**)&groupData); // free the memory

-			}

-			else { // the group is empty, delete it

-				char* szGroup = getServListGroupCListPath(sc->wGroupId);

-

-				servlistRemoveGroup(szGroup, sc->wGroupId);

-				SAFE_FREE((void**)&szGroup);

-				bEnd = 0; // here the modifications go on

-			}

-

-			groupData = collectBuddyGroup(sc->wNewGroupId, &groupSize); // update the group we moved to

-			updateServerGroupData(sc->wNewGroupId, groupData, groupSize, bEnd ? SSOF_END_OPERATION : 0);

-			// end server modifications here

-			SAFE_FREE((void**)&groupData);

-

-		}

-		else // contact was deleted from server-list

-		{

-			delSetting(sc->hContact, DBSETTING_SERVLIST_ID);

-			delSetting(sc->hContact, DBSETTING_SERVLIST_GROUP);

-			FreeServerID(sc->wContactId, SSIT_ITEM); // release old contact id

-			sc->lParam = 1;

-			sc = NULL; // wait for second ack

-		}

-		break;

-

-	case SSA_CONTACT_FIX_AUTH:

-		if (wError) { // FIXME: something failed, we should handle it properly

-		}

-		break;

-

-	case SSA_GROUP_RENAME:

-		if (wError) {

-			debugLogA("Renaming of server group failed, error %d", wError);

-			icq_LogMessage(LOG_WARNING, LPGEN("Renaming of server group failed."));

-

-			servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_FAILED);

-		}

-		else {

-			setServListGroupName(sc->wGroupId, sc->szGroupName);

-			removeGroupPathLinks(sc->wGroupId);

-			{ // add group to known

-				char *szCListGroup = getServListGroupCListPath(sc->wGroupId);

-

-				/// FIXME: need to create link to the new group name before unique item name correction as well

-				setServListGroupLinkID(szCListGroup, sc->wGroupId);

-				SAFE_FREE((void**)&szCListGroup);

-			}

-			servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_SUCCESS);

-		}

-		SAFE_FREE((void**)&sc->szGroupName);

-		SAFE_FREE((void**)&sc->szGroup);

-		break;

-

-	case SSA_SETAVATAR:

-		if (wError) {

-			debugLogA("Uploading of avatar hash failed.");

-			if (sc->wGroupId) { // is avatar added or updated?

-				FreeServerID(sc->wContactId, SSIT_ITEM);

-				delSetting(DBSETTING_SERVLIST_AVATAR); // to fix old versions

-			}

-		}

-		else setWord(DBSETTING_SERVLIST_AVATAR, sc->wContactId);

-		break;

-

-	case SSA_REMOVEAVATAR:

-		if (wError)

-			debugLogA("Removing of avatar hash failed.");

-		else {

-			FreeServerID(sc->wContactId, SSIT_ITEM);

-			delSetting(DBSETTING_SERVLIST_AVATAR);

-		}

-		break;

-

-	case SSA_SERVLIST_ACK:

-		ProtoBroadcastAck(sc->hContact, ICQACKTYPE_SERVERCLIST, wError ? ACKRESULT_FAILED : ACKRESULT_SUCCESS, (HANDLE)sc->lParam, wError);

-		break;

-

-	case SSA_IMPORT:

-		if (wError)

-			debugLogA("Re-starting import sequence failed, error %d", wError);

-		else {

-			setWord("SrvImportID", 0);

-			delSetting("ImportTS");

-		}

-		break;

-

-	default:

-		debugLogA("Server ack cookie type (%d) not recognized.", sc->dwAction);

-	}

-

-	SAFE_FREE((void**)&sc); // free the memory

-	return;

-}

-

-MCONTACT CIcqProto::HContactFromRecordName(const char* szRecordName, int *bAdded)

-{

-	MCONTACT hContact = INVALID_CONTACT_ID;

-

-	if (!IsStringUIN(szRecordName))  // probably AIM contact

-		hContact = HContactFromUID(0, szRecordName, bAdded);

-	else { // this should be ICQ number

-		DWORD dwUin = atoi(szRecordName);

-		hContact = HContactFromUIN(dwUin, bAdded);

-	}

-	return hContact;

-}

-

-int CIcqProto::getServerDataFromItemTLV(oscar_tlv_chain* pChain, unsigned char *buf) /// FIXME: need to keep original order

-{

-	// get server-list item's TLV data

-	oscar_tlv_chain* list = pChain;

-	int datalen = 0;

-	icq_packet pBuf;

-

-	// Initialize our handy data buffer

-	pBuf.wPlace = 0;

-	pBuf.pData = buf;

-

-	while (list) { // collect non-standard TLVs and save them to DB

-		if (list->tlv.wType != SSI_TLV_AWAITING_AUTH &&

-			 list->tlv.wType != SSI_TLV_NAME &&

-			 list->tlv.wType != SSI_TLV_COMMENT &&

-			 list->tlv.wType != SSI_TLV_METAINFO_TOKEN &&

-			 list->tlv.wType != SSI_TLV_METAINFO_TIME) { // only TLVs which we do not handle on our own

-			packTLV(&pBuf, list->tlv.wType, list->tlv.wLen, list->tlv.pData);

-

-			datalen += list->tlv.wLen + 4;

-		}

-		list = list->next;

-	}

-	return datalen;

-}

-

-void CIcqProto::handleServerCListReply(BYTE *buf, WORD wLen, WORD wFlags, serverthread_info *info)

-{

-	BYTE bySSIVersion;

-	WORD wRecordCount;

-	WORD wRecord;

-	WORD wGroupId;

-	WORD wItemId;

-	WORD wTlvType;

-	WORD wTlvLength;

-	BOOL bIsLastPacket;

-	uid_str szRecordName;

-	oscar_tlv_chain* pChain = NULL;

-	oscar_tlv* pTLV = NULL;

-	char *szActiveSrvGroup = NULL;

-	WORD wActiveSrvGroupId = -1;

-

-

-	// If flag bit 1 is set, this is not the last

-	// packet. If it is 0, this is the last packet

-	// and there will be a timestamp at the end.

-	if (wFlags & 0x0001)

-		bIsLastPacket = FALSE;

-	else

-		bIsLastPacket = TRUE;

-

-	if (wLen < 3)

-		return;

-

-	// Version number of SSI protocol?

-	unpackByte(&buf, &bySSIVersion);

-	wLen -= 1;

-

-	// Total count of following entries. This is the size of the server

-	// side contact list and should be saved and sent with CLI_CHECKROSTER.

-	// NOTE: When the entries are split up in several packets, each packet

-	// has it's own count and they must be added to get the total size of

-	// server list.

-	unpackWord(&buf, &wRecordCount);

-	wLen -= 2;

-	debugLogA("SSI: number of entries is %u, version is %u", wRecordCount, bySSIVersion);

-

-	// Loop over all items in the packet

-	for (wRecord = 0; wRecord < wRecordCount; wRecord++) {

-		debugLogA("SSI: parsing record %u", wRecord + 1);

-

-		if (wLen < 10) { // minimum: name length (zero), group ID, item ID, empty TLV

-			debugLogA("Warning: SSI parsing error (%d)", 0);

-			break;

-		}

-

-		if (!unpackServerListItem(&buf, &wLen, szRecordName, &wGroupId, &wItemId, &wTlvType, &wTlvLength)) { // unpack basic structure

-			debugLogA("Warning: SSI parsing error (%d)", 1);

-			break;

-		}

-

-		debugLogA("Name: '%s', GroupID: %u, EntryID: %u, EntryType: %u, TLVlength: %u",

-					 szRecordName, wGroupId, wItemId, wTlvType, wTlvLength);

-

-		if (wLen < wTlvLength) {

-			debugLogA("Warning: SSI parsing error (%d)", 2);

-			break;

-		}

-

-		// Initialize the tlv chain

-		if (wTlvLength > 0) {

-			pChain = readIntoTLVChain(&buf, wTlvLength, 0);

-			wLen -= wTlvLength;

-		}

-		else pChain = NULL;

-

-		switch (wTlvType) {

-		case SSI_ITEM_BUDDY:

-			{

-				/* this is a contact */

-				int bAdded;

-				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);

-

-				if (hContact != INVALID_CONTACT_ID) {

-					int bRegroup = 0;

-					int bNicked = 0;

-

-					if (bAdded) { // Not already on list: added

-						debugLogA("SSI added new %s contact '%s'", "ICQ", szRecordName);

-

-						AddJustAddedContact(hContact);

-					}

-					else { // we should add new contacts and this contact was just added, show it

-						if (IsContactJustAdded(hContact)) {

-							setContactHidden(hContact, 0);

-							bAdded = 1; // we want details for new contacts

-						}

-						else debugLogA("SSI ignoring existing contact '%s'", szRecordName);

-

-						// Contact on server is always on list

-						db_set_b(hContact, "CList", "NotOnList", 0);

-					}

-

-					// Save group and item ID

-					setWord(hContact, DBSETTING_SERVLIST_ID, wItemId);

-					setWord(hContact, DBSETTING_SERVLIST_GROUP, wGroupId);

-					ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-					if (!bAdded && getByte("LoadServerDetails", DEFAULT_SS_LOAD)) { // check if the contact has been moved on the server

-						if (wActiveSrvGroupId != wGroupId || !szActiveSrvGroup) {

-							SAFE_FREE(&szActiveSrvGroup);

-							szActiveSrvGroup = getServListGroupCListPath(wGroupId);

-							wActiveSrvGroupId = wGroupId;

-						}

-						char *szLocalGroup = getContactCListGroup(hContact);

-

-						if (!strlennull(szLocalGroup)) { // no CListGroup

-							SAFE_FREE(&szLocalGroup);

-

-							szLocalGroup = null_strdup(DEFAULT_SS_GROUP);

-						}

-

-						if (strcmpnull(szActiveSrvGroup, szLocalGroup) &&

-							 (strlennull(szActiveSrvGroup) >= strlennull(szLocalGroup) || (szActiveSrvGroup && _strnicmp(szActiveSrvGroup, szLocalGroup, strlennull(szLocalGroup))))) { // contact moved to new group or sub-group or not to master group

-							bRegroup = 1;

-						}

-						if (bRegroup && !stricmpnull(DEFAULT_SS_GROUP, szActiveSrvGroup)) /// TODO: invent something more clever for "root" group

-						{ // is it the default "General" group ?

-							bRegroup = 0; // if yes, do not move to it - cause it would hide the contact

-						}

-						SAFE_FREE(&szLocalGroup);

-					}

-

-					if (bRegroup || bAdded) { // if we should load server details or contact was just added, update its group

-						if (wActiveSrvGroupId != wGroupId || !szActiveSrvGroup) {

-							SAFE_FREE(&szActiveSrvGroup);

-							szActiveSrvGroup = getServListGroupCListPath(wGroupId);

-							wActiveSrvGroupId = wGroupId;

-						}

-

-						if (szActiveSrvGroup) { // try to get Miranda Group path from groupid, if succeeded save to db

-							moveContactToCListGroup(hContact, szActiveSrvGroup);

-						}

-					}

-

-					if (pChain) { // Look for nickname TLV and copy it to the db if necessary

-						if (pTLV = pChain->getTLV(SSI_TLV_NAME, 1)) {

-							if (pTLV->pData && (pTLV->wLen > 0)) {

-								char *pszNick;

-								WORD wNickLength;

-

-								wNickLength = pTLV->wLen;

-

-								pszNick = (char*)SAFE_MALLOC(wNickLength + 1);

-								// Copy buffer to utf-8 buffer

-								memcpy(pszNick, pTLV->pData, wNickLength);

-								pszNick[wNickLength] = 0; // Terminate string

-

-								debugLogA("Nickname is '%s'", pszNick);

-

-								bNicked = 1;

-

-								// Write nickname to database

-								if (getByte("LoadServerDetails", DEFAULT_SS_LOAD) || bAdded) { // if just added contact, save details always - does no harm

-									char *szOldNick;

-

-									if (szOldNick = getSettingStringUtf(hContact, "CList", "MyHandle", NULL)) {

-										if ((strcmpnull(szOldNick, pszNick)) && (strlennull(pszNick) > 0)) { // check if the truncated nick changed, i.e. do not overwrite locally stored longer nick

-											if (strlennull(szOldNick) <= strlennull(pszNick) || strncmp(szOldNick, pszNick, null_strcut(szOldNick, MAX_SSI_TLV_NAME_SIZE))) {

-												// Yes, we really do need to delete it first. Otherwise the CLUI nick

-												// cache isn't updated (I'll look into it)

-												db_unset(hContact, "CList", "MyHandle");

-												db_set_utf(hContact, "CList", "MyHandle", pszNick);

-											}

-										}

-										SAFE_FREE(&szOldNick);

-									}

-									else if (strlennull(pszNick) > 0) {

-										db_unset(hContact, "CList", "MyHandle");

-										db_set_utf(hContact, "CList", "MyHandle", pszNick);

-									}

-								}

-								SAFE_FREE(&pszNick);

-							}

-							else debugLogA("Invalid nickname");

-						}

-						if (bAdded && !bNicked)

-							icq_QueueUser(hContact); // queue user without nick for fast auto info update

-

-						// Look for comment TLV and copy it to the db if necessary

-						if (pTLV = pChain->getTLV(SSI_TLV_COMMENT, 1)) {

-							if (pTLV->pData && (pTLV->wLen > 0)) {

-								char *pszComment;

-								WORD wCommentLength;

-

-

-								wCommentLength = pTLV->wLen;

-

-								pszComment = (char*)SAFE_MALLOC(wCommentLength + 1);

-								// Copy buffer to utf-8 buffer

-								memcpy(pszComment, pTLV->pData, wCommentLength);

-								pszComment[wCommentLength] = 0; // Terminate string

-

-								debugLogA("Comment is '%s'", pszComment);

-

-								// Write comment to database

-								if (getByte("LoadServerDetails", DEFAULT_SS_LOAD) || bAdded) { // if just added contact, save details always - does no harm

-									char *szOldComment;

-

-									if (szOldComment = getSettingStringUtf(hContact, "UserInfo", "MyNotes", NULL)) {

-										if ((strcmpnull(szOldComment, pszComment)) && (strlennull(pszComment) > 0)) // check if the truncated comment changed, i.e. do not overwrite locally stored longer comment

-											if (strlennull(szOldComment) <= strlennull(pszComment) || strncmp((char*)szOldComment, (char*)pszComment, null_strcut(szOldComment, MAX_SSI_TLV_COMMENT_SIZE)))

-												db_set_utf(hContact, "UserInfo", "MyNotes", pszComment);

-

-										SAFE_FREE((void**)&szOldComment);

-									}

-									else if (strlennull(pszComment) > 0)

-										db_set_utf(hContact, "UserInfo", "MyNotes", pszComment);

-								}

-								SAFE_FREE((void**)&pszComment);

-							}

-							else debugLogA("Invalid comment");

-						}

-

-						// Look for need-authorization TLV

-						if (pChain->getTLV(SSI_TLV_AWAITING_AUTH, 1)) {

-							setByte(hContact, "Auth", 1);

-							debugLogA("SSI contact need authorization");

-						}

-						else setByte(hContact, "Auth", 0);

-

-						if (pTLV = pChain->getTLV(SSI_TLV_METAINFO_TOKEN, 1)) {

-							setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pTLV->pData, pTLV->wLen);

-							if (pChain->getTLV(SSI_TLV_METAINFO_TIME, 1))

-								setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pChain->getDouble(SSI_TLV_METAINFO_TIME, 1));

-							debugLogA("SSI contact has meta info token");

-						}

-						else {

-							delSetting(hContact, DBSETTING_METAINFO_TOKEN);

-							delSetting(hContact, DBSETTING_METAINFO_TIME);

-						}

-

-							{ // store server-list item's TLV data

-								BYTE* data = (BYTE*)SAFE_MALLOC(wTlvLength);

-								int datalen = getServerDataFromItemTLV(pChain, data);

-

-								if (datalen > 0)

-									setSettingBlob(hContact, DBSETTING_SERVLIST_DATA, data, datalen);

-								else

-									delSetting(hContact, DBSETTING_SERVLIST_DATA);

-

-								SAFE_FREE((void**)&data);

-							}

-					}

-				}

-				else // failed to add or other error

-					debugLogA("SSI failed to handle %s Item '%s'", "Buddy", szRecordName);

-			}

-			break;

-

-		case SSI_ITEM_GROUP:

-			if ((wGroupId == 0) && (wItemId == 0)) {

-				/* list of groups. wTlvType=1, data is TLV(C8) containing list of WORDs which */

-				/* is the group ids

-				/* we don't need to use this. Our processing is on-the-fly */

-				/* this record is always sent first in the first packet only, */

-			}

-			else if (wGroupId != 0) {

-				/* wGroupId != 0: a group record */

-				if (wItemId == 0) { /* no item ID: this is a group */

-					/* pszRecordName is the name of the group */

-					ReserveServerID(wGroupId, SSIT_GROUP, 0);

-

-					setServListGroupName(wGroupId, szRecordName);

-

-					debugLogA("Group %s added to known groups.", szRecordName);

-

-					/* demangle full grouppath, set it to known */

-					SAFE_FREE(&szActiveSrvGroup);

-					szActiveSrvGroup = getServListGroupCListPath(wGroupId);

-					wActiveSrvGroupId = wGroupId;

-

-					/* TLV contains a TLV(C8) with a list of WORDs of contained contact IDs */

-					/* our processing is good enough that we don't need this duplication */

-				}

-				else debugLogA("Unhandled type 0x01, wItemID != 0");

-			}

-			else debugLogA("Unhandled type 0x01");

-			break;

-

-		case SSI_ITEM_PERMIT:

-			{

-				/* item on visible list */

-				/* wItemId not related to contact ID */

-				/* pszRecordName is the UIN */

-				int bAdded;

-				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);

-

-				if (hContact != INVALID_CONTACT_ID) {

-					if (bAdded) {

-						debugLogA("SSI added new %s contact '%s'", "Permit", szRecordName);

-						// It wasn't previously in the list, we hide it so it only appears in the visible list

-						setContactHidden(hContact, 1);

-						// Add it to the list, so it can be added properly if proper contact

-						AddJustAddedContact(hContact);

-					}

-					else debugLogA("SSI %s contact already exists '%s'", "Permit", szRecordName);

-

-					// Save permit ID

-					setWord(hContact, DBSETTING_SERVLIST_PERMIT, wItemId);

-					ReserveServerID(wItemId, SSIT_ITEM, 0);

-					// Set apparent mode

-					setWord(hContact, "ApparentMode", ID_STATUS_ONLINE);

-					debugLogA("Visible-contact (%s)", szRecordName);

-				}

-				else { // failed to add or other error

-					debugLogA("SSI failed to handle %s Item '%s'", "Permit", szRecordName);

-					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-				}

-			}

-			break;

-

-		case SSI_ITEM_DENY:

-			{

-				/* Item on invisible list */

-				/* wItemId not related to contact ID */

-				/* pszRecordName is the UIN */

-				int bAdded;

-				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);

-

-				if (hContact != INVALID_CONTACT_ID) {

-					if (bAdded) {

-						/* not already on list: added */

-						debugLogA("SSI added new %s contact '%s'", "Deny", szRecordName);

-						// It wasn't previously in the list, we hide it so it only appears in the visible list

-						setContactHidden(hContact, 1);

-						// Add it to the list, so it can be added properly if proper contact

-						AddJustAddedContact(hContact);

-					}

-					else debugLogA("SSI %s contact already exists '%s'", "Deny", szRecordName);

-

-					// Save Deny ID

-					setWord(hContact, DBSETTING_SERVLIST_DENY, wItemId);

-					ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-					// Set apparent mode

-					setWord(hContact, "ApparentMode", ID_STATUS_OFFLINE);

-					debugLogA("Invisible-contact (%s)", szRecordName);

-				}

-				else { // failed to add or other error

-					debugLogA("SSI failed to handle %s Item '%s'", "Deny", szRecordName);

-					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-				}

-			}

-			break;

-

-		case SSI_ITEM_VISIBILITY: /* My visibility settings */

-			// Look for visibility TLV

-			if (BYTE bVisibility = pChain->getByte(SSI_TLV_VISIBILITY, 1)) { // found it, store the id, we do not need current visibility - we do not rely on it

-				setWord(DBSETTING_SERVLIST_PRIVACY, wItemId);

-				ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-				debugLogA("Visibility is %u", bVisibility);

-			}

-			else ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-			break;

-

-		case SSI_ITEM_IGNORE:

-			{

-				/* item on ignore list */

-				/* wItemId not related to contact ID */

-				/* pszRecordName is the UIN */

-				int bAdded;

-				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);

-

-				if (hContact != INVALID_CONTACT_ID) {

-					if (bAdded) {

-						/* not already on list: add */

-						debugLogA("SSI added new %s contact '%s'", "Ignore", szRecordName);

-						// It wasn't previously in the list, we hide it

-						setContactHidden(hContact, 1);

-						// Add it to the list, so it can be added properly if proper contact

-						AddJustAddedContact(hContact);

-					}

-					else debugLogA("SSI %s contact already exists '%s'", "Ignore", szRecordName);

-

-					// Save Ignore ID

-					setWord(hContact, DBSETTING_SERVLIST_IGNORE, wItemId);

-					ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-					// Set apparent mode & ignore

-					setWord(hContact, "ApparentMode", ID_STATUS_OFFLINE);

-					// set ignore all events

-					CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_ALL);

-					debugLogA("Ignore-contact (%s)", szRecordName);

-				}

-				else { // failed to add or other error

-					debugLogA("SSI failed to handle %s Item '%s'", "Ignore", szRecordName);

-					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-				}

-			}

-			break;

-

-		case SSI_ITEM_UNKNOWN2:

-			debugLogA("SSI unknown type 0x11");

-

-			ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-			break;

-

-		case SSI_ITEM_IMPORTTIME:

-			if (wGroupId == 0) {

-				/* time our list was first imported */

-				/* pszRecordName is "Import Time" */

-				/* data is TLV(13) {TLV(D4) {time_t importTime}} */

-				setDword("ImportTS", pChain->getDWord(SSI_TLV_TIMESTAMP, 1));

-				setWord("SrvImportID", wItemId);

-				ReserveServerID(wItemId, SSIT_ITEM, 0);

-				debugLogA("SSI %s item recognized", "first import");

-			}

-			break;

-

-		case SSI_ITEM_BUDDYICON:

-			if (wGroupId == 0) {

-				/* our avatar MD5-hash */

-				/* pszRecordName is "1" */

-				/* data is TLV(D5) hash */

-				/* we ignore this, just save the id */

-				/* cause we get the hash again after login */

-				if (!strcmpnull(szRecordName, "12")) { // need to handle Photo Item separately

-					setWord(DBSETTING_SERVLIST_PHOTO, wItemId);

-					debugLogA("SSI %s item recognized", "Photo");

-				}

-				else {

-					setWord(DBSETTING_SERVLIST_AVATAR, wItemId);

-					debugLogA("SSI %s item recognized", "Avatar");

-				}

-				ReserveServerID(wItemId, SSIT_ITEM, 0);

-			}

-			break;

-

-		case SSI_ITEM_METAINFO:

-			if (wGroupId == 0) {

-				/* our meta info token & last update time */

-				/* pszRecordName is "ICQ-MDIR" */

-				/* data is TLV(15C) and TLV(15D) */

-				oscar_tlv* pToken = pChain->getTLV(SSI_TLV_METAINFO_TOKEN, 1);

-				oscar_tlv* pTime = pChain->getTLV(SSI_TLV_METAINFO_TIME, 1);

-				if (pToken)

-					setSettingBlob(NULL, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);

-				if (pTime)

-					setSettingDouble(NULL, DBSETTING_METAINFO_TIME, pChain->getDouble(SSI_TLV_METAINFO_TIME, 1));

-

-				setWord(DBSETTING_SERVLIST_METAINFO, wItemId);

-				ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-				debugLogA("SSI %s item recognized", "Meta info");

-			}

-			break;

-

-		case SSI_ITEM_CLIENTDATA:

-			if (wGroupId == 0) {

-				/* ICQ2k ShortcutBar Items */

-				/* data is TLV(CD) text */

-				if (wItemId)

-					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-			}

-

-		case SSI_ITEM_SAVED:

-		case SSI_ITEM_PREAUTH:

-			break;

-

-		default:

-			debugLogA("SSI unhandled item %2x", wTlvType);

-

-			if (wItemId)

-				ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);

-			break;

-		}

-

-		disposeChain(&pChain);

-	} // end for

-

-	// Release Memory

-	SAFE_FREE(&szActiveSrvGroup);

-

-	debugLogA("Bytes left: %u", wLen);

-

-	setWord("SrvRecordCount", (WORD)(wRecord + getWord("SrvRecordCount", 0)));

-

-	if (bIsLastPacket) {

-		// No contacts left to sync

-		bIsSyncingCL = FALSE;

-

-		StoreServerIDs();

-

-		icq_RescanInfoUpdate();

-

-		if (wLen >= 4) {

-			DWORD dwLastUpdateTime;

-

-			/* finally we get a time_t of the last update time */

-			unpackDWord(&buf, &dwLastUpdateTime);

-			setDword("SrvLastUpdate", dwLastUpdateTime);

-			debugLogA("Last update of server list was (%u) %s", dwLastUpdateTime, time2text(dwLastUpdateTime));

-

-			sendRosterAck();

-			handleServUINSettings(wListenPort, info);

-

-			servlistProcessLogin();

-		}

-		else debugLogA("Last packet missed update time...");

-

-		if (getWord("SrvRecordCount", 0) == 0) { // we got empty serv-list, create master group

-			cookie_servlist_action* ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-			if (ack) {

-				DWORD dwCookie;

-

-				ack->dwAction = SSA_GROUP_UPDATE;

-				ack->szGroupName = null_strdup("");

-				dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, 0, ack);

-				icq_sendServerGroup(dwCookie, ICQ_LISTS_ADDTOLIST, 0, ack->szGroupName, NULL, 0, 0);

-			}

-		}

-		// serv-list sync finished, clear just added contacts

-		FlushJustAddedContacts();

-	}

-	else debugLogA("Waiting for more packets");

-}

-

-void CIcqProto::handleServerCListItemAdd(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)

-{

-	if (wItemType == SSI_ITEM_IMPORTTIME) {

-		if (pItemData) {

-			setDword("ImportTS", pItemData->getDWord(SSI_TLV_TIMESTAMP, 1));

-			setWord("SrvImportID", wItemId);

-			ReserveServerID(wItemId, SSIT_ITEM, 0);

-

-			debugLogA("Server added Import timestamp to list");

-			return;

-		}

-	}

-	// Reserve server-list ID

-	ReserveServerID(wItemId, wItemType == SSI_ITEM_GROUP ? SSIT_GROUP : SSIT_ITEM, SSIF_UNHANDLED);

-}

-

-void CIcqProto::handleServerCListItemUpdate(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)

-{

-	MCONTACT hContact = (wItemType == SSI_ITEM_BUDDY || wItemType == SSI_ITEM_DENY || wItemType == SSI_ITEM_PERMIT || wItemType == SSI_ITEM_IGNORE) ? HContactFromRecordName(szRecordName, NULL) : NULL;

-

-	if (hContact != INVALID_CONTACT_ID && wItemType == SSI_ITEM_BUDDY) { // a contact was updated on server

-		if (pItemData) {

-			oscar_tlv *pAuth = pItemData->getTLV(SSI_TLV_AWAITING_AUTH, 1);

-			BYTE bAuth = getByte(hContact, "Auth", 0);

-

-			if (bAuth && !pAuth) { // server authorized our contact

-				char str[MAX_PATH];

-				char msg[MAX_PATH];

-				char *nick = NickFromHandleUtf(hContact);

-

-				setByte(hContact, "Auth", 0);

-				mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" was authorized in the server list."), msg, MAX_PATH), nick);

-				icq_LogMessage(LOG_WARNING, str);

-				SAFE_FREE(&nick);

-			}

-			else if (!bAuth && pAuth) { // server took away authorization of our contact

-				char str[MAX_PATH];

-				char msg[MAX_PATH];

-				char *nick = NickFromHandleUtf(hContact);

-

-				setByte(hContact, "Auth", 1);

-				mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" lost its authorization in the server list."), msg, MAX_PATH), nick);

-				icq_LogMessage(LOG_WARNING, str);

-				SAFE_FREE(&nick);

-			}

-			{

-				// update metainfo data

-				DBVARIANT dbv = { 0 };

-				oscar_tlv *pToken = pItemData->getTLV(SSI_TLV_METAINFO_TOKEN, 1);

-				oscar_tlv *pTime = pItemData->getTLV(SSI_TLV_METAINFO_TIME, 1);

-

-				if (!getSetting(hContact, DBSETTING_METAINFO_TOKEN, &dbv)) {

-					if (!pToken || dbv.cpbVal != pToken->wLen || memcmp(dbv.pbVal, pToken->pData, dbv.cpbVal)) {

-						if (!pToken)

-							debugLogA("Contact %s, meta info token removed", szRecordName);

-						else

-							debugLogA("Contact %s, meta info token changed", szRecordName);

-

-						// user info was changed, refresh

-						if (IsMetaInfoChanged(hContact))

-							icq_QueueUser(hContact);

-					}

-

-					db_free(&dbv);

-				}

-				else if (pToken) {

-					debugLogA("Contact %s, meta info token added", szRecordName);

-

-					// user info was changed, refresh

-					if (IsMetaInfoChanged(hContact))

-						icq_QueueUser(hContact);

-				}

-

-				if (pToken)

-					setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);

-				if (pTime)

-					setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pItemData->getDouble(SSI_TLV_METAINFO_TIME, 1));

-			}

-			{

-				// update server's data - otherwise consequent operations can fail with 0x0E

-				BYTE *data = (BYTE*)_alloca(pItemData->getChainLength());

-				int datalen = getServerDataFromItemTLV(pItemData, data);

-

-				if (datalen > 0)

-					setSettingBlob(hContact, DBSETTING_SERVLIST_DATA, data, datalen);

-				else

-					delSetting(hContact, DBSETTING_SERVLIST_DATA);

-			}

-		}

-	}

-	else if (wItemType == SSI_ITEM_METAINFO) { // owner MetaInfo data updated

-		if (pItemData) {

-			DBVARIANT dbv = { 0 };

-			oscar_tlv *pToken = pItemData->getTLV(SSI_TLV_METAINFO_TOKEN, 1);

-			oscar_tlv *pTime = pItemData->getTLV(SSI_TLV_METAINFO_TIME, 1);

-

-			if (!getSetting(hContact, DBSETTING_METAINFO_TOKEN, &dbv)) {

-				if (!pToken || dbv.cpbVal != pToken->wLen || memcmp(dbv.pbVal, pToken->pData, dbv.cpbVal)) {

-					if (!pToken)

-						debugLogA("Owner meta info token removed");

-					else

-						debugLogA("Owner meta info token changed");

-				}

-

-				db_free(&dbv);

-			}

-

-			if (pToken)

-				setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);

-			if (pTime)

-				setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pItemData->getDouble(SSI_TLV_METAINFO_TIME, 1));

-		}

-	}

-	else if (wItemType == SSI_ITEM_GROUP) // group updated

-		debugLogA("Server updated our group \"%s\" on list", szRecordName);

-}

-

-void CIcqProto::handleServerCListItemDelete(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)

-{

-	MCONTACT hContact = (wItemType == SSI_ITEM_BUDDY || wItemType == SSI_ITEM_DENY || wItemType == SSI_ITEM_PERMIT || wItemType == SSI_ITEM_IGNORE) ? HContactFromRecordName(szRecordName, NULL) : NULL;

-

-	if (hContact != INVALID_CONTACT_ID && wItemType == SSI_ITEM_BUDDY) { // a contact was removed from our list

-		if (getWord(hContact, DBSETTING_SERVLIST_ID, 0) == wItemId) {

-			delSetting(hContact, DBSETTING_SERVLIST_ID);

-			delSetting(hContact, DBSETTING_SERVLIST_GROUP);

-			delSetting(hContact, "Auth");

-

-			char str[MAX_PATH];

-			char msg[MAX_PATH];

-			char *nick = NickFromHandleUtf(hContact);

-

-			mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("User \"%s\" was removed from server list."), msg, MAX_PATH), nick);

-			icq_LogMessage(LOG_WARNING, str);

-			SAFE_FREE(&nick);

-		}

-	}

-	// Release server-list ID

-	FreeServerID(wItemId, wItemType == SSI_ITEM_GROUP ? SSIT_GROUP : SSIT_ITEM);

-}

-

-void CIcqProto::handleRecvAuthRequest(unsigned char *buf, WORD wLen)

-{

-	DWORD dwUin;

-	uid_str szUid;

-	if (!unpackUID(&buf, &wLen, &dwUin, &szUid))

-		return;

-

-	if (dwUin && IsOnSpammerList(dwUin)) {

-		debugLogA("Ignored Message from known Spammer");

-		return;

-	}

-

-	WORD wReasonLen;

-	unpackWord(&buf, &wReasonLen);

-	wLen -= 2;

-	if (wReasonLen > wLen)

-		return;

-

-	int bAdded;

-	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);

-

-	PROTORECVEVENT pre = { 0 };

-	pre.timestamp = time(NULL);

-	pre.lParam = sizeof(DWORD) * 2 + 5;

-	// Prepare reason

-	char *szReason = (char*)SAFE_MALLOC(wReasonLen + 1);

-	int nReasonLen = 0;

-	if (szReason) {

-		memcpy(szReason, buf, wReasonLen);

-		szReason[wReasonLen] = '\0';

-		nReasonLen = strlennull(szReason);

-

-		char *temp = (char*)_alloca(nReasonLen + 2);

-		if (!IsUSASCII(szReason, nReasonLen) && UTF8_IsValid(szReason) && utf8_decode_static(szReason, temp, nReasonLen + 1))

-			pre.flags |= PREF_UTF;

-	}

-

-	// Read nick name from DB

-	char *szNick = NULL;

-	if (dwUin) {

-		DBVARIANT dbv = { 0 };

-		if (pre.flags & PREF_UTF)

-			szNick = getSettingStringUtf(hContact, "Nick", NULL);

-		else if (!getString(hContact, "Nick", &dbv)) {

-			szNick = null_strdup(dbv.pszVal);

-			db_free(&dbv);

-		}

-	}

-	else szNick = null_strdup(szUid);

-

-	int nNickLen = strlennull(szNick);

-

-	pre.lParam += nNickLen + nReasonLen;

-

-	setByte(hContact, "Grant", 1);

-

-	/*blob is: uin(DWORD), hcontact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ), reason(ASCIIZ)*/

-	char *szBlob = (char *)_alloca(pre.lParam);

-	char *pCurBlob = szBlob;

-	*(DWORD*)pCurBlob = dwUin; pCurBlob += sizeof(DWORD);

-	*(DWORD*)pCurBlob = DWORD(hContact); pCurBlob += sizeof(DWORD);

-

-	if (nNickLen) { // if we have nick we add it, otherwise keep trailing zero

-		memcpy(pCurBlob, szNick, nNickLen);

-		pCurBlob += nNickLen;

-	}

-	*pCurBlob = 0; pCurBlob++; // Nick

-	*pCurBlob = 0; pCurBlob++; // FirstName

-	*pCurBlob = 0; pCurBlob++; // LastName

-	*pCurBlob = 0; pCurBlob++; // email

-	if (nReasonLen) {

-		memcpy(pCurBlob, szReason, nReasonLen);

-		pCurBlob += nReasonLen;

-	}

-	*pCurBlob = 0; // Reason

-	pre.szMessage = szBlob;

-

-	// TODO: Change for new auth system, include all known informations

-	ProtoChainRecv(hContact, PSR_AUTH, 0, (LPARAM)&pre);

-

-	SAFE_FREE(&szNick);

-	SAFE_FREE(&szReason);

-}

-

-void CIcqProto::handleRecvAdded(unsigned char *buf, WORD wLen)

-{

-	DWORD dwUin;

-	uid_str szUid;

-	DWORD cbBlob;

-	PBYTE pBlob, pCurBlob;

-	int bAdded;

-	char* szNick;

-	int nNickLen;

-	DBVARIANT dbv = { 0 };

-

-	if (!unpackUID(&buf, &wLen, &dwUin, &szUid)) return;

-

-	if (dwUin && IsOnSpammerList(dwUin)) {

-		debugLogA("Ignored Message from known Spammer");

-		return;

-	}

-

-	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);

-

-	cbBlob = sizeof(DWORD) * 2 + 4;

-

-	if (dwUin) {

-		if (getString(hContact, "Nick", &dbv))

-			nNickLen = 0;

-		else {

-			szNick = dbv.pszVal;

-			nNickLen = strlennull(szNick);

-		}

-	}

-	else nNickLen = strlennull(szUid);

-

-	cbBlob += nNickLen;

-

-	pCurBlob = pBlob = (PBYTE)_alloca(cbBlob);

-	/*blob is: uin(DWORD), hContact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ) */

-	*(DWORD*)pCurBlob = dwUin; pCurBlob += sizeof(DWORD);

-	*(DWORD*)pCurBlob = DWORD(hContact); pCurBlob += sizeof(DWORD);

-	if (nNickLen && dwUin) { // if we have nick we add it, otherwise keep trailing zero

-		memcpy(pCurBlob, szNick, nNickLen);

-		pCurBlob += nNickLen;

-	}

-	else {

-		memcpy(pCurBlob, szUid, nNickLen);

-		pCurBlob += nNickLen;

-	}

-	*(char *)pCurBlob = 0; pCurBlob++;

-	*(char *)pCurBlob = 0; pCurBlob++;

-	*(char *)pCurBlob = 0; pCurBlob++;

-	*(char *)pCurBlob = 0;

-	// TODO: Change for new auth system

-

-	AddEvent(NULL, EVENTTYPE_ADDED, time(NULL), 0, cbBlob, pBlob);

-}

-

-void CIcqProto::handleRecvAuthResponse(unsigned char *buf, WORD wLen)

-{

-	DWORD dwUin;

-	uid_str szUid;

-	char* szNick = NULL;

-	WORD nReasonLen;

-	char* szReason;

-	int bAdded;

-

-	BYTE bResponse = 0xFF;

-

-	if (!unpackUID(&buf, &wLen, &dwUin, &szUid)) return;

-

-	if (dwUin && IsOnSpammerList(dwUin)) {

-		debugLogA("Ignored Message from known Spammer");

-		return;

-	}

-

-	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);

-	if (hContact != INVALID_CONTACT_ID)

-		szNick = NickFromHandle(hContact);

-

-	if (wLen > 0) {

-		unpackByte(&buf, &bResponse);

-		wLen -= 1;

-	}

-	if (wLen >= 2) {

-		unpackWord(&buf, &nReasonLen);

-		wLen -= 2;

-		if (wLen >= nReasonLen) {

-			szReason = (char*)_alloca(nReasonLen + 1);

-			unpackString(&buf, szReason, nReasonLen);

-			szReason[nReasonLen] = '\0';

-		}

-	}

-

-	switch (bResponse) {

-	case 0:

-		debugLogA("Authorization request %s by %s", "denied", strUID(dwUin, szUid));

-		// TODO: Add to system history as soon as new auth system is ready

-		break;

-

-	case 1:

-		setByte(hContact, "Auth", 0);

-		debugLogA("Authorization request %s by %s", "granted", strUID(dwUin, szUid));

-		// TODO: Add to system history as soon as new auth system is ready

-		break;

-

-	default:

-		debugLogA("Unknown Authorization request response (%u) from %s", bResponse, strUID(dwUin, szUid));

-		break;

-

-	}

-	SAFE_FREE(&szNick);

-}

-

-// Updates the visibility code used while in SSI mode. If a server ID is

-// not stored in the local DB, a new ID will be added to the server list.

-//

-// Possible values are:

-//   01 - Allow all users to see you

-//   02 - Block all users from seeing you

-//   03 - Allow only users in the permit list to see you

-//   04 - Block only users in the invisible list from seeing you

-//   05 - Allow only users in the buddy list to see you

-//

-void CIcqProto::updateServVisibilityCode(BYTE bCode)

-{

-	icq_packet packet;

-	WORD wVisibilityID;

-	WORD wCommand;

-

-	if ((bCode > 0) && (bCode < 6)) {

-		cookie_servlist_action* ack;

-		DWORD dwCookie;

-		BYTE bVisibility = getByte("SrvVisibility", 0);

-

-		if (bVisibility == bCode) // if no change was made, not necescary to update that

-			return;

-		setByte("SrvVisibility", bCode);

-

-		// Do we have a known server visibility ID? We should, unless we just subscribed to the serv-list for the first time

-		if ((wVisibilityID = getWord(DBSETTING_SERVLIST_PRIVACY, 0)) == 0) {

-			// No, create a new random ID

-			wVisibilityID = GenerateServerID(SSIT_ITEM, 0);

-			setWord(DBSETTING_SERVLIST_PRIVACY, wVisibilityID);

-			wCommand = ICQ_LISTS_ADDTOLIST;

-

-			debugLogA("Made new srvVisibilityID, id is %u, code is %u", wVisibilityID, bCode);

-		}

-		else {

-			debugLogA("Reused srvVisibilityID, id is %u, code is %u", wVisibilityID, bCode);

-			wCommand = ICQ_LISTS_UPDATEGROUP;

-		}

-

-		ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-		if (!ack) {

-			debugLogA("Cookie alloc failure.");

-			return; // out of memory, go away

-		}

-

-		ack->dwAction = SSA_VISIBILITY; // update visibility

-		dwCookie = AllocateCookie(CKT_SERVERLIST, wCommand, 0, ack); // take cookie

-

-		// Build and send packet

-		serverPacketInit(&packet, 25);

-		packFNACHeader(&packet, ICQ_LISTS_FAMILY, wCommand, 0, dwCookie);

-		packWord(&packet, 0);                   // Name (null)

-		packWord(&packet, 0);                   // GroupID (0 if not relevant)

-		packWord(&packet, wVisibilityID);       // EntryID

-		packWord(&packet, SSI_ITEM_VISIBILITY); // EntryType

-		packWord(&packet, 5);                   // Length in bytes of following TLV

-		packTLV(&packet, SSI_TLV_VISIBILITY, 1, &bCode);  // TLV (Visibility)

-		sendServPacket(&packet);

-		// There is no need to send ICQ_LISTS_CLI_MODIFYSTART or

-		// ICQ_LISTS_CLI_MODIFYEND when modifying the visibility code

-	}

-}

-

-// Updates the avatar hash used while in SSI mode. If a server ID is

-// not stored in the local DB, a new ID will be added to the server list.

-void CIcqProto::updateServAvatarHash(BYTE *pHash, int size)

-{

-	void** pDoubleObject = NULL;

-	void* doubleObject = NULL;

-	DWORD dwOperationFlags = 0;

-	WORD wAvatarID;

-	WORD wCommand;

-	char szItemName[2] = { 0, 0 };

-

-	int bResetHash = 0;

-	DBVARIANT dbvHash;

-	if (!getSetting(NULL, "AvatarHash", &dbvHash)) {

-		szItemName[0] = 0x30 + dbvHash.pbVal[1];

-

-		if (memcmp(pHash, dbvHash.pbVal, 2) != 0) // add code to remove old hash from server

-			bResetHash = 1;

-

-		db_free(&dbvHash);

-	}

-

-	if (bResetHash) { // start update session

-		// pair the packets (need to be send in the correct order

-		dwOperationFlags |= SSOF_BEGIN_OPERATION | SSOF_END_OPERATION;

-		pDoubleObject = &doubleObject;

-	}

-

-	if (bResetHash || !pHash) {

-		// Do we have a known server avatar ID?

-		if (wAvatarID = getWord(DBSETTING_SERVLIST_AVATAR, 0)) {

-			cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-			if (!ack) {

-				debugLogA("Cookie alloc failure.");

-				return; // out of memory, go away

-			}

-			ack->dwAction = SSA_REMOVEAVATAR; // update avatar hash

-			ack->wContactId = wAvatarID;

-			DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_REMOVEFROMLIST, 0, ack); // take cookie

-			icq_sendServerItem(dwCookie, ICQ_LISTS_REMOVEFROMLIST, 0, wAvatarID, szItemName, NULL, 0, SSI_ITEM_BUDDYICON, SSOP_ITEM_ACTION | dwOperationFlags, 400, pDoubleObject);

-		}

-	}

-

-	if (!pHash)

-		return;

-

-	WORD hashsize = size - 2;

-

-	// Do we have a known server avatar ID? We should, unless we just subscribed to the serv-list for the first time

-	if (bResetHash || (wAvatarID = getWord(DBSETTING_SERVLIST_AVATAR, 0)) == 0) {

-		// No, create a new random ID

-		wAvatarID = GenerateServerID(SSIT_ITEM, 0);

-		wCommand = ICQ_LISTS_ADDTOLIST;

-		debugLogA("Made new srvAvatarID, id is %u", wAvatarID);

-	}

-	else {

-		debugLogA("Reused srvAvatarID, id is %u", wAvatarID);

-		wCommand = ICQ_LISTS_UPDATEGROUP;

-	}

-

-	cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));

-	if (!ack) {

-		debugLogA("Cookie alloc failure.");

-		return; // out of memory, go away

-	}

-	ack->dwAction = SSA_SETAVATAR; // update avatar hash

-	ack->wContactId = wAvatarID;

-	DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, wCommand, 0, ack); // take cookie

-

-	szItemName[0] = 0x30 + pHash[1];

-

-	// Build the packet

-	WORD wTLVlen = 8 + hashsize;

-

-	// Initialize our handy data buffer

-	icq_packet pBuffer;

-	pBuffer.wPlace = 0;

-	pBuffer.pData = (BYTE *)_alloca(wTLVlen);

-	pBuffer.wLen = wTLVlen;

-

-	packTLV(&pBuffer, SSI_TLV_NAME, 0, NULL);                    // TLV (Name)

-	packTLV(&pBuffer, SSI_TLV_AVATARHASH, hashsize, pHash + 2);  // TLV (Hash)

-

-	icq_sendServerItem(dwCookie, wCommand, 0, wAvatarID, szItemName, pBuffer.pData, wTLVlen, SSI_ITEM_BUDDYICON, SSOP_ITEM_ACTION | dwOperationFlags, 400, pDoubleObject);

-	// There is no need to send ICQ_LISTS_CLI_MODIFYSTART or

-	// ICQ_LISTS_CLI_MODIFYEND when modifying the avatar hash

-}

-

-// Should be called before the server list is modified. When all

-// modifications are done, call icq_sendServerEndOperation().

-// Called automatically thru server-list update board!

-void CIcqProto::icq_sendServerBeginOperation(int bImport)

-{

-	WORD wImportID = getWord("SrvImportID", 0);

-

-	if (bImport && wImportID) { // we should be importing, check if already have import item

-		if (getDword("ImportTS", 0) + 604800 < getDword("LogonTS", 0)) { // is the timestamp week older, clear it and begin new import

-			DWORD dwCookie;

-			cookie_servlist_action* ack;

-

-			if (ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action))) { // we have cookie good, go on

-				ack->dwAction = SSA_IMPORT;

-				dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_REMOVEFROMLIST, 0, ack);

-

-				icq_sendSimpleItem(dwCookie, ICQ_LISTS_REMOVEFROMLIST, 0, "ImportTime", 0, wImportID, SSI_ITEM_IMPORTTIME, SSOP_ITEM_ACTION | SSOF_SEND_DIRECTLY, 100);

-			}

-		}

-	}

-

-	icq_packet packet;

-	serverPacketInit(&packet, (WORD)(bImport ? 14 : 10));

-	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_CLI_MODIFYSTART);

-	if (bImport)

-		packDWord(&packet, 1 << 0x10);

-	sendServPacket(&packet);

-}

-

-// Should be called after the server list has been modified to inform

-// the server that we are done.

-// Called automatically thru server-list update board!

-void CIcqProto::icq_sendServerEndOperation()

-{

-	icq_packet packet;

-	serverPacketInit(&packet, 10);

-	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_CLI_MODIFYEND);

-	sendServPacket(&packet);

-}

-

-// Sent when the last roster packet has been received

-void CIcqProto::sendRosterAck(void)

-{

-	icq_packet packet;

-	serverPacketInit(&packet, 10);

-	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_GOTLIST);

-	sendServPacket(&packet);

-

-	debugLogA("Sent SNAC(x13,x07) - CLI_ROSTERACK");

-}

+// ---------------------------------------------------------------------------80
+//                ICQ plugin for Miranda Instant Messenger
+//                ________________________________________
+//
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Öberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2014 Miranda NG Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+// -----------------------------------------------------------------------------
+
+#include "icqoscar.h"
+
+static int unpackServerListItem(BYTE **pbuf, WORD *pwLen, char *pszRecordName, WORD *pwGroupId, WORD *pwItemId, WORD *pwItemType, WORD *pwTlvLength);
+
+
+void CIcqProto::handleServCListFam(BYTE *pBuffer, WORD wBufferLength, snac_header* pSnacHeader, serverthread_info *info)
+{
+	switch (pSnacHeader->wSubtype) {
+	case ICQ_LISTS_ACK: // UPDATE_ACK
+		if (wBufferLength >= 2) {
+			WORD wError;
+			cookie_servlist_action* sc;
+
+			unpackWord(&pBuffer, &wError);
+
+			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // look for action cookie
+				debugLogA("Received expected server list ack, action: %d, result: %d", sc->dwAction, wError);
+				FreeCookie(pSnacHeader->dwRef); // release cookie
+
+				if (sc->dwAction == SSA_ACTION_GROUP) { // group cookie, handle sub-items
+					int i;
+
+					debugLogA("Server-List: Grouped action contains %d actions.", sc->dwGroupCount);
+
+					pBuffer -= 2; // revoke unpack
+					if (wBufferLength != 2 * sc->dwGroupCount)
+						debugLogA("Error: Server list ack does not contain expected amount of result codes (%u != %u)", wBufferLength / 2, sc->dwGroupCount);
+
+					for (i = 0; i < sc->dwGroupCount; i++) {
+						if (wBufferLength >= 2) { // get proper result code
+							unpackWord(&pBuffer, &wError);
+							wBufferLength -= 2;
+						}
+						else // missing result code, give some special
+							wError = -1;
+
+						debugLogA("Action: %d, ack result: %d", sc->pGroupItems[i]->dwAction, wError);
+
+						// call normal ack handler
+						handleServerCListAck(sc->pGroupItems[i], wError);
+					}
+					// Release cookie
+					SAFE_FREE((void**)&sc->pGroupItems);
+					SAFE_FREE((void**)&sc);
+				}
+				else // single ack
+					handleServerCListAck(sc, wError);
+			}
+			else debugLogA("Received unexpected server list ack %u", wError);
+		}
+		break;
+
+	case ICQ_LISTS_SRV_REPLYLISTS:
+		/* received server-list rights */
+		handleServerCListRightsReply(pBuffer, wBufferLength);
+		debugLogA("Server sent SNAC(x13,x03) - SRV_REPLYLISTS");
+		break;
+
+	case ICQ_LISTS_LIST: // SRV_REPLYROSTER
+		{
+			cookie_servlist_action* sc;
+			BOOL blWork = bIsSyncingCL;
+			bIsSyncingCL = TRUE; // this is not used if cookie takes place
+
+			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // we do it by reliable cookie
+				if (!sc->lParam) { // is this first packet ?
+					ResetSettingsOnListReload();
+					sc->lParam = 1;
+				}
+				handleServerCListReply(pBuffer, wBufferLength, pSnacHeader->wFlags, info);
+				if (!(pSnacHeader->wFlags & 0x0001)) // was that last packet ?
+					ReleaseCookie(pSnacHeader->dwRef); // yes, release cookie
+			}
+			else { // use old fake
+				if (!blWork) // this can fail on some crazy situations
+					ResetSettingsOnListReload();
+
+				handleServerCListReply(pBuffer, wBufferLength, pSnacHeader->wFlags, info);
+			}
+		}
+		break;
+
+	case ICQ_LISTS_UPTODATE: // SRV_REPLYROSTEROK
+		bIsSyncingCL = FALSE;
+		{
+			cookie_servlist_action* sc;
+			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // we requested servlist check
+				debugLogA("Server stated roster is ok.");
+				ReleaseCookie(pSnacHeader->dwRef);
+				LoadServerIDs();
+			}
+			else debugLogA("Server sent unexpected SNAC(x13,x0F) - SRV_REPLYROSTEROK");
+
+			// This will activate the server side list
+			sendRosterAck(); // this must be here, cause of failures during cookie alloc
+			handleServUINSettings(wListenPort, info);
+		}
+		break;
+
+	case ICQ_LISTS_CLI_MODIFYSTART:
+		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_CLI_MODIFYSTART, "Server is modifying contact list");
+		break;
+
+	case ICQ_LISTS_CLI_MODIFYEND:
+		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_CLI_MODIFYEND, "End of server modification");
+		break;
+
+	case ICQ_LISTS_ADDTOLIST:
+	case ICQ_LISTS_UPDATEGROUP:
+	case ICQ_LISTS_REMOVEFROMLIST:
+		{
+			int nItems = 0;
+
+			while (wBufferLength >= 10) {
+				WORD wGroupId, wItemId, wItemType, wTlvLen;
+				uid_str szRecordName;
+
+				if (unpackServerListItem(&pBuffer, &wBufferLength, szRecordName, &wGroupId, &wItemId, &wItemType, &wTlvLen)) {
+					BYTE *buf = pBuffer;
+					oscar_tlv_chain *pChain = NULL;
+
+					nItems++;
+
+					// parse possible item's data
+					if (wBufferLength >= wTlvLen && wTlvLen > 0) {
+						pChain = readIntoTLVChain(&buf, wTlvLen, 0);
+						pBuffer += wTlvLen;
+						wBufferLength -= wTlvLen;
+					}
+					else if (wTlvLen > 0)
+						wBufferLength = 0;
+
+					// process item change
+					if (pSnacHeader->wSubtype == ICQ_LISTS_ADDTOLIST)
+						handleServerCListItemAdd(szRecordName, wGroupId, wItemId, wItemType, pChain);
+					else if (pSnacHeader->wSubtype == ICQ_LISTS_UPDATEGROUP)
+						handleServerCListItemUpdate(szRecordName, wGroupId, wItemId, wItemType, pChain);
+					else if (pSnacHeader->wSubtype == ICQ_LISTS_REMOVEFROMLIST)
+						handleServerCListItemDelete(szRecordName, wGroupId, wItemId, wItemType, pChain);
+
+					// release memory
+					disposeChain(&pChain);
+				}
+			}
+			{
+				// log packet basics
+				char *szChange;
+
+				if (pSnacHeader->wSubtype == ICQ_LISTS_ADDTOLIST)
+					szChange = "Server added %u item(s) to list";
+				else if (pSnacHeader->wSubtype == ICQ_LISTS_UPDATEGROUP)
+					szChange = "Server updated %u item(s) on list";
+				else if (pSnacHeader->wSubtype == ICQ_LISTS_REMOVEFROMLIST)
+					szChange = "Server removed %u item(s) from list";
+
+				char szLogText[MAX_PATH];
+				mir_snprintf(szLogText, MAX_PATH, szChange, nItems);
+				debugLogA("Server sent SNAC(x13,x%02x) - %s", pSnacHeader->wSubtype, szLogText);
+			}
+		}
+		break;
+
+	case ICQ_LISTS_AUTHREQUEST:
+		handleRecvAuthRequest(pBuffer, wBufferLength);
+		break;
+
+	case ICQ_LISTS_SRV_AUTHRESPONSE:
+		handleRecvAuthResponse(pBuffer, wBufferLength);
+		break;
+
+	case ICQ_LISTS_AUTHGRANTED:
+		debugLogA("Server sent SNAC(x13,x%02x) - %s", ICQ_LISTS_AUTHGRANTED, "User granted us future authorization");
+		break;
+
+	case ICQ_LISTS_YOUWEREADDED:
+		handleRecvAdded(pBuffer, wBufferLength);
+		break;
+
+	case ICQ_LISTS_ERROR:
+		if (wBufferLength >= 2) {
+			WORD wError;
+			cookie_servlist_action* sc;
+
+			unpackWord(&pBuffer, &wError);
+
+			if (FindCookie(pSnacHeader->dwRef, NULL, (void**)&sc)) { // look for action cookie
+				debugLogA("Received server list error, action: %d, result: %d", sc->dwAction, wError);
+				FreeCookie(pSnacHeader->dwRef); // release cookie
+
+				if (sc->dwAction == SSA_CHECK_ROSTER) { // the serv-list is unavailable turn it off
+					icq_LogMessage(LOG_ERROR, LPGEN("Server contact list is unavailable, Miranda will use local contact list."));
+					m_bSsiEnabled = 0;
+					handleServUINSettings(wListenPort, info);
+				}
+				/// FIXME: properly release pending operations & cookie memory
+				SAFE_FREE((void**)&sc);
+			}
+			else LogFamilyError(ICQ_LISTS_FAMILY, wError);
+		}
+		break;
+
+	default:
+		debugLogA("Warning: Ignoring SNAC(x%02x,x%02x) - Unknown SNAC (Flags: %u, Ref: %u)", ICQ_LISTS_FAMILY, pSnacHeader->wSubtype, pSnacHeader->wFlags, pSnacHeader->dwRef);
+		break;
+	}
+}
+
+
+static int unpackServerListItem(BYTE **pbuf, WORD *pwLen, char *pszRecordName, WORD *pwGroupId, WORD *pwItemId, WORD *pwItemType, WORD *pwTlvLength)
+{
+	WORD wRecordNameLen;
+
+	// The name of the entry. If this is a group header, then this
+	// is the name of the group. If it is a plain contact list entry,
+	// then it's the UIN of the contact.
+	unpackWord(pbuf, &wRecordNameLen);
+	if (*pwLen < 10 + wRecordNameLen || wRecordNameLen >= MAX_PATH)
+		return 0; // Failure
+
+	unpackString(pbuf, pszRecordName, wRecordNameLen);
+	if (pszRecordName)
+		pszRecordName[wRecordNameLen] = '\0';
+
+	// The group identifier this entry belongs to. If 0, this is meta information or
+	// a contact without a group
+	unpackWord(pbuf, pwGroupId);
+
+	// The ID of this entry. Group headers have ID 0. Otherwise, this
+	// is a random number generated when the user is added to the
+	// contact list, or when the user is ignored. See CLI_ADDBUDDY.
+	unpackWord(pbuf, pwItemId);
+
+	// This field indicates what type of entry this is
+	unpackWord(pbuf, pwItemType);
+
+	// The length in bytes of the following TLV chain
+	unpackWord(pbuf, pwTlvLength);
+
+	*pwLen -= wRecordNameLen + 10;
+
+	return 1; // Success
+}
+
+
+void CIcqProto::handleServerCListRightsReply(BYTE *buf, WORD wLen)
+{
+	/* received list rights, store the item limits for future use */
+	oscar_tlv_chain* chain;
+
+	memset(m_wServerListLimits, -1, sizeof(m_wServerListLimits));
+	m_wServerListGroupMaxContacts = 0;
+	m_wServerListRecordNameMaxLength = 0xFFFF;
+
+	if (chain = readIntoTLVChain(&buf, wLen, 0)) {
+		// determine max number of contacts in a group
+		m_wServerListGroupMaxContacts = chain->getWord(0x0C, 1);
+		// determine length limit for server-list item's name
+		m_wServerListRecordNameMaxLength = chain->getWord(0x06, 1);
+
+		if (oscar_tlv *pTLV = chain->getTLV(0x04, 1)) { // limits for item types
+			WORD *pLimits = (WORD*)pTLV->pData;
+			for (int i = 0; i < pTLV->wLen / 2; i++) {
+				m_wServerListLimits[i] = (pLimits[i] & 0xFF) << 8 | (pLimits[i] >> 8);
+
+				if (i + 1 >= SIZEOF(m_wServerListLimits))
+					break;
+			}
+
+			debugLogA("SSI: Max %d contacts (%d per group), %d groups, %d permit, %d deny, %d ignore items.", m_wServerListLimits[SSI_ITEM_BUDDY], m_wServerListGroupMaxContacts, m_wServerListLimits[SSI_ITEM_GROUP], m_wServerListLimits[SSI_ITEM_PERMIT], m_wServerListLimits[SSI_ITEM_DENY], m_wServerListLimits[SSI_ITEM_IGNORE]);
+		}
+
+		disposeChain(&chain);
+	}
+}
+
+DWORD CIcqProto::updateServerGroupData(WORD wGroupId, void *groupData, int groupSize, DWORD dwOperationFlags)
+{
+	cookie_servlist_action* ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+	if (!ack) {
+		debugLogA("Updating of group on server list failed (malloc error)");
+		return 0;
+	}
+	ack->dwAction = SSA_GROUP_UPDATE;
+	ack->szGroupName = getServListGroupName(wGroupId);
+	ack->wGroupId = wGroupId;
+	
+	DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, ack);
+	return icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, ack->wGroupId, ack->szGroupName, groupData, groupSize, dwOperationFlags);
+}
+
+void CIcqProto::handleServerCListAck(cookie_servlist_action* sc, WORD wError)
+{
+	switch (sc->dwAction) {
+	case SSA_VISIBILITY:
+		if (wError)
+			debugLogA("Server visibility update failed, error %d", wError);
+		break;
+
+	case SSA_CONTACT_UPDATE:
+		servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, wError ? PENDING_RESULT_FAILED : PENDING_RESULT_SUCCESS);
+		if (wError) {
+			debugLogA("Updating of server contact failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Updating of server contact failed."));
+		}
+		break;
+
+	case SSA_PRIVACY_ADD:
+		if (wError) {
+			debugLogA("Adding of privacy item to server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Adding of privacy item to server list failed."));
+		}
+		break;
+
+	case SSA_PRIVACY_REMOVE:
+		if (wError) {
+			debugLogA("Removing of privacy item from server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Removing of privacy item from server list failed."));
+		}
+		FreeServerID(sc->wContactId, SSIT_ITEM); // release server id
+		break;
+
+	case SSA_CONTACT_ADD:
+		if (wError) {
+			if (wError == 0xE) { // server refused to add contact w/o auth, add with
+				debugLogA("Contact could not be added without authorization, add with await auth flag.");
+
+				setByte(sc->hContact, "Auth", 1); // we need auth
+				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, sc->hContact, sc);
+				icq_sendServerContact(sc->hContact, dwCookie, ICQ_LISTS_ADDTOLIST, sc->wGroupId, sc->wContactId, SSOP_ITEM_ACTION | SSOF_CONTACT, 500, NULL);
+
+				sc = NULL; // we do not want it to be freed now
+				break;
+			}
+			FreeServerID(sc->wContactId, SSIT_ITEM);
+
+			debugLogA("Adding of contact to server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Adding of contact to server list failed."));
+
+			servlistPendingRemoveContact(sc->hContact, 0, sc->wGroupId, PENDING_RESULT_FAILED);
+
+			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here
+		}
+		else {
+			void* groupData;
+			int groupSize;
+
+			setWord(sc->hContact, DBSETTING_SERVLIST_ID, sc->wContactId);
+			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, sc->wGroupId);
+
+			servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, PENDING_RESULT_SUCCESS);
+
+			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) { // the group is not empty, just update it
+				updateServerGroupData(sc->wGroupId, groupData, groupSize, SSOF_END_OPERATION);
+				SAFE_FREE((void**)&groupData);
+			}
+			else { // this should never happen
+				debugLogA("Group update failed.");
+				servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here
+			}
+		}
+		break;
+
+	case SSA_GROUP_ADD:
+		if (wError) {
+			FreeServerID(sc->wGroupId, SSIT_GROUP);
+			debugLogA("Adding of group to server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Adding of group to server list failed."));
+
+			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_FAILED);
+		}
+		else { // group added, we need to update master group
+			void* groupData;
+			int groupSize;
+
+			setServListGroupName(sc->wGroupId, sc->szGroupName); // add group to namelist
+			{ // add group to known
+				char *szCListGroup = getServListGroupCListPath(sc->wGroupId);
+
+				// create link to the original CList group
+				setServListGroupLinkID(sc->szGroup, sc->wGroupId);
+
+				servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_SUCCESS);
+				SAFE_FREE((void**)&szCListGroup);
+			}
+
+			groupData = collectGroups(&groupSize);
+			groupData = SAFE_REALLOC(groupData, groupSize + 2);
+			*(((WORD*)groupData) + (groupSize >> 1)) = sc->wGroupId; // add this new group id
+			groupSize += 2;
+
+			cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+			if (ack) {
+				ack->dwAction = SSA_GROUP_UPDATE;
+
+				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, ack);
+				icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, 0, ack->szGroupName, groupData, groupSize, SSOF_END_OPERATION);
+			}
+			else // end server modifications here
+				servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100);
+
+			SAFE_FREE((void**)&groupData);
+		}
+		if (sc->szGroup != sc->szGroupName)
+			SAFE_FREE((void**)&sc->szGroup);
+
+		SAFE_FREE((void**)&sc->szGroupName);
+		break;
+
+	case SSA_CONTACT_REMOVE:
+		if (!wError) {
+			void* groupData;
+			int groupSize;
+
+			setWord(sc->hContact, DBSETTING_SERVLIST_ID, 0); // clear the values
+			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, 0);
+
+			FreeServerID(sc->wContactId, SSIT_ITEM);
+
+			servlistPendingRemoveContact(sc->hContact, 0, sc->wGroupId, PENDING_RESULT_SUCCESS);
+
+			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) { // the group is still not empty, just update it
+				updateServerGroupData(sc->wGroupId, groupData, groupSize, SSOF_END_OPERATION);
+			}
+			else // the group is empty, delete it
+			{
+				char *szGroup = getServListGroupCListPath(sc->wGroupId);
+
+				servlistRemoveGroup(szGroup, sc->wGroupId);
+				SAFE_FREE((void**)&szGroup);
+			}
+			SAFE_FREE((void**)&groupData); // free the memory
+		}
+		else {
+			debugLogA("Removing of contact from server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Removing of contact from server list failed."));
+
+			servlistPendingRemoveContact(sc->hContact, sc->wContactId, sc->wGroupId, PENDING_RESULT_FAILED);
+
+			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here
+		}
+		break;
+
+	case SSA_GROUP_UPDATE:
+		if (wError) {
+			debugLogA("Updating of group on server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Updating of group on server list failed."));
+		}
+		SAFE_FREE((void**)&sc->szGroupName);
+		break;
+
+	case SSA_GROUP_REMOVE:
+		SAFE_FREE((void**)&sc->szGroupName);
+		if (wError) {
+			debugLogA("Removing of group from server list failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Removing of group from server list failed."));
+
+			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_FAILED);
+
+			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here
+			SAFE_FREE((void**)&sc->szGroup);
+		}
+		else { // group removed, we need to update master group
+			void* groupData;
+			int groupSize;
+
+			setServListGroupName(sc->wGroupId, NULL); // clear group from namelist
+			FreeServerID(sc->wGroupId, SSIT_GROUP);
+			removeGroupPathLinks(sc->wGroupId);
+
+			servlistPendingRemoveGroup(sc->szGroup, 0, PENDING_RESULT_SUCCESS);
+			SAFE_FREE((void**)&sc->szGroup);
+
+			groupData = collectGroups(&groupSize);
+			sc->wGroupId = 0;
+			sc->dwAction = SSA_GROUP_UPDATE;
+			sc->szGroupName = NULL;
+			DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_UPDATEGROUP, 0, sc);
+
+			icq_sendServerGroup(dwCookie, ICQ_LISTS_UPDATEGROUP, 0, sc->szGroupName, groupData, groupSize, SSOF_END_OPERATION);
+			// end server modifications here
+
+			sc = NULL; // we do not want to be freed here
+
+			SAFE_FREE((void**)&groupData);
+		}
+		break;
+
+	case SSA_CONTACT_SET_GROUP:
+		// we moved contact to another group
+		if (sc->lParam == -1) // the first was an error
+			break;
+
+		if (wError) {
+			if (wError == 0x0E && sc->lParam == 1) { // second ack - adding failed with error 0x0E, try to add with AVAIT_AUTH flag
+				if (!getByte(sc->hContact, "Auth", 0)) { // we tried without AWAIT_AUTH, try again with it
+					debugLogA("Contact could not be added without authorization, add with await auth flag.");
+					setByte(sc->hContact, "Auth", 1); // we need auth
+				}
+				else { // we tried with AWAIT_AUTH, try again without
+					debugLogA("Contact count not be added awaiting authorization, try authorized.");
+					setByte(sc->hContact, "Auth", 0);
+				}
+				DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, sc->hContact, sc);
+				icq_sendServerContact(sc->hContact, dwCookie, ICQ_LISTS_ADDTOLIST, sc->wNewGroupId, sc->wNewContactId, SSOP_ITEM_ACTION | SSOF_CONTACT, 400, NULL);
+
+				sc->lParam = 2; // do not cycle
+				sc = NULL; // we do not want to be freed here
+				break;
+			}
+			FreeServerID(sc->wNewContactId, SSIT_ITEM);
+			debugLogA("Moving of user to another group on server list failed, error %d", wError);
+			icq_LogMessage(LOG_ERROR, LPGEN("Moving of user to another group on server list failed."));
+
+			servlistPendingRemoveContact(sc->hContact, 0, (WORD)(sc->lParam ? sc->wGroupId : sc->wNewGroupId), PENDING_RESULT_FAILED);
+
+			servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100); // end server modifications here
+
+			if (!sc->lParam) { // is this first ack ?
+				sc->lParam = -1;
+				sc = NULL; // this can't be freed here
+			}
+			break;
+		}
+
+		if (sc->lParam) { // is this the second ack ?
+			void* groupData;
+			int groupSize;
+			int bEnd = 1; // shall we end the sever modifications
+
+			setWord(sc->hContact, DBSETTING_SERVLIST_ID, sc->wNewContactId);
+			setWord(sc->hContact, DBSETTING_SERVLIST_GROUP, sc->wNewGroupId);
+
+			servlistPendingRemoveContact(sc->hContact, sc->wNewContactId, sc->wNewGroupId, PENDING_RESULT_SUCCESS);
+
+			if (groupData = collectBuddyGroup(sc->wGroupId, &groupSize)) // update the group we moved from
+			{ // the group is still not empty, just update it
+				updateServerGroupData(sc->wGroupId, groupData, groupSize, 0);
+				SAFE_FREE((void**)&groupData); // free the memory
+			}
+			else { // the group is empty, delete it
+				char* szGroup = getServListGroupCListPath(sc->wGroupId);
+
+				servlistRemoveGroup(szGroup, sc->wGroupId);
+				SAFE_FREE((void**)&szGroup);
+				bEnd = 0; // here the modifications go on
+			}
+
+			groupData = collectBuddyGroup(sc->wNewGroupId, &groupSize); // update the group we moved to
+			updateServerGroupData(sc->wNewGroupId, groupData, groupSize, bEnd ? SSOF_END_OPERATION : 0);
+			// end server modifications here
+			SAFE_FREE((void**)&groupData);
+
+		}
+		else // contact was deleted from server-list
+		{
+			delSetting(sc->hContact, DBSETTING_SERVLIST_ID);
+			delSetting(sc->hContact, DBSETTING_SERVLIST_GROUP);
+			FreeServerID(sc->wContactId, SSIT_ITEM); // release old contact id
+			sc->lParam = 1;
+			sc = NULL; // wait for second ack
+		}
+		break;
+
+	case SSA_CONTACT_FIX_AUTH:
+		if (wError) { // FIXME: something failed, we should handle it properly
+		}
+		break;
+
+	case SSA_GROUP_RENAME:
+		if (wError) {
+			debugLogA("Renaming of server group failed, error %d", wError);
+			icq_LogMessage(LOG_WARNING, LPGEN("Renaming of server group failed."));
+
+			servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_FAILED);
+		}
+		else {
+			setServListGroupName(sc->wGroupId, sc->szGroupName);
+			removeGroupPathLinks(sc->wGroupId);
+			{ // add group to known
+				char *szCListGroup = getServListGroupCListPath(sc->wGroupId);
+
+				/// FIXME: need to create link to the new group name before unique item name correction as well
+				setServListGroupLinkID(szCListGroup, sc->wGroupId);
+				SAFE_FREE((void**)&szCListGroup);
+			}
+			servlistPendingRemoveGroup(sc->szGroup, sc->wGroupId, PENDING_RESULT_SUCCESS);
+		}
+		SAFE_FREE((void**)&sc->szGroupName);
+		SAFE_FREE((void**)&sc->szGroup);
+		break;
+
+	case SSA_SETAVATAR:
+		if (wError) {
+			debugLogA("Uploading of avatar hash failed.");
+			if (sc->wGroupId) { // is avatar added or updated?
+				FreeServerID(sc->wContactId, SSIT_ITEM);
+				delSetting(DBSETTING_SERVLIST_AVATAR); // to fix old versions
+			}
+		}
+		else setWord(DBSETTING_SERVLIST_AVATAR, sc->wContactId);
+		break;
+
+	case SSA_REMOVEAVATAR:
+		if (wError)
+			debugLogA("Removing of avatar hash failed.");
+		else {
+			FreeServerID(sc->wContactId, SSIT_ITEM);
+			delSetting(DBSETTING_SERVLIST_AVATAR);
+		}
+		break;
+
+	case SSA_SERVLIST_ACK:
+		ProtoBroadcastAck(sc->hContact, ICQACKTYPE_SERVERCLIST, wError ? ACKRESULT_FAILED : ACKRESULT_SUCCESS, (HANDLE)sc->lParam, wError);
+		break;
+
+	case SSA_IMPORT:
+		if (wError)
+			debugLogA("Re-starting import sequence failed, error %d", wError);
+		else {
+			setWord("SrvImportID", 0);
+			delSetting("ImportTS");
+		}
+		break;
+
+	default:
+		debugLogA("Server ack cookie type (%d) not recognized.", sc->dwAction);
+	}
+
+	SAFE_FREE((void**)&sc); // free the memory
+	return;
+}
+
+MCONTACT CIcqProto::HContactFromRecordName(const char* szRecordName, int *bAdded)
+{
+	MCONTACT hContact = INVALID_CONTACT_ID;
+
+	if (!IsStringUIN(szRecordName))  // probably AIM contact
+		hContact = HContactFromUID(0, szRecordName, bAdded);
+	else { // this should be ICQ number
+		DWORD dwUin = atoi(szRecordName);
+		hContact = HContactFromUIN(dwUin, bAdded);
+	}
+	return hContact;
+}
+
+int CIcqProto::getServerDataFromItemTLV(oscar_tlv_chain* pChain, unsigned char *buf) /// FIXME: need to keep original order
+{
+	// get server-list item's TLV data
+	oscar_tlv_chain* list = pChain;
+	int datalen = 0;
+	icq_packet pBuf;
+
+	// Initialize our handy data buffer
+	pBuf.wPlace = 0;
+	pBuf.pData = buf;
+
+	while (list) { // collect non-standard TLVs and save them to DB
+		if (list->tlv.wType != SSI_TLV_AWAITING_AUTH &&
+			 list->tlv.wType != SSI_TLV_NAME &&
+			 list->tlv.wType != SSI_TLV_COMMENT &&
+			 list->tlv.wType != SSI_TLV_METAINFO_TOKEN &&
+			 list->tlv.wType != SSI_TLV_METAINFO_TIME) { // only TLVs which we do not handle on our own
+			packTLV(&pBuf, list->tlv.wType, list->tlv.wLen, list->tlv.pData);
+
+			datalen += list->tlv.wLen + 4;
+		}
+		list = list->next;
+	}
+	return datalen;
+}
+
+void CIcqProto::handleServerCListReply(BYTE *buf, WORD wLen, WORD wFlags, serverthread_info *info)
+{
+	BYTE bySSIVersion;
+	WORD wRecordCount;
+	WORD wRecord;
+	WORD wGroupId;
+	WORD wItemId;
+	WORD wTlvType;
+	WORD wTlvLength;
+	BOOL bIsLastPacket;
+	uid_str szRecordName;
+	oscar_tlv_chain* pChain = NULL;
+	oscar_tlv* pTLV = NULL;
+	char *szActiveSrvGroup = NULL;
+	WORD wActiveSrvGroupId = -1;
+
+
+	// If flag bit 1 is set, this is not the last
+	// packet. If it is 0, this is the last packet
+	// and there will be a timestamp at the end.
+	if (wFlags & 0x0001)
+		bIsLastPacket = FALSE;
+	else
+		bIsLastPacket = TRUE;
+
+	if (wLen < 3)
+		return;
+
+	// Version number of SSI protocol?
+	unpackByte(&buf, &bySSIVersion);
+	wLen -= 1;
+
+	// Total count of following entries. This is the size of the server
+	// side contact list and should be saved and sent with CLI_CHECKROSTER.
+	// NOTE: When the entries are split up in several packets, each packet
+	// has it's own count and they must be added to get the total size of
+	// server list.
+	unpackWord(&buf, &wRecordCount);
+	wLen -= 2;
+	debugLogA("SSI: number of entries is %u, version is %u", wRecordCount, bySSIVersion);
+
+	// Loop over all items in the packet
+	for (wRecord = 0; wRecord < wRecordCount; wRecord++) {
+		debugLogA("SSI: parsing record %u", wRecord + 1);
+
+		if (wLen < 10) { // minimum: name length (zero), group ID, item ID, empty TLV
+			debugLogA("Warning: SSI parsing error (%d)", 0);
+			break;
+		}
+
+		if (!unpackServerListItem(&buf, &wLen, szRecordName, &wGroupId, &wItemId, &wTlvType, &wTlvLength)) { // unpack basic structure
+			debugLogA("Warning: SSI parsing error (%d)", 1);
+			break;
+		}
+
+		debugLogA("Name: '%s', GroupID: %u, EntryID: %u, EntryType: %u, TLVlength: %u",
+					 szRecordName, wGroupId, wItemId, wTlvType, wTlvLength);
+
+		if (wLen < wTlvLength) {
+			debugLogA("Warning: SSI parsing error (%d)", 2);
+			break;
+		}
+
+		// Initialize the tlv chain
+		if (wTlvLength > 0) {
+			pChain = readIntoTLVChain(&buf, wTlvLength, 0);
+			wLen -= wTlvLength;
+		}
+		else pChain = NULL;
+
+		switch (wTlvType) {
+		case SSI_ITEM_BUDDY:
+			{
+				/* this is a contact */
+				int bAdded;
+				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);
+
+				if (hContact != INVALID_CONTACT_ID) {
+					int bRegroup = 0;
+					int bNicked = 0;
+
+					if (bAdded) { // Not already on list: added
+						debugLogA("SSI added new %s contact '%s'", "ICQ", szRecordName);
+
+						AddJustAddedContact(hContact);
+					}
+					else { // we should add new contacts and this contact was just added, show it
+						if (IsContactJustAdded(hContact)) {
+							setContactHidden(hContact, 0);
+							bAdded = 1; // we want details for new contacts
+						}
+						else debugLogA("SSI ignoring existing contact '%s'", szRecordName);
+
+						// Contact on server is always on list
+						db_set_b(hContact, "CList", "NotOnList", 0);
+					}
+
+					// Save group and item ID
+					setWord(hContact, DBSETTING_SERVLIST_ID, wItemId);
+					setWord(hContact, DBSETTING_SERVLIST_GROUP, wGroupId);
+					ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+					if (!bAdded && getByte("LoadServerDetails", DEFAULT_SS_LOAD)) { // check if the contact has been moved on the server
+						if (wActiveSrvGroupId != wGroupId || !szActiveSrvGroup) {
+							SAFE_FREE(&szActiveSrvGroup);
+							szActiveSrvGroup = getServListGroupCListPath(wGroupId);
+							wActiveSrvGroupId = wGroupId;
+						}
+						char *szLocalGroup = getContactCListGroup(hContact);
+
+						if (!strlennull(szLocalGroup)) { // no CListGroup
+							SAFE_FREE(&szLocalGroup);
+
+							szLocalGroup = null_strdup(DEFAULT_SS_GROUP);
+						}
+
+						if (strcmpnull(szActiveSrvGroup, szLocalGroup) &&
+							 (strlennull(szActiveSrvGroup) >= strlennull(szLocalGroup) || (szActiveSrvGroup && _strnicmp(szActiveSrvGroup, szLocalGroup, strlennull(szLocalGroup))))) { // contact moved to new group or sub-group or not to master group
+							bRegroup = 1;
+						}
+						if (bRegroup && !stricmpnull(DEFAULT_SS_GROUP, szActiveSrvGroup)) /// TODO: invent something more clever for "root" group
+						{ // is it the default "General" group ?
+							bRegroup = 0; // if yes, do not move to it - cause it would hide the contact
+						}
+						SAFE_FREE(&szLocalGroup);
+					}
+
+					if (bRegroup || bAdded) { // if we should load server details or contact was just added, update its group
+						if (wActiveSrvGroupId != wGroupId || !szActiveSrvGroup) {
+							SAFE_FREE(&szActiveSrvGroup);
+							szActiveSrvGroup = getServListGroupCListPath(wGroupId);
+							wActiveSrvGroupId = wGroupId;
+						}
+
+						if (szActiveSrvGroup) { // try to get Miranda Group path from groupid, if succeeded save to db
+							moveContactToCListGroup(hContact, szActiveSrvGroup);
+						}
+					}
+
+					if (pChain) { // Look for nickname TLV and copy it to the db if necessary
+						if (pTLV = pChain->getTLV(SSI_TLV_NAME, 1)) {
+							if (pTLV->pData && (pTLV->wLen > 0)) {
+								char *pszNick;
+								WORD wNickLength;
+
+								wNickLength = pTLV->wLen;
+
+								pszNick = (char*)SAFE_MALLOC(wNickLength + 1);
+								// Copy buffer to utf-8 buffer
+								memcpy(pszNick, pTLV->pData, wNickLength);
+								pszNick[wNickLength] = 0; // Terminate string
+
+								debugLogA("Nickname is '%s'", pszNick);
+
+								bNicked = 1;
+
+								// Write nickname to database
+								if (getByte("LoadServerDetails", DEFAULT_SS_LOAD) || bAdded) { // if just added contact, save details always - does no harm
+									char *szOldNick;
+
+									if (szOldNick = getSettingStringUtf(hContact, "CList", "MyHandle", NULL)) {
+										if ((strcmpnull(szOldNick, pszNick)) && (strlennull(pszNick) > 0)) { // check if the truncated nick changed, i.e. do not overwrite locally stored longer nick
+											if (strlennull(szOldNick) <= strlennull(pszNick) || strncmp(szOldNick, pszNick, null_strcut(szOldNick, MAX_SSI_TLV_NAME_SIZE))) {
+												// Yes, we really do need to delete it first. Otherwise the CLUI nick
+												// cache isn't updated (I'll look into it)
+												db_unset(hContact, "CList", "MyHandle");
+												db_set_utf(hContact, "CList", "MyHandle", pszNick);
+											}
+										}
+										SAFE_FREE(&szOldNick);
+									}
+									else if (strlennull(pszNick) > 0) {
+										db_unset(hContact, "CList", "MyHandle");
+										db_set_utf(hContact, "CList", "MyHandle", pszNick);
+									}
+								}
+								SAFE_FREE(&pszNick);
+							}
+							else debugLogA("Invalid nickname");
+						}
+						if (bAdded && !bNicked)
+							icq_QueueUser(hContact); // queue user without nick for fast auto info update
+
+						// Look for comment TLV and copy it to the db if necessary
+						if (pTLV = pChain->getTLV(SSI_TLV_COMMENT, 1)) {
+							if (pTLV->pData && (pTLV->wLen > 0)) {
+								char *pszComment;
+								WORD wCommentLength;
+
+
+								wCommentLength = pTLV->wLen;
+
+								pszComment = (char*)SAFE_MALLOC(wCommentLength + 1);
+								// Copy buffer to utf-8 buffer
+								memcpy(pszComment, pTLV->pData, wCommentLength);
+								pszComment[wCommentLength] = 0; // Terminate string
+
+								debugLogA("Comment is '%s'", pszComment);
+
+								// Write comment to database
+								if (getByte("LoadServerDetails", DEFAULT_SS_LOAD) || bAdded) { // if just added contact, save details always - does no harm
+									char *szOldComment;
+
+									if (szOldComment = getSettingStringUtf(hContact, "UserInfo", "MyNotes", NULL)) {
+										if ((strcmpnull(szOldComment, pszComment)) && (strlennull(pszComment) > 0)) // check if the truncated comment changed, i.e. do not overwrite locally stored longer comment
+											if (strlennull(szOldComment) <= strlennull(pszComment) || strncmp((char*)szOldComment, (char*)pszComment, null_strcut(szOldComment, MAX_SSI_TLV_COMMENT_SIZE)))
+												db_set_utf(hContact, "UserInfo", "MyNotes", pszComment);
+
+										SAFE_FREE((void**)&szOldComment);
+									}
+									else if (strlennull(pszComment) > 0)
+										db_set_utf(hContact, "UserInfo", "MyNotes", pszComment);
+								}
+								SAFE_FREE((void**)&pszComment);
+							}
+							else debugLogA("Invalid comment");
+						}
+
+						// Look for need-authorization TLV
+						if (pChain->getTLV(SSI_TLV_AWAITING_AUTH, 1)) {
+							setByte(hContact, "Auth", 1);
+							debugLogA("SSI contact need authorization");
+						}
+						else setByte(hContact, "Auth", 0);
+
+						if (pTLV = pChain->getTLV(SSI_TLV_METAINFO_TOKEN, 1)) {
+							setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pTLV->pData, pTLV->wLen);
+							if (pChain->getTLV(SSI_TLV_METAINFO_TIME, 1))
+								setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pChain->getDouble(SSI_TLV_METAINFO_TIME, 1));
+							debugLogA("SSI contact has meta info token");
+						}
+						else {
+							delSetting(hContact, DBSETTING_METAINFO_TOKEN);
+							delSetting(hContact, DBSETTING_METAINFO_TIME);
+						}
+
+							{ // store server-list item's TLV data
+								BYTE* data = (BYTE*)SAFE_MALLOC(wTlvLength);
+								int datalen = getServerDataFromItemTLV(pChain, data);
+
+								if (datalen > 0)
+									setSettingBlob(hContact, DBSETTING_SERVLIST_DATA, data, datalen);
+								else
+									delSetting(hContact, DBSETTING_SERVLIST_DATA);
+
+								SAFE_FREE((void**)&data);
+							}
+					}
+				}
+				else // failed to add or other error
+					debugLogA("SSI failed to handle %s Item '%s'", "Buddy", szRecordName);
+			}
+			break;
+
+		case SSI_ITEM_GROUP:
+			if ((wGroupId == 0) && (wItemId == 0)) {
+				/* list of groups. wTlvType=1, data is TLV(C8) containing list of WORDs which */
+				/* is the group ids
+				/* we don't need to use this. Our processing is on-the-fly */
+				/* this record is always sent first in the first packet only, */
+			}
+			else if (wGroupId != 0) {
+				/* wGroupId != 0: a group record */
+				if (wItemId == 0) { /* no item ID: this is a group */
+					/* pszRecordName is the name of the group */
+					ReserveServerID(wGroupId, SSIT_GROUP, 0);
+
+					setServListGroupName(wGroupId, szRecordName);
+
+					debugLogA("Group %s added to known groups.", szRecordName);
+
+					/* demangle full grouppath, set it to known */
+					SAFE_FREE(&szActiveSrvGroup);
+					szActiveSrvGroup = getServListGroupCListPath(wGroupId);
+					wActiveSrvGroupId = wGroupId;
+
+					/* TLV contains a TLV(C8) with a list of WORDs of contained contact IDs */
+					/* our processing is good enough that we don't need this duplication */
+				}
+				else debugLogA("Unhandled type 0x01, wItemID != 0");
+			}
+			else debugLogA("Unhandled type 0x01");
+			break;
+
+		case SSI_ITEM_PERMIT:
+			{
+				/* item on visible list */
+				/* wItemId not related to contact ID */
+				/* pszRecordName is the UIN */
+				int bAdded;
+				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);
+
+				if (hContact != INVALID_CONTACT_ID) {
+					if (bAdded) {
+						debugLogA("SSI added new %s contact '%s'", "Permit", szRecordName);
+						// It wasn't previously in the list, we hide it so it only appears in the visible list
+						setContactHidden(hContact, 1);
+						// Add it to the list, so it can be added properly if proper contact
+						AddJustAddedContact(hContact);
+					}
+					else debugLogA("SSI %s contact already exists '%s'", "Permit", szRecordName);
+
+					// Save permit ID
+					setWord(hContact, DBSETTING_SERVLIST_PERMIT, wItemId);
+					ReserveServerID(wItemId, SSIT_ITEM, 0);
+					// Set apparent mode
+					setWord(hContact, "ApparentMode", ID_STATUS_ONLINE);
+					debugLogA("Visible-contact (%s)", szRecordName);
+				}
+				else { // failed to add or other error
+					debugLogA("SSI failed to handle %s Item '%s'", "Permit", szRecordName);
+					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+				}
+			}
+			break;
+
+		case SSI_ITEM_DENY:
+			{
+				/* Item on invisible list */
+				/* wItemId not related to contact ID */
+				/* pszRecordName is the UIN */
+				int bAdded;
+				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);
+
+				if (hContact != INVALID_CONTACT_ID) {
+					if (bAdded) {
+						/* not already on list: added */
+						debugLogA("SSI added new %s contact '%s'", "Deny", szRecordName);
+						// It wasn't previously in the list, we hide it so it only appears in the visible list
+						setContactHidden(hContact, 1);
+						// Add it to the list, so it can be added properly if proper contact
+						AddJustAddedContact(hContact);
+					}
+					else debugLogA("SSI %s contact already exists '%s'", "Deny", szRecordName);
+
+					// Save Deny ID
+					setWord(hContact, DBSETTING_SERVLIST_DENY, wItemId);
+					ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+					// Set apparent mode
+					setWord(hContact, "ApparentMode", ID_STATUS_OFFLINE);
+					debugLogA("Invisible-contact (%s)", szRecordName);
+				}
+				else { // failed to add or other error
+					debugLogA("SSI failed to handle %s Item '%s'", "Deny", szRecordName);
+					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+				}
+			}
+			break;
+
+		case SSI_ITEM_VISIBILITY: /* My visibility settings */
+			// Look for visibility TLV
+			if (BYTE bVisibility = pChain->getByte(SSI_TLV_VISIBILITY, 1)) { // found it, store the id, we do not need current visibility - we do not rely on it
+				setWord(DBSETTING_SERVLIST_PRIVACY, wItemId);
+				ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+				debugLogA("Visibility is %u", bVisibility);
+			}
+			else ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+			break;
+
+		case SSI_ITEM_IGNORE:
+			{
+				/* item on ignore list */
+				/* wItemId not related to contact ID */
+				/* pszRecordName is the UIN */
+				int bAdded;
+				MCONTACT hContact = HContactFromRecordName(szRecordName, &bAdded);
+
+				if (hContact != INVALID_CONTACT_ID) {
+					if (bAdded) {
+						/* not already on list: add */
+						debugLogA("SSI added new %s contact '%s'", "Ignore", szRecordName);
+						// It wasn't previously in the list, we hide it
+						setContactHidden(hContact, 1);
+						// Add it to the list, so it can be added properly if proper contact
+						AddJustAddedContact(hContact);
+					}
+					else debugLogA("SSI %s contact already exists '%s'", "Ignore", szRecordName);
+
+					// Save Ignore ID
+					setWord(hContact, DBSETTING_SERVLIST_IGNORE, wItemId);
+					ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+					// Set apparent mode & ignore
+					setWord(hContact, "ApparentMode", ID_STATUS_OFFLINE);
+					// set ignore all events
+					CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_ALL);
+					debugLogA("Ignore-contact (%s)", szRecordName);
+				}
+				else { // failed to add or other error
+					debugLogA("SSI failed to handle %s Item '%s'", "Ignore", szRecordName);
+					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+				}
+			}
+			break;
+
+		case SSI_ITEM_UNKNOWN2:
+			debugLogA("SSI unknown type 0x11");
+
+			ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+			break;
+
+		case SSI_ITEM_IMPORTTIME:
+			if (wGroupId == 0) {
+				/* time our list was first imported */
+				/* pszRecordName is "Import Time" */
+				/* data is TLV(13) {TLV(D4) {time_t importTime}} */
+				setDword("ImportTS", pChain->getDWord(SSI_TLV_TIMESTAMP, 1));
+				setWord("SrvImportID", wItemId);
+				ReserveServerID(wItemId, SSIT_ITEM, 0);
+				debugLogA("SSI %s item recognized", "first import");
+			}
+			break;
+
+		case SSI_ITEM_BUDDYICON:
+			if (wGroupId == 0) {
+				/* our avatar MD5-hash */
+				/* pszRecordName is "1" */
+				/* data is TLV(D5) hash */
+				/* we ignore this, just save the id */
+				/* cause we get the hash again after login */
+				if (!strcmpnull(szRecordName, "12")) { // need to handle Photo Item separately
+					setWord(DBSETTING_SERVLIST_PHOTO, wItemId);
+					debugLogA("SSI %s item recognized", "Photo");
+				}
+				else {
+					setWord(DBSETTING_SERVLIST_AVATAR, wItemId);
+					debugLogA("SSI %s item recognized", "Avatar");
+				}
+				ReserveServerID(wItemId, SSIT_ITEM, 0);
+			}
+			break;
+
+		case SSI_ITEM_METAINFO:
+			if (wGroupId == 0) {
+				/* our meta info token & last update time */
+				/* pszRecordName is "ICQ-MDIR" */
+				/* data is TLV(15C) and TLV(15D) */
+				oscar_tlv* pToken = pChain->getTLV(SSI_TLV_METAINFO_TOKEN, 1);
+				oscar_tlv* pTime = pChain->getTLV(SSI_TLV_METAINFO_TIME, 1);
+				if (pToken)
+					setSettingBlob(NULL, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);
+				if (pTime)
+					setSettingDouble(NULL, DBSETTING_METAINFO_TIME, pChain->getDouble(SSI_TLV_METAINFO_TIME, 1));
+
+				setWord(DBSETTING_SERVLIST_METAINFO, wItemId);
+				ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+				debugLogA("SSI %s item recognized", "Meta info");
+			}
+			break;
+
+		case SSI_ITEM_CLIENTDATA:
+			if (wGroupId == 0) {
+				/* ICQ2k ShortcutBar Items */
+				/* data is TLV(CD) text */
+				if (wItemId)
+					ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+			}
+
+		case SSI_ITEM_SAVED:
+		case SSI_ITEM_PREAUTH:
+			break;
+
+		default:
+			debugLogA("SSI unhandled item %2x", wTlvType);
+
+			if (wItemId)
+				ReserveServerID(wItemId, SSIT_ITEM, SSIF_UNHANDLED);
+			break;
+		}
+
+		disposeChain(&pChain);
+	} // end for
+
+	// Release Memory
+	SAFE_FREE(&szActiveSrvGroup);
+
+	debugLogA("Bytes left: %u", wLen);
+
+	setWord("SrvRecordCount", (WORD)(wRecord + getWord("SrvRecordCount", 0)));
+
+	if (bIsLastPacket) {
+		// No contacts left to sync
+		bIsSyncingCL = FALSE;
+
+		StoreServerIDs();
+
+		icq_RescanInfoUpdate();
+
+		if (wLen >= 4) {
+			DWORD dwLastUpdateTime;
+
+			/* finally we get a time_t of the last update time */
+			unpackDWord(&buf, &dwLastUpdateTime);
+			setDword("SrvLastUpdate", dwLastUpdateTime);
+			debugLogA("Last update of server list was (%u) %s", dwLastUpdateTime, time2text(dwLastUpdateTime));
+
+			sendRosterAck();
+			handleServUINSettings(wListenPort, info);
+
+			servlistProcessLogin();
+		}
+		else debugLogA("Last packet missed update time...");
+
+		if (getWord("SrvRecordCount", 0) == 0) { // we got empty serv-list, create master group
+			cookie_servlist_action* ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+			if (ack) {
+				DWORD dwCookie;
+
+				ack->dwAction = SSA_GROUP_UPDATE;
+				ack->szGroupName = null_strdup("");
+				dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_ADDTOLIST, 0, ack);
+				icq_sendServerGroup(dwCookie, ICQ_LISTS_ADDTOLIST, 0, ack->szGroupName, NULL, 0, 0);
+			}
+		}
+		// serv-list sync finished, clear just added contacts
+		FlushJustAddedContacts();
+	}
+	else debugLogA("Waiting for more packets");
+}
+
+void CIcqProto::handleServerCListItemAdd(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)
+{
+	if (wItemType == SSI_ITEM_IMPORTTIME) {
+		if (pItemData) {
+			setDword("ImportTS", pItemData->getDWord(SSI_TLV_TIMESTAMP, 1));
+			setWord("SrvImportID", wItemId);
+			ReserveServerID(wItemId, SSIT_ITEM, 0);
+
+			debugLogA("Server added Import timestamp to list");
+			return;
+		}
+	}
+	// Reserve server-list ID
+	ReserveServerID(wItemId, wItemType == SSI_ITEM_GROUP ? SSIT_GROUP : SSIT_ITEM, SSIF_UNHANDLED);
+}
+
+void CIcqProto::handleServerCListItemUpdate(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)
+{
+	MCONTACT hContact = (wItemType == SSI_ITEM_BUDDY || wItemType == SSI_ITEM_DENY || wItemType == SSI_ITEM_PERMIT || wItemType == SSI_ITEM_IGNORE) ? HContactFromRecordName(szRecordName, NULL) : NULL;
+
+	if (hContact != INVALID_CONTACT_ID && wItemType == SSI_ITEM_BUDDY) { // a contact was updated on server
+		if (pItemData) {
+			oscar_tlv *pAuth = pItemData->getTLV(SSI_TLV_AWAITING_AUTH, 1);
+			BYTE bAuth = getByte(hContact, "Auth", 0);
+
+			if (bAuth && !pAuth) { // server authorized our contact
+				char str[MAX_PATH];
+				char msg[MAX_PATH];
+				char *nick = NickFromHandleUtf(hContact);
+
+				setByte(hContact, "Auth", 0);
+				mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" was authorized in the server list."), msg, MAX_PATH), nick);
+				icq_LogMessage(LOG_WARNING, str);
+				SAFE_FREE(&nick);
+			}
+			else if (!bAuth && pAuth) { // server took away authorization of our contact
+				char str[MAX_PATH];
+				char msg[MAX_PATH];
+				char *nick = NickFromHandleUtf(hContact);
+
+				setByte(hContact, "Auth", 1);
+				mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" lost its authorization in the server list."), msg, MAX_PATH), nick);
+				icq_LogMessage(LOG_WARNING, str);
+				SAFE_FREE(&nick);
+			}
+			{
+				// update metainfo data
+				DBVARIANT dbv = { 0 };
+				oscar_tlv *pToken = pItemData->getTLV(SSI_TLV_METAINFO_TOKEN, 1);
+				oscar_tlv *pTime = pItemData->getTLV(SSI_TLV_METAINFO_TIME, 1);
+
+				if (!getSetting(hContact, DBSETTING_METAINFO_TOKEN, &dbv)) {
+					if (!pToken || dbv.cpbVal != pToken->wLen || memcmp(dbv.pbVal, pToken->pData, dbv.cpbVal)) {
+						if (!pToken)
+							debugLogA("Contact %s, meta info token removed", szRecordName);
+						else
+							debugLogA("Contact %s, meta info token changed", szRecordName);
+
+						// user info was changed, refresh
+						if (IsMetaInfoChanged(hContact))
+							icq_QueueUser(hContact);
+					}
+
+					db_free(&dbv);
+				}
+				else if (pToken) {
+					debugLogA("Contact %s, meta info token added", szRecordName);
+
+					// user info was changed, refresh
+					if (IsMetaInfoChanged(hContact))
+						icq_QueueUser(hContact);
+				}
+
+				if (pToken)
+					setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);
+				if (pTime)
+					setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pItemData->getDouble(SSI_TLV_METAINFO_TIME, 1));
+			}
+			{
+				// update server's data - otherwise consequent operations can fail with 0x0E
+				BYTE *data = (BYTE*)_alloca(pItemData->getChainLength());
+				int datalen = getServerDataFromItemTLV(pItemData, data);
+
+				if (datalen > 0)
+					setSettingBlob(hContact, DBSETTING_SERVLIST_DATA, data, datalen);
+				else
+					delSetting(hContact, DBSETTING_SERVLIST_DATA);
+			}
+		}
+	}
+	else if (wItemType == SSI_ITEM_METAINFO) { // owner MetaInfo data updated
+		if (pItemData) {
+			DBVARIANT dbv = { 0 };
+			oscar_tlv *pToken = pItemData->getTLV(SSI_TLV_METAINFO_TOKEN, 1);
+			oscar_tlv *pTime = pItemData->getTLV(SSI_TLV_METAINFO_TIME, 1);
+
+			if (!getSetting(hContact, DBSETTING_METAINFO_TOKEN, &dbv)) {
+				if (!pToken || dbv.cpbVal != pToken->wLen || memcmp(dbv.pbVal, pToken->pData, dbv.cpbVal)) {
+					if (!pToken)
+						debugLogA("Owner meta info token removed");
+					else
+						debugLogA("Owner meta info token changed");
+				}
+
+				db_free(&dbv);
+			}
+
+			if (pToken)
+				setSettingBlob(hContact, DBSETTING_METAINFO_TOKEN, pToken->pData, pToken->wLen);
+			if (pTime)
+				setSettingDouble(hContact, DBSETTING_METAINFO_TIME, pItemData->getDouble(SSI_TLV_METAINFO_TIME, 1));
+		}
+	}
+	else if (wItemType == SSI_ITEM_GROUP) // group updated
+		debugLogA("Server updated our group \"%s\" on list", szRecordName);
+}
+
+void CIcqProto::handleServerCListItemDelete(const char *szRecordName, WORD wGroupId, WORD wItemId, WORD wItemType, oscar_tlv_chain *pItemData)
+{
+	MCONTACT hContact = (wItemType == SSI_ITEM_BUDDY || wItemType == SSI_ITEM_DENY || wItemType == SSI_ITEM_PERMIT || wItemType == SSI_ITEM_IGNORE) ? HContactFromRecordName(szRecordName, NULL) : NULL;
+
+	if (hContact != INVALID_CONTACT_ID && wItemType == SSI_ITEM_BUDDY) { // a contact was removed from our list
+		if (getWord(hContact, DBSETTING_SERVLIST_ID, 0) == wItemId) {
+			delSetting(hContact, DBSETTING_SERVLIST_ID);
+			delSetting(hContact, DBSETTING_SERVLIST_GROUP);
+			delSetting(hContact, "Auth");
+
+			char str[MAX_PATH];
+			char msg[MAX_PATH];
+			char *nick = NickFromHandleUtf(hContact);
+
+			mir_snprintf(str, MAX_PATH, ICQTranslateUtfStatic(LPGEN("User \"%s\" was removed from server list."), msg, MAX_PATH), nick);
+			icq_LogMessage(LOG_WARNING, str);
+			SAFE_FREE(&nick);
+		}
+	}
+	// Release server-list ID
+	FreeServerID(wItemId, wItemType == SSI_ITEM_GROUP ? SSIT_GROUP : SSIT_ITEM);
+}
+
+void CIcqProto::handleRecvAuthRequest(unsigned char *buf, WORD wLen)
+{
+	DWORD dwUin;
+	uid_str szUid;
+	if (!unpackUID(&buf, &wLen, &dwUin, &szUid))
+		return;
+
+	if (dwUin && IsOnSpammerList(dwUin)) {
+		debugLogA("Ignored Message from known Spammer");
+		return;
+	}
+
+	WORD wReasonLen;
+	unpackWord(&buf, &wReasonLen);
+	wLen -= 2;
+	if (wReasonLen > wLen)
+		return;
+
+	int bAdded;
+	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);
+
+	PROTORECVEVENT pre = { 0 };
+	pre.timestamp = time(NULL);
+	pre.lParam = sizeof(DWORD) * 2 + 5;
+	// Prepare reason
+	char *szReason = (char*)SAFE_MALLOC(wReasonLen + 1);
+	int nReasonLen = 0;
+	if (szReason) {
+		memcpy(szReason, buf, wReasonLen);
+		szReason[wReasonLen] = '\0';
+		nReasonLen = strlennull(szReason);
+
+		char *temp = (char*)_alloca(nReasonLen + 2);
+		if (!IsUSASCII(szReason, nReasonLen) && UTF8_IsValid(szReason) && utf8_decode_static(szReason, temp, nReasonLen + 1))
+			pre.flags |= PREF_UTF;
+	}
+
+	// Read nick name from DB
+	char *szNick = NULL;
+	if (dwUin) {
+		DBVARIANT dbv = { 0 };
+		if (pre.flags & PREF_UTF)
+			szNick = getSettingStringUtf(hContact, "Nick", NULL);
+		else if (!getString(hContact, "Nick", &dbv)) {
+			szNick = null_strdup(dbv.pszVal);
+			db_free(&dbv);
+		}
+	}
+	else szNick = null_strdup(szUid);
+
+	int nNickLen = strlennull(szNick);
+
+	pre.lParam += nNickLen + nReasonLen;
+
+	setByte(hContact, "Grant", 1);
+
+	/*blob is: uin(DWORD), hcontact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ), reason(ASCIIZ)*/
+	char *szBlob = (char *)_alloca(pre.lParam);
+	char *pCurBlob = szBlob;
+	*(DWORD*)pCurBlob = dwUin; pCurBlob += sizeof(DWORD);
+	*(DWORD*)pCurBlob = DWORD(hContact); pCurBlob += sizeof(DWORD);
+
+	if (nNickLen) { // if we have nick we add it, otherwise keep trailing zero
+		memcpy(pCurBlob, szNick, nNickLen);
+		pCurBlob += nNickLen;
+	}
+	*pCurBlob = 0; pCurBlob++; // Nick
+	*pCurBlob = 0; pCurBlob++; // FirstName
+	*pCurBlob = 0; pCurBlob++; // LastName
+	*pCurBlob = 0; pCurBlob++; // email
+	if (nReasonLen) {
+		memcpy(pCurBlob, szReason, nReasonLen);
+		pCurBlob += nReasonLen;
+	}
+	*pCurBlob = 0; // Reason
+	pre.szMessage = szBlob;
+
+	// TODO: Change for new auth system, include all known informations
+	ProtoChainRecv(hContact, PSR_AUTH, 0, (LPARAM)&pre);
+
+	SAFE_FREE(&szNick);
+	SAFE_FREE(&szReason);
+}
+
+void CIcqProto::handleRecvAdded(unsigned char *buf, WORD wLen)
+{
+	DWORD dwUin;
+	uid_str szUid;
+	DWORD cbBlob;
+	PBYTE pBlob, pCurBlob;
+	int bAdded;
+	char* szNick;
+	int nNickLen;
+	DBVARIANT dbv = { 0 };
+
+	if (!unpackUID(&buf, &wLen, &dwUin, &szUid)) return;
+
+	if (dwUin && IsOnSpammerList(dwUin)) {
+		debugLogA("Ignored Message from known Spammer");
+		return;
+	}
+
+	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);
+
+	cbBlob = sizeof(DWORD) * 2 + 4;
+
+	if (dwUin) {
+		if (getString(hContact, "Nick", &dbv))
+			nNickLen = 0;
+		else {
+			szNick = dbv.pszVal;
+			nNickLen = strlennull(szNick);
+		}
+	}
+	else nNickLen = strlennull(szUid);
+
+	cbBlob += nNickLen;
+
+	pCurBlob = pBlob = (PBYTE)_alloca(cbBlob);
+	/*blob is: uin(DWORD), hContact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ) */
+	*(DWORD*)pCurBlob = dwUin; pCurBlob += sizeof(DWORD);
+	*(DWORD*)pCurBlob = DWORD(hContact); pCurBlob += sizeof(DWORD);
+	if (nNickLen && dwUin) { // if we have nick we add it, otherwise keep trailing zero
+		memcpy(pCurBlob, szNick, nNickLen);
+		pCurBlob += nNickLen;
+	}
+	else {
+		memcpy(pCurBlob, szUid, nNickLen);
+		pCurBlob += nNickLen;
+	}
+	*(char *)pCurBlob = 0; pCurBlob++;
+	*(char *)pCurBlob = 0; pCurBlob++;
+	*(char *)pCurBlob = 0; pCurBlob++;
+	*(char *)pCurBlob = 0;
+	// TODO: Change for new auth system
+
+	AddEvent(NULL, EVENTTYPE_ADDED, time(NULL), 0, cbBlob, pBlob);
+}
+
+void CIcqProto::handleRecvAuthResponse(unsigned char *buf, WORD wLen)
+{
+	DWORD dwUin;
+	uid_str szUid;
+	char* szNick = NULL;
+	WORD nReasonLen;
+	char* szReason;
+	int bAdded;
+
+	BYTE bResponse = 0xFF;
+
+	if (!unpackUID(&buf, &wLen, &dwUin, &szUid)) return;
+
+	if (dwUin && IsOnSpammerList(dwUin)) {
+		debugLogA("Ignored Message from known Spammer");
+		return;
+	}
+
+	MCONTACT hContact = HContactFromUID(dwUin, szUid, &bAdded);
+	if (hContact != INVALID_CONTACT_ID)
+		szNick = NickFromHandle(hContact);
+
+	if (wLen > 0) {
+		unpackByte(&buf, &bResponse);
+		wLen -= 1;
+	}
+	if (wLen >= 2) {
+		unpackWord(&buf, &nReasonLen);
+		wLen -= 2;
+		if (wLen >= nReasonLen) {
+			szReason = (char*)_alloca(nReasonLen + 1);
+			unpackString(&buf, szReason, nReasonLen);
+			szReason[nReasonLen] = '\0';
+		}
+	}
+
+	switch (bResponse) {
+	case 0:
+		debugLogA("Authorization request %s by %s", "denied", strUID(dwUin, szUid));
+		// TODO: Add to system history as soon as new auth system is ready
+		break;
+
+	case 1:
+		setByte(hContact, "Auth", 0);
+		debugLogA("Authorization request %s by %s", "granted", strUID(dwUin, szUid));
+		// TODO: Add to system history as soon as new auth system is ready
+		break;
+
+	default:
+		debugLogA("Unknown Authorization request response (%u) from %s", bResponse, strUID(dwUin, szUid));
+		break;
+
+	}
+	SAFE_FREE(&szNick);
+}
+
+// Updates the visibility code used while in SSI mode. If a server ID is
+// not stored in the local DB, a new ID will be added to the server list.
+//
+// Possible values are:
+//   01 - Allow all users to see you
+//   02 - Block all users from seeing you
+//   03 - Allow only users in the permit list to see you
+//   04 - Block only users in the invisible list from seeing you
+//   05 - Allow only users in the buddy list to see you
+//
+void CIcqProto::updateServVisibilityCode(BYTE bCode)
+{
+	icq_packet packet;
+	WORD wVisibilityID;
+	WORD wCommand;
+
+	if ((bCode > 0) && (bCode < 6)) {
+		cookie_servlist_action* ack;
+		DWORD dwCookie;
+		BYTE bVisibility = getByte("SrvVisibility", 0);
+
+		if (bVisibility == bCode) // if no change was made, not necescary to update that
+			return;
+		setByte("SrvVisibility", bCode);
+
+		// Do we have a known server visibility ID? We should, unless we just subscribed to the serv-list for the first time
+		if ((wVisibilityID = getWord(DBSETTING_SERVLIST_PRIVACY, 0)) == 0) {
+			// No, create a new random ID
+			wVisibilityID = GenerateServerID(SSIT_ITEM, 0);
+			setWord(DBSETTING_SERVLIST_PRIVACY, wVisibilityID);
+			wCommand = ICQ_LISTS_ADDTOLIST;
+
+			debugLogA("Made new srvVisibilityID, id is %u, code is %u", wVisibilityID, bCode);
+		}
+		else {
+			debugLogA("Reused srvVisibilityID, id is %u, code is %u", wVisibilityID, bCode);
+			wCommand = ICQ_LISTS_UPDATEGROUP;
+		}
+
+		ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+		if (!ack) {
+			debugLogA("Cookie alloc failure.");
+			return; // out of memory, go away
+		}
+
+		ack->dwAction = SSA_VISIBILITY; // update visibility
+		dwCookie = AllocateCookie(CKT_SERVERLIST, wCommand, 0, ack); // take cookie
+
+		// Build and send packet
+		serverPacketInit(&packet, 25);
+		packFNACHeader(&packet, ICQ_LISTS_FAMILY, wCommand, 0, dwCookie);
+		packWord(&packet, 0);                   // Name (null)
+		packWord(&packet, 0);                   // GroupID (0 if not relevant)
+		packWord(&packet, wVisibilityID);       // EntryID
+		packWord(&packet, SSI_ITEM_VISIBILITY); // EntryType
+		packWord(&packet, 5);                   // Length in bytes of following TLV
+		packTLV(&packet, SSI_TLV_VISIBILITY, 1, &bCode);  // TLV (Visibility)
+		sendServPacket(&packet);
+		// There is no need to send ICQ_LISTS_CLI_MODIFYSTART or
+		// ICQ_LISTS_CLI_MODIFYEND when modifying the visibility code
+	}
+}
+
+// Updates the avatar hash used while in SSI mode. If a server ID is
+// not stored in the local DB, a new ID will be added to the server list.
+void CIcqProto::updateServAvatarHash(BYTE *pHash, int size)
+{
+	void** pDoubleObject = NULL;
+	void* doubleObject = NULL;
+	DWORD dwOperationFlags = 0;
+	WORD wAvatarID;
+	WORD wCommand;
+	char szItemName[2] = { 0, 0 };
+	int bResetHash = 0;
+	DBVARIANT dbvHash;
+
+	if (!pHash)
+		return;
+
+	if (!getSetting(NULL, "AvatarHash", &dbvHash)) {
+		szItemName[0] = 0x30 + dbvHash.pbVal[1];
+
+		if (memcmp(pHash, dbvHash.pbVal, 2) != 0) // add code to remove old hash from server
+			bResetHash = 1;
+
+		db_free(&dbvHash);
+	}
+
+	if (bResetHash) { // start update session
+		// pair the packets (need to be send in the correct order
+		dwOperationFlags |= SSOF_BEGIN_OPERATION | SSOF_END_OPERATION;
+		pDoubleObject = &doubleObject;
+	}
+
+	if (bResetHash) {
+		// Do we have a known server avatar ID?
+		if (wAvatarID = getWord(DBSETTING_SERVLIST_AVATAR, 0)) {
+			cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+			if (!ack) {
+				debugLogA("Cookie alloc failure.");
+				return; // out of memory, go away
+			}
+			ack->dwAction = SSA_REMOVEAVATAR; // update avatar hash
+			ack->wContactId = wAvatarID;
+			DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_REMOVEFROMLIST, 0, ack); // take cookie
+			icq_sendServerItem(dwCookie, ICQ_LISTS_REMOVEFROMLIST, 0, wAvatarID, szItemName, NULL, 0, SSI_ITEM_BUDDYICON, SSOP_ITEM_ACTION | dwOperationFlags, 400, pDoubleObject);
+		}
+	}
+
+	WORD hashsize = size - 2;
+
+	// Do we have a known server avatar ID? We should, unless we just subscribed to the serv-list for the first time
+	if (bResetHash || (wAvatarID = getWord(DBSETTING_SERVLIST_AVATAR, 0)) == 0) {
+		// No, create a new random ID
+		wAvatarID = GenerateServerID(SSIT_ITEM, 0);
+		wCommand = ICQ_LISTS_ADDTOLIST;
+		debugLogA("Made new srvAvatarID, id is %u", wAvatarID);
+	}
+	else {
+		debugLogA("Reused srvAvatarID, id is %u", wAvatarID);
+		wCommand = ICQ_LISTS_UPDATEGROUP;
+	}
+
+	cookie_servlist_action *ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action));
+	if (!ack) {
+		debugLogA("Cookie alloc failure.");
+		return; // out of memory, go away
+	}
+	ack->dwAction = SSA_SETAVATAR; // update avatar hash
+	ack->wContactId = wAvatarID;
+	DWORD dwCookie = AllocateCookie(CKT_SERVERLIST, wCommand, 0, ack); // take cookie
+
+	szItemName[0] = 0x30 + pHash[1];
+
+	// Build the packet
+	WORD wTLVlen = 8 + hashsize;
+
+	// Initialize our handy data buffer
+	icq_packet pBuffer;
+	pBuffer.wPlace = 0;
+	pBuffer.pData = (BYTE *)_alloca(wTLVlen);
+	pBuffer.wLen = wTLVlen;
+
+	packTLV(&pBuffer, SSI_TLV_NAME, 0, NULL);                    // TLV (Name)
+	packTLV(&pBuffer, SSI_TLV_AVATARHASH, hashsize, pHash + 2);  // TLV (Hash)
+
+	icq_sendServerItem(dwCookie, wCommand, 0, wAvatarID, szItemName, pBuffer.pData, wTLVlen, SSI_ITEM_BUDDYICON, SSOP_ITEM_ACTION | dwOperationFlags, 400, pDoubleObject);
+	// There is no need to send ICQ_LISTS_CLI_MODIFYSTART or
+	// ICQ_LISTS_CLI_MODIFYEND when modifying the avatar hash
+}
+
+// Should be called before the server list is modified. When all
+// modifications are done, call icq_sendServerEndOperation().
+// Called automatically thru server-list update board!
+void CIcqProto::icq_sendServerBeginOperation(int bImport)
+{
+	WORD wImportID = getWord("SrvImportID", 0);
+
+	if (bImport && wImportID) { // we should be importing, check if already have import item
+		if (getDword("ImportTS", 0) + 604800 < getDword("LogonTS", 0)) { // is the timestamp week older, clear it and begin new import
+			DWORD dwCookie;
+			cookie_servlist_action* ack;
+
+			if (ack = (cookie_servlist_action*)SAFE_MALLOC(sizeof(cookie_servlist_action))) { // we have cookie good, go on
+				ack->dwAction = SSA_IMPORT;
+				dwCookie = AllocateCookie(CKT_SERVERLIST, ICQ_LISTS_REMOVEFROMLIST, 0, ack);
+
+				icq_sendSimpleItem(dwCookie, ICQ_LISTS_REMOVEFROMLIST, 0, "ImportTime", 0, wImportID, SSI_ITEM_IMPORTTIME, SSOP_ITEM_ACTION | SSOF_SEND_DIRECTLY, 100);
+			}
+		}
+	}
+
+	icq_packet packet;
+	serverPacketInit(&packet, (WORD)(bImport ? 14 : 10));
+	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_CLI_MODIFYSTART);
+	if (bImport)
+		packDWord(&packet, 1 << 0x10);
+	sendServPacket(&packet);
+}
+
+// Should be called after the server list has been modified to inform
+// the server that we are done.
+// Called automatically thru server-list update board!
+void CIcqProto::icq_sendServerEndOperation()
+{
+	icq_packet packet;
+	serverPacketInit(&packet, 10);
+	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_CLI_MODIFYEND);
+	sendServPacket(&packet);
+}
+
+// Sent when the last roster packet has been received
+void CIcqProto::sendRosterAck(void)
+{
+	icq_packet packet;
+	serverPacketInit(&packet, 10);
+	packFNACHeader(&packet, ICQ_LISTS_FAMILY, ICQ_LISTS_GOTLIST);
+	sendServPacket(&packet);
+
+	debugLogA("Sent SNAC(x13,x07) - CLI_ROSTERACK");
+}
diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 0787c06764..6a9f733296 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -283,7 +283,7 @@ void CIcqProto::handleAvatarOwnerHash(WORD wItemID, BYTE bFlags, BYTE *pData, BY
 				else if (memcmp(hash, pData + 4, 0x10)) { // we have different avatar, sync that

 					if (m_bSsiEnabled && getByte("ForceOurAvatar", 1)) { // we want our avatar, update hash

 						DWORD dwPaFormat = ::ProtoGetAvatarFileFormat(file);

-						BYTE *pHash = (BYTE*)_alloca(0x14);

+						BYTE pHash[0x14];

 

 						debugLogA("Our avatar is different, setting our new hash.");

 

@@ -291,7 +291,7 @@ void CIcqProto::handleAvatarOwnerHash(WORD wItemID, BYTE bFlags, BYTE *pData, BY
 						pHash[1] = dwPaFormat == PA_FORMAT_XML ? AVATAR_HASH_FLASH : AVATAR_HASH_STATIC;

 						pHash[2] = 1; // state of the hash

 						pHash[3] = 0x10; // len of the hash

-						memcpy(pHash + 4, hash, 0x10);

+						memcpy((pHash + 4), hash, 0x10);

 						updateServAvatarHash(pHash, 0x14);

 					}

 					else { // get avatar from server

@@ -346,7 +346,7 @@ void CIcqProto::handleAvatarOwnerHash(WORD wItemID, BYTE bFlags, BYTE *pData, BY
 				SAFE_FREE((void**)&hash);

 			}

 			else {

-				BYTE *pHash = (BYTE*)_alloca(0x14);

+				BYTE pHash[0x14];

 

 				debugLogA("Our file is different, set our new hash.");

 

@@ -354,7 +354,7 @@ void CIcqProto::handleAvatarOwnerHash(WORD wItemID, BYTE bFlags, BYTE *pData, BY
 				pHash[1] = dwPaFormat == PA_FORMAT_XML ? AVATAR_HASH_FLASH : AVATAR_HASH_STATIC;

 				pHash[2] = 1; // state of the hash

 				pHash[3] = 0x10; // len of the hash

-				memcpy(pHash + 4, hash, 0x10);

+				memcpy((pHash + 4), hash, 0x10);

 				updateServAvatarHash(pHash, 0x14);

 

 				SAFE_FREE((void**)&hash);

diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index 18accdf412..52ff1339da 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -509,13 +509,13 @@ INT_PTR CIcqProto::SetMyAvatar(WPARAM wParam, LPARAM lParam)
 

 		BYTE *hash = calcMD5HashOfFile(tszMyFile);

 		if (hash) {

-			BYTE *ihash = (BYTE*)_alloca(0x14);

+			BYTE ihash[0x14];

 			// upload hash to server

 			ihash[0] = 0;    //unknown

 			ihash[1] = dwPaFormat == PA_FORMAT_XML ? AVATAR_HASH_FLASH : AVATAR_HASH_STATIC; //hash type

 			ihash[2] = 1;    //hash status

 			ihash[3] = 0x10; //hash len

-			memcpy(ihash + 4, hash, 0x10);

+			memcpy((ihash + 4), hash, 0x10);

 			updateServAvatarHash(ihash, 0x14);

 

 			if (setSettingBlob(NULL, "AvatarHash", ihash, 0x14))