diff -r 576874e13a2c -r 486e9e9c45a7 commsfwutils/commsbufs/mbufgobblerlayer/src/mbufgobblerhelper.cpp
--- a/commsfwutils/commsbufs/mbufgobblerlayer/src/mbufgobblerhelper.cpp	Wed Sep 15 13:33:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Helper class supplying useful logging functions to the providers in the layer
-//
-//
-//  This is a 3-plane comms layer implementation example, which has been customised to be a test layer which gobbles and releases ESOCK MBUFs.
-//  The MBuf gobbling functionality can be disabled by undefining the macro SYMBIAN_COMMSFW_MBUF_GOBBLER which is specified in mbufgobblerproviders.mmp.
-//  When SYMBIAN_COMMSFW_MBUF_GOBBLER is undefined, the source code specified by mbufgobblerproviders.mmp becomes a pass through layer i.e. it passes the data
-//  through to the layer above or below without altering it. This makes it useful as a starting point for implementing your own layers / providers;
-//  useful documentation on how to customise your own passthrough layer can be found in ..\docs\MbufGobblerLayer.doc
-//
-/**
- @file
- @internalComponent
-*/
-
-#include "mbufgobblerhelper.h"
-#include "mbufgobblerlog.h"
-#include <elements/mm_node.h>
-#include <comms-infras/ss_nodeinterfaces.h>
-
-
-void MbufGobblerHelper::LogCreateDestroy(const TDesC8& aSubTag, const TDesC8& aNodeName, TAny* aNodePtr, TBool aIsCreate)
-	{
-	// to eradicate warnings on builds for which the LOG macro does nothing (e.g. urel)
-	(void)(aSubTag); (void)(aNodeName); (void)(aNodePtr); (void)(aIsCreate);
-	
-	if(aIsCreate)
-		{
-		LOG(aSubTag,_L8("%S (0x%x) Created"), &aNodeName, aNodePtr);
-		}		
-	else
-		{
-		LOG(aSubTag,_L8("%S (0x%x) Destroyed"), &aNodeName, aNodePtr);
-		}		
-	}
-
-void MbufGobblerHelper::LogMessage(const TDesC8& aSubTag, const TDesC8& aNodeName, TAny* aNodePtr, const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage)
-	{
-	// to eradicate warnings on builds for which the LOG macro does nothing (e.g. urel)
-	(void)(aSubTag); (void)(aNodeName); (void)(aNodePtr);
-
-	TInt msgId = aMessage.MessageId().MessageId();
-	TInt realm = aMessage.MessageId().Realm();
-	
-	TUint32 threadid_of_sender = aSender.Thread();
-	Messages::TNodeId nid = Messages::address_cast<Messages::TNodeId>(aSender);
-	TAny* ptr = nid.Ptr(); //this seems to be the only hting that can be used to print out something to address the node
-	TAny* rptr = aRecipient.Ptr();
-	__CFLOG_VAR((KMbufGobblerComponentTag, aSubTag,_L8("Node %S(0x%x) message received (msgid=%d, realm=0x%x), sender(0x%x threadID=%d)"), &aNodeName, rptr, msgId, realm, ptr, threadid_of_sender));
-	}
-
-void MbufGobblerHelper::PrintClientNodes(const TDesC8& aSubTag, const TDesC8& aNodeName, MeshMachine::AMMNodeBase& aNode, TInt& aClientCount)
-	{
-	// to eradicate warnings on builds for which the LOG macro does nothing (e.g. urel)
-	(void)(aSubTag); (void)(aNodeName);
-
-	TUint type = ESock::TCFClientType::EData | ESock::TCFClientType::ECtrl | ESock::TCFClientType::EServProvider | ESock::TCFClientType::ECtrlProvider;
-	TInt totclients =  	aNode.CountClients<Messages::TDefaultClientMatchPolicy>(type);
-	//only print if count different than previous
-	if(aClientCount != totclients)
-		{
-		aClientCount = 	totclients;
-		LOG(aSubTag,_L8("Printing Node %S(0x%x) info..."), &aNodeName, aNode.Id().Ptr());
-		LOG(aSubTag, _L8("\tTotal Num clients = %d"), totclients);
-		
-		//enumerate through clients	
-		Messages::TClientIter<Messages::TDefaultClientMatchPolicy> clientIter(aNode.GetClientIter<Messages::TDefaultClientMatchPolicy>(type));
-		Messages::RNodeInterface* client = clientIter++;
-		while (client)
-			{
-			
-			Messages::TNodeId id = client->RecipientId();
-			//look up node type
-			TBuf8<20> typlu;
-			switch(client->Type())
-				{
-				case ESock::TCFClientType::EUnknown:
-					typlu = _L8("EUnknown");
-					break;
-				case ESock::TCFClientType::EData:
-					typlu = _L8("EData");
-					break;
-				case ESock::TCFClientType::ECtrl:
-					typlu = _L8("ECtrl");
-					break;
-				case ESock::TCFClientType::EServProvider:
-					typlu = _L8("EServProvider");
-					break;
-				case ESock::TCFClientType::ECtrlProvider:
-					typlu = _L8("ECtrlProvider");
-					break;
-				default:
-					typlu = _L8("Unknown");
-					break;
-				}
-			LOG(aSubTag, _L8("\t\tClientNode(0x%x) type=%d(%S), flags=%d"), id.Ptr(), client->Type(), &typlu, client->Flags());
-			client = clientIter++;
-			}
-		}
-		
-	}
-