--- a/esockapiextensions/internetsockets/inc/in_sock.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/esockapiextensions/internetsockets/inc/in_sock.h	Wed Oct 13 16:17:27 2010 +0300
@@ -32,71 +32,6 @@
 #include <in_sock_internal.h>
 #endif
 
-// Constants and typedef's for domain suffix support on interface
-const TInt KMaxDomainSuffixLength = 254; // Leaving space for minimum 1 letter hostname + '.' on maximum hostname length
-const TInt KMaxHostNameLength = 256;
-typedef TBuf<KMaxDomainSuffixLength> TSuffixName;
-typedef RArray<TSuffixName> RInetSuffixList;
-
-// Enumeration on type of operation done on the interface
-// for the domain suffix using RSocket::SetOpt
-enum TSoInetDomainSuffixFunction
-	{
-	EInetFunctionUndefined,
-	EInetAddSuffix,
-	EInetDeleteSuffix,
-	EInetDeleteAllSuffixes
-	};
-
-/**
-* Interface domain name structure
-* Used in TSoInetInterfaceInfoExtnDnsSuffix for adding/removing
-* Domain name suffices to an active interface using  RSocket::SetOpt
-*
-* @publishedAll
-* @released
-*/
-class TInetSuffix
-{
-private:
-	inline TInt AssignValue(const TDesC& aValue)
-		{
-        if (aValue.Length() > KMaxDomainSuffixLength)
-        	return KErrTooBig;
-		iSuffixName.Copy(aValue);
-		return KErrNone;
-		}
-
-public:
-	TInetSuffix() { iDomainSuffixFunction = EInetFunctionUndefined; }
-	
-	inline TInt Copy(const TDesC& aValue)
-		{
-		TInt err = AssignValue(aValue);
-       	if (err == KErrNone)
-       		iDomainSuffixFunction = EInetAddSuffix;
-       	return err;
-		}
-
-	inline TInt Delete(const TDesC& aValue)
-		{
-		TInt err = AssignValue(aValue);
-       	if (err == KErrNone)
-       		iDomainSuffixFunction = EInetDeleteSuffix;
-       	return err;
-		}
-		
-	inline void DeleteAll()
-		{
-		iDomainSuffixFunction = EInetDeleteAllSuffixes;
-		}
-		
-public:
-	TSuffixName iSuffixName;
-	TUint8 iDomainSuffixFunction;
-
-};
-
 /**
 * @name TCP/IP Protocol and address family
 *
@@ -804,42 +739,6 @@
 const TUint KSoInetStartInterface = 0x217;
 
 /**
-* @name Interface control socket options
-*
-* Level: #KSolInetIfCtrl
-*
-* Enumerating & Configuring Domain suffix on an using TSoInetInterfaceInfoExtnDnsSuffix
-*/ 
-//@{
-/**
-* Begin enumeration of domain suffixes on an enumerated interface. 
-* 
-* This option should be set before enumerating domain suffices with #KSoInetNextDomainSuffix.
-* As a pre-condition, the enumeration should be initiated on an active enumeration of interface
-* 
-* This option is for use with RSocket::SetOpt() only.
-*/
-const TUint KSoInetEnumDomainSuffix = 0x218;
-
-/**
-* Return details of the next domain suffix in an enumeration started by setting the 
-* option #KSoInetEnumDomainSuffix.
-*
-* This option is for use with RSocket::GetOpt() only.
-* 
-* Option data type is TSoInetInterfaceInfoExtnDnsSuffix.
-*
-* @note
-*	If the interface has multiple domain suffices, then each domain name
-*	is returned as a separate instance of TSoInetInterfaceInfoExtnDnsSuffix
-*	(only domain suffix name is different each time).
-* @note
-*	If the interface has no domain suffix, then SetOpt call
-*	returns with error KErrNotFound
-*/
-const TUint KSoInetNextDomainSuffix = 0x219;
-
-/**
 * Trigger link local creation.
 *
 * Option data type is TSoInet6InterfaceInfo.
@@ -1159,27 +1058,7 @@
 	*/
 	TUint iDoProxy:1;
 	};
-
-/**
-* Extension class for TSoInet6InterfaceInfo. Available in Symbian OS vtb92 and later.
-*
-* Optionally used with the following interface level #KSolInetIfCtrl options:
-* @li	#KSoInetConfigInterface
-* @li	#KSoInetChangeInterface
-* @li	#KSoInetEnumInterface
-*
-* Provides specialised fields for the interface object that generally
-* supplement extended behaviors for certain applications
-*
-* @publishedAll
-* @released
-*/
-class TSoInetInterfaceInfoExtnDnsSuffix : public TSoInet6InterfaceInfo
-    {
-public:
-    /** Interface domain suffix (if any). Used by DND for name resolution */
-    TInetSuffix iDomainSuffix;
-    };
+//@}
 
 /**
 * @name Interface query socket options
@@ -1292,12 +1171,6 @@
 	*/
 	TInetScopeIds iZone;
 	};
-
-/*class TSoInetSupplIfQuery : public TSoInetIfQuery
-    {
-    TInetSuffixList iSuffixList;
-    };*/
-
 /**
 * Get information for the interface specified by the destination address (iDstAddr) 
 * field of the passed packaged TSoInetIfQuery.
@@ -1966,17 +1839,6 @@
 * @since 7.0s
 */
 const TUint KSoNoSourceAddressSelect = 0x40b;
-
-/**
- * Store the port number on which application to the Hook listens to.
- * 
- * This port number will be used to be set as the destination address which
- * performing the UDP encapsulation from tunnel nif application to third party application.
- * The same port number if used to identify the packets orignated from the application towards
- * the Tunnel Nif.
- */
-const TUint KSoTunnelPort = 0x40c;
-
 /**
 * Retrieve last error information.
 * 

--- a/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/inc/agentscpr.h	Wed Oct 13 16:17:27 2010 +0300
@@ -122,7 +122,7 @@
     TBool iAuthenticateInProgress;
     TBool iStopRequested;		// ETrue means an agent stop has been requested - not that the SCPr has received a TCFDataClient::TStop
     TInt iStoppingReason;
-    
+
     Elements::TStateChange iLastProgress;
     TBuf<KCommsDbSvrMaxUserIdPassLength> iUsername;
     TBuf<KCommsDbSvrMaxUserIdPassLength> iPassword;

--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -148,7 +148,7 @@
 void CAgentAdapter::DisconnectAgent(TInt aReason)
     {
     if (iAgentState == EConnecting)
-        {    
+        {
         iAgent->CancelConnect();
         }
     else if (iAgentState == EReconnecting)

--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -88,38 +88,48 @@
 */
 EXPORT_C CAgentSubConnectionProvider::~CAgentSubConnectionProvider()
     {
+	//check for provisioning info
 	CleanupProvisioningInfo();
-    LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
+    
 	}
 
 
 EXPORT_C void CAgentSubConnectionProvider::CleanupProvisioningInfo()
     {
-    if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
-	   {
-	   iAuthenticateInProgress = EFalse;
-	   AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
-	   }
-
-	CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
-	const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
-	delete agentAdapter;
-
-	// Remove ourselves from the notification handler, or delete it entirely if we own it
-	CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
-	if (handler)
-	    {
-	    if (iScprOwnedNotificationHandler)
-	        {
-	        const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
-	        delete handler;
-	        }
-        else
+    //The case for constructL failure is not handled here. Trivial but very important change. If node has 
+    //not received any Provision config message, then there is no point, cleaning it up. Case ID for this is ou1cimx1#508527
+    const CAgentProvisionInfo* agentProvisionInfo = AgentProvisionInfo();
+    
+    if(agentProvisionInfo)
+        {
+        if (iAuthenticateInProgress && AgentProvisionInfo()->AgentAdapter())
+           {
+           iAuthenticateInProgress = EFalse;
+           AgentProvisionInfo()->AgentAdapter()->CancelAuthenticate();
+           }
+    
+        CAgentAdapter* agentAdapter(AgentProvisionInfo()->AgentAdapter());
+        const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentAdapter(NULL);
+        delete agentAdapter;
+    
+        // Remove ourselves from the notification handler, or delete it entirely if we own it
+        CAgentNotificationHandler* handler = AgentProvisionInfo()->AgentNotificationHandler();
+        if (handler)
             {
-            handler->Initialise(NULL);
+            if (iScprOwnedNotificationHandler)
+                {
+                const_cast<CAgentProvisionInfo*>(AgentProvisionInfo())->SetAgentNotificationHandler(NULL);
+                delete handler;
+                }
+            else
+                {
+                handler->Initialise(NULL);
+                }
             }
-	    }
-    }
+        //log node destruction, destroy in the case of perfect construction.
+        LOG_NODE_DESTROY(KAgentSCprTag, CAgentSubConnectionProvider);
+        }
+     }
 
 /**
 Mesh machine message entry point
@@ -156,7 +166,7 @@
 EXPORT_C const CAgentProvisionInfo* CAgentSubConnectionProvider::AgentProvisionInfo() const
     {
     const CAgentProvisionInfo* agentProvisionInfo = static_cast<const CAgentProvisionInfo*>(AccessPointConfig().FindExtension(CAgentProvisionInfo::TypeId()));
-	__ASSERT_DEBUG(agentProvisionInfo, User::Panic(KSpecAssert_NifManAgtPrCgnts, 1));
+	//In case of agent constructL failure there will not be any provision config, thus return NULL.
     return agentProvisionInfo;
     }
 

--- a/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayercontrol/nullagt/TS_AgentAdapter/inc/CsdAgentTestSuite.h	Wed Oct 13 16:17:27 2010 +0300
@@ -26,7 +26,7 @@
 		public:
 			void InitialiseL(void);
 			CTestSuiteCsdAgt::~CTestSuiteCsdAgt() {};		  	
-		    TPtrC GetVersion(void);
+		  TPtrC GetVersion(void);
 		private:		  		
 	};
 	

--- a/linklayercontrol/tundriveragt/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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:
-*   tundriver agent build configuration file.
-* 
-*
-*/
-
-/**
- @file bld.inf
- @internalTechnology
-*/
-
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/tundriveragtprog.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/tundriveragtprog.h)
-tundriveragt.iby /epoc32/rom/include/tundriveragt.iby
-
-PRJ_TESTEXPORTS
-
-
-PRJ_MMPFILES
-
-tundriveragt.mmp
-
-
-

--- a/linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +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: 
-#
-
-component	networking_tundriveragt
-source	\sf\os\networkingsrv\linklayercontrol\tundriveragt
-binary	\sf\os\networkingsrv\linklayercontrol\tundriveragt\group	all
-exports	\sf\os\networkingsrv\linklayercontrol\tundriveragt\group
-notes_source	\component_defs\release.src
-
-ipr E 

--- a/linklayercontrol/tundriveragt/group/tundriveragt.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:
-*   tundriver agent iby file for ROM Builds
-* 
-*
-*/
-
-/**
- @file tundriveragt.iby
- @internalTechnology
-*/
-
-#ifndef __TUNDRIVERAGT_IBY__
-#define __TUNDRIVERAGT_IBY__
-
-#include <commdb.iby>
-
-file=ABI_DIR\DEBUG_DIR\tundriveragt.agt		System\Libs\tundriveragt.agt
-
-#endif
-

--- a/linklayercontrol/tundriveragt/group/tundriveragt.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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:
-*   tundriver agent Build Configuration file.
-* 
-*
-*/
-
-/**
- @file tundriveragt.mmp
- @internalTechnology
-*/
-TARGET			tundriveragt.agt
-TARGETTYPE		DLL
-UID			0x10003d39 0x10008b69
-VENDORID 0x70000001
-TARGETPATH    		/system/libs
-
-NOEXPORTLIBRARY  /* Ensures that DEF file can be safely shared 
-                    for RVCT builds                            */
-                    
-SOURCEPATH		../src
-SOURCE			tundriveragent.cpp
-
-USERINCLUDE		../inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY			euser.lib nifman.lib 
-
-#if defined(WINS)
-deffile    /epoc32/release/wins/agent.def
-#elif defined(GCC32)
-deffile    /epoc32/release/marm/agent.def
-#else
-deffile    /epoc32/include/def/eabi/agent.def
-#endif
-START WINS
-BASEADDRESS		0x47900000
-END
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-UNPAGED
-
-SMPSAFE

--- a/linklayercontrol/tundriveragt/inc/tundriveragent.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +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:
-*   Header file TunDriver Agent
-* 
-*
-*/
-
-/**
- @file tundriveragent.h
- @internalTechnology
-*/
-
-
-#if !defined __TUNDRIVERAGT_H__
-#define __TUNDRIVERAGT_H__
-
-#include <comms-infras/cagentbase.h>
-#include <comms-infras/agentmessages.h>
-#include "tundriveragtprog.h"
-
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <comms-infras/nifprvar_internal.h>
-#include <nifman_internal.h>
-#endif
-
-const TInt KMajorVersionNumber=1; //< TunDriver Agent MajorVersionNumber
-const TInt KMinorVersionNumber=0; //< TunDriver Agent MinorVersionNumber
-const TInt KBuildVersionNumber=1; //< TunDriver Agent BuildVersionNumber
-
-_LIT(KTunDriverAgentName,"tundriveragt"); //< Name of the TunDriver Agent
-
-
-class CTunDriverAgentFactory : public CNifAgentFactory
-/**
-A Factory for creating a TunDriverAgent
-
-@internalComponent  
-*/
-	{
-protected:
-	void InstallL();
-	CNifAgentBase *NewAgentL(const TDesC& aName);
-	TInt Info(TNifAgentInfo& aInfo, TInt aIndex) const;
-	};
-
-class CTunDriverAgent : public CAgentBase
-/**
-The CTunDriverAgent class owns a CAsyncCallback , which is used to control the asynchronous 
-ServiceStarted() and DisconnectComplete() call from the Agent to Nifman.
-
-@internalComponent
-*/
-	{
-public:
-	static CTunDriverAgent* NewL();
-	virtual ~CTunDriverAgent();
-protected:
-	void ConstructL();
-	CTunDriverAgent();
-public:
-
-	// from CNifAgentBase
-	void Info(TNifAgentInfo& aInfo) const;
-	void Connect(TAgentConnectType aType);
-	void Connect(TAgentConnectType aType, CStoreableOverrideSettings* aOverrideSettings);
-	void CancelConnect();
-	void Disconnect(TInt aReason);
-	void ServiceStarted(TInt aError);
-	void ConnectionComplete(TInt aError);
-	void DisconnectionComplete();
-
-	TInt GetExcessData(TDes8& aBuffer);
-	TInt Notification(TNifToAgentEventType aEvent, TAny* aInfo);
-	void GetLastError(TInt& aError);
-	TBool IsReconnect() const {return (ETrue);};
-
-	TInt IncomingConnectionReceived();
-	
-private:
-	static TInt ServiceStartedCb(TAny* aThisPtr);
-	static TInt ConnectCompleteCb(TAny* aThisPtr);
-	static TInt DisconnectCompleteCb(TAny* aThisPtr);
-
-private:
-	CAsyncCallBack iServiceStartedCallback;
-	CAsyncCallBack iConnectCompleteCallback;
-	CAsyncCallBack iDisconnectCallback;
-	TBool iConnected;
-	TBool iCancelled;
-	
-	/** An integer to keep last error code in memory. */
-	TInt  iLastErrorCode;
-	    
-	/** Boolean to define wether disconnecting operation is ongoing */
-	TBool iDisconnecting;
-	TTunDriverAgentProgress iAgentProgress;
-	};
-
-#endif // _TUNDRIVERAGT_H

--- a/linklayercontrol/tundriveragt/inc/tundriveragtprog.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:
-*   Header file for tundriver agent
-* 
-*
-*/
-
-/**
- @file tundriveragtprog.h
- @internalTechnology
-*/
-
-#if !defined (__TUNDRIVERAGTPROG_H__)
-#define __TUNDRIVERAGTPROG_H__
-
-#include <nifvar.h>
-
-/**
-TunDriver Agent Progress
-*/
-enum TTunDriverAgentProgress
-	{
-	ETunDriverAgtIdle             = KMinAgtProgress,
-	ETunDriverAgtConnecting,      // for future reference
-	ETunDriverAgtConnected        = KConnectionOpen,
-	ETunDriverAgtDisconnecting    = KConnectionStartingClose,
-	ETunDriverAgtDisconnected     = KConnectionClosed
-	 
-	};
-#endif // __TUNDRIVERAGTPROG_H__

--- a/linklayercontrol/tundriveragt/src/tundriveragent.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +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:
-*   Source file for tundriver agent.
-* 
-*
-*/
-
-/**
- @file tundriveragent.cpp
- @internalTechnology
-*/
-
-#include "tundriveragent.h"
-extern "C" EXPORT_C CNifAgentFactory* NewAgentFactoryL()
-/**
-Agent Factory
-First ordinal export
-
-@internalComponent
-@return an object to class CTunAgentFactory,which Perform Agent initialisation.
-*/
-	{	
-	return new(ELeave) CTunDriverAgentFactory;
-	}
-
-void CTunDriverAgentFactory::InstallL() 
-/**
-Performs a new Agent initialisation
-*/
-	{}
- 
-CNifAgentBase* CTunDriverAgentFactory::NewAgentL(const TDesC& /*aName*/)
-/**
-Creates a new TunDriverAgent to TunDriver
-
-@param aName , name of the TunDriverAgent
-@return a new instance of class TunDriverAgent
-*/
-	{
-	return CTunDriverAgent::NewL();
-	}
-
-TInt CTunDriverAgentFactory::Info(TNifAgentInfo& aInfo, TInt /*aIndex*/) const
-/**
-Retrieves information about the Agent
-
-@param aInfo,a reference of class TNifAgentInfo which contains information about TunDriverAgent
-@return KErrNone if information retrieved successfully.
-*/
-	{
-	aInfo.iName = KTunDriverAgentName;
-	aInfo.iVersion = TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber);
-	return KErrNone;
-	}
-
-CTunDriverAgent::CTunDriverAgent() :	iServiceStartedCallback(CActive::EPriorityStandard),
-							iConnectCompleteCallback(CActive::EPriorityStandard), 
-							iDisconnectCallback(CActive::EPriorityStandard)
-/**
-Default Constructor
-*/
-	{
-	TCallBack serviceStartedCallback(ServiceStartedCb, this);
-	iServiceStartedCallback.Set(serviceStartedCallback);
-	
-	TCallBack connectionCompleteCallback(ConnectCompleteCb, this);
-	iConnectCompleteCallback.Set(connectionCompleteCallback);
-
-	TCallBack disconnectionCompleteCallback(DisconnectCompleteCb, this);
-	iDisconnectCallback.Set(disconnectionCompleteCallback);
-	}
- 
-CTunDriverAgent::~CTunDriverAgent()
-/**
-Destructor
-*/
-	{
-	iServiceStartedCallback.Cancel();
-	iConnectCompleteCallback.Cancel();
-	iDisconnectCallback.Cancel();
-	}
-
-
-CTunDriverAgent* CTunDriverAgent::NewL()
-/**
-Static NewL function constructing an object of class CTunDriverAgent
-
-@return self,pointer to class TunDriverAgent,that owns a CAsyncCallback used to 
-control the asynchronous ServiceStarted() and DisconnectComplete() call from the Agent to TunDriver. 
-*/
-	{
-	CTunDriverAgent* self = new (ELeave) CTunDriverAgent();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-void CTunDriverAgent::ConstructL()
-/**
-2nd Phase Constructor
-Calls CAgentBase::ConstructL()
-construct the database and dialog processor
-*/
-	{
-	CAgentBase::ConstructL();
-	iCancelled = EFalse;
-	iAgentProgress = ETunDriverAgtIdle;
-	}
-
-void CTunDriverAgent::Info(TNifAgentInfo& aInfo) const
-/**
-Information about this Agent
-
-@param aInfo on return contains information about the agent
-*/
-	{
-	aInfo.iName = KTunDriverAgentName;
-	aInfo.iName.AppendFormat(_L("-AgentFactory[0x%08x]"), this);
-	aInfo.iVersion = TVersion(KMajorVersionNumber,KMinorVersionNumber,KBuildVersionNumber);
-	}
-
-void CTunDriverAgent::Connect(TAgentConnectType aType)
-/**
-Connects this TunDriverAgent to TunDriver
-
-@internalComponent  
-@param aType, a variable of enum TAgentConnectType describing connection types.
-*/
-	{
-	if (EAgentReconnect == aType)
-		{
-		iConnectCompleteCallback.CallBack();
-		}
-	else
-		{
-		iCancelled = EFalse;
-		iServiceStartedCallback.CallBack();		
-		}
-	}
-
-void CTunDriverAgent::Connect(TAgentConnectType aType, CStoreableOverrideSettings* /*aOverrideSettings*/)
-/**
-Connects this TunDriverAgent to TunDriver with store and retrieve commDB override sets to and from both
-streams and buffers.
-
-@param aType,a variable of enum TAgentConnectType describing connection types.
-@param aOverrideSettings, a pointer to class CStoreableOverrideSettings which store CommDB overrides.
-*/
-	{
-	Connect(aType);
-	}
-
-void CTunDriverAgent::CancelConnect()
-/**
-Cancels Connection of the TunDriverAgent to TunDriver 
-*/
-	{
-	iServiceStartedCallback.Cancel();
-	iConnectCompleteCallback.Cancel();
-	iConnected = EFalse;
-	iCancelled = ETrue;
-	}
-
-void CTunDriverAgent::Disconnect(TInt aReason)
-/**
-Disconnects from the TunDriverAgent to TunDriver with reason 
-
-@param aReason, reason for disconnection to the agent.
-*/
-	{	   
-	iLastErrorCode = aReason;
-	iDisconnectCallback.CallBack();
-	}
-
-void CTunDriverAgent::ServiceStarted(TInt /*aError*/)
-/**
-ConnectionComplete from TunDriverAgent to TunDriver
-This function is calling CallBack() function if connect is not cancelled
-
-@param aError, error number for which service needs to be started.
-*/
-	{
-	iAgentProgress = ETunDriverAgtConnecting;
-	iNotify->AgentProgress(iAgentProgress, KErrNone);
-	iNotify->ServiceStarted();
-	
-	/* if the connect has been cancelled during ServiceStarted() then we need to avoid 
-	 * calling ConnectComplete() - done in this next callback - otherwise we get a panic */
-	if (!iCancelled)
-		iConnectCompleteCallback.CallBack();
-	}
-
-void CTunDriverAgent::ConnectionComplete(TInt aError)
-/**
-Second phase of completing connection of TunDriveragent to TunDriver
-
-@param aError,error number for which connection is complete.
-*/
-    {
-    if(aError==KErrNone)
-	    {
-        iAgentProgress = ETunDriverAgtConnected;
-        iNotify->AgentProgress(ETunDriverAgtConnected, aError);
-        iNotify->ConnectComplete(aError);
-        iConnected = ETrue;
-        return;
-	    }
-	iNotify->AgentProgress(iAgentProgress,aError);
-	iNotify->ConnectComplete(aError);
-	iConnected = EFalse;
-    }
-
-void CTunDriverAgent::DisconnectionComplete()
-/**
-Completes the disconnection of TunDriveragent from TunDriver
-*/
-	{
-	
-	if ( iDisconnecting )
-	        {
-            iNotify->AgentProgress(iAgentProgress, KErrNone);
-	        }
-	    else
-	        {
-            iAgentProgress = ETunDriverAgtDisconnected;
-            iDisconnecting = ETrue;
-	        iNotify->AgentProgress(iAgentProgress, KErrNone);
-	        iNotify->DisconnectComplete();
-	        iConnected = EFalse;
-	        }
-	}
-
-TInt CTunDriverAgent::GetExcessData(TDes8& /*aBuffer*/)
-/**
-Gets excessData from TunDriveragent to TunDriver
-
-@param aBuffer, variable containing the name of TunDriveragent
-@return KErrNotSupported,error code if it does not get excess data from TunDriveragent.
-*/
-	{
-	return KErrNotSupported;
-	}
-
-
-TInt CTunDriverAgent::Notification(TNifToAgentEventType /*aEvent*/, TAny* /*aInfo*/)
- /*
-Establishes the Notification types from Nif to Agent for the TunDriveragent
-
-@param aEvent,a variable of enum TNifToAgentEventType, which contains Notification types from TunDriver to TunDriverAgent
-@param aInfo, information about the agent
-@return KErrNotSupported,error code if the notification type does not exist.
-*/
-	{
-	return KErrNone;		
-	}
-
-void CTunDriverAgent::GetLastError(TInt& aError)
-/**
-Gets the LastError
-*/
-	{
-	aError = iLastErrorCode;
-	}
-
-
-
-TInt CTunDriverAgent::IncomingConnectionReceived()
-/**
-IncomingConnectionReceived
-
-@return KErrNotSupported, error code if incoming connection is not received.
-*/
-	{
-	return KErrNotSupported;
-	}
-
-TInt CTunDriverAgent::ServiceStartedCb(TAny* aThisPtr)
-/**
- * Connection Callback static function 
- *
- */
-	{
-	CTunDriverAgent* self = (CTunDriverAgent*)aThisPtr;
-	self->ServiceStarted(KErrNone);
-	return KErrNone;
-	}
-
-TInt CTunDriverAgent::ConnectCompleteCb(TAny* aThisPtr)
-/**
- * Second callback used during connection creation
- *
- */
-    {
-	CTunDriverAgent* self = (CTunDriverAgent*) aThisPtr;
-	self->ConnectionComplete(KErrNone);
-	return KErrNone;
-    }
-
-TInt CTunDriverAgent::DisconnectCompleteCb(TAny* aThisPtr)
-/**
- * Disconnection callback static function
- *
- */
-    {
-	CTunDriverAgent* self = (CTunDriverAgent*) aThisPtr;
-	self->DisconnectionComplete();
-	return KErrNone;
-    }

--- a/linklayerprotocols/ethernetnif/EtherPkt/CardCtl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ b/linklayerprotocols/ethernetnif/EtherPkt/CardCtl.cpp	Wed Oct 13 16:17:27 2010 +0300
@@ -328,9 +328,8 @@
 	
 	User::LeaveIfError(fileSrv.Connect());
 	User::LeaveIfError(macFile.Open(fileSrv,KEtherMacFileName,EFileRead));
-	CleanupClosePushL(macFile);
 	User::LeaveIfError(macFile.Read(macAddress,12));
-	CleanupStack::PopAndDestroy(&macFile);
+	macFile.Close();
 	fileSrv.Close();
 	controlBuf.SetLength(8);	
 	controlBuf[0] = KEthSpeed10BaseT;

Binary file linklayerprotocols/tundriver/group/MON.dat has changed

--- a/linklayerprotocols/tundriver/group/bld.inf	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:
-*   Header file for the Ip4 and Ip6 Binder Configuration.
-* 
-*
-*/
-
-/**
- @file bld.inf
- @internalTechnology
-*/
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-tundriver.iby                    /epoc32/rom/include/tundriver.iby
-
-
-
-
-
-PRJ_MMPFILES
-
-tundriver.mmp
-
-#include "../te_tundriver/group/bld.inf"
-

--- a/linklayerprotocols/tundriver/group/networking_tundriver.mrp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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: 
-#
-
-component	networking_tundriver
-source	\sf\os\networkingsrv\linklayerprotocols\tundriver
-binary	\sf\os\networkingsrv\linklayerprotocols\tundriver\group	all
-exports	\sf\os\networkingsrv\linklayerprotocols\tundriver\group
-notes_source	\component_defs\release.src
-
-ipr E 
-ipr T \sf\os\networkingsrv\linklayerprotocols\tundriver\te_tundriver

--- a/linklayerprotocols/tundriver/group/tundriver.iby	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +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:
-//
-
-#ifndef __TUNDRIVER_IBY__
-#define __TUNDRIVER_IBY__
-
-#include <tundriveragt.iby>
-#include <tun.iby>
-
-ECOM_PLUGIN(tundriver.dll,20027F3D.rss)
-
-#endif //__TUNDRIVER_IBY__

--- a/linklayerprotocols/tundriver/group/tundriver.mmp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:
-*   Plugin for tundriver.
-* 
-*
-*/
-
-/**
- @file tundriver.mmp
- @internalTechnology
-*/
-
-TARGET          tundriver.dll
-TARGETTYPE      PLUGIN
-UID 0x10009D8D 0x20027F3D
-VENDORID	    0x70000001                   
-                                                
-#include	    <comms-infras/commsdebugutility.mmh>
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-
-
-USERINCLUDE     ../inc
-
-SYSTEMINCLUDE   /epoc32/include
-SYSTEMINCLUDE   /epoc32/include/ecom
-SYSTEMINCLUDE   /epoc32/include/comms-infras
-SYSTEMINCLUDE   /epoc32/include/platform/comms-infras
-
-LIBRARY         euser.lib esock.lib esocksvr.lib
-LIBRARY         serverden.lib
-LIBRARY         netmeta.lib insock.lib inhook6.lib
-LIBRARY			commsfw.lib mbufmgr.lib
-LIBRARY 		agentprcore.lib
-LIBRARY 		coreproviders.lib
-LIBRARY 		commsdat.lib
-LIBRARY         simpleselectorbase.lib
-LIBRARY			nodemessages.lib
-LIBRARY			meshmachine.lib
-LIBRARY			netinterfaces.lib
-LIBRARY         factories.lib
-
-DEBUGLIBRARY		flogger.lib
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-SMPSAFE
-SOURCEPATH ../src
-SOURCE tundriverflow.cpp tundriverprovision.cpp tundriverbinder.cpp tundrivermcpr.cpp tundrivermcprfactory.cpp ecom_impl.cpp
-
-START RESOURCE 0x20027F3D.rss
-	TARGET tundriver.rsc
-END

--- a/linklayerprotocols/tundriver/inc/tundriverbinder.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +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:
-*   Header file for the Ip4 and Ip6 Binder Configuration.
-* 
-*
-*/
-
-/**
- @file tundriverbinder.h
- @internalTechnology
-*/
-
-#ifndef _TUNDRIVERBINDER_H
-#define _TUNDRIVERBINDER_H
-
-#include <ip4_hdr.h>
-#include <ip6_hdr.h>
-#include <udp_hdr.h>
-#include <comms-infras/ss_protflow.h>
-#include <comms-infras/ss_flowbinders.h>
-#include <comms-infras/commsdebugutility.h>
-#include <nifmbuf.h>
-#include "es_protbinder.h"
-#include "tundriverflow.h"
-
-const TInt KMTU = 1500;
-
-const TInt KSpeedMetric = 0;
-
-const TUint KTUNDriverTos      = 192; // 0xC0; uses the UNUSED 7,8 MSB of Differentiated Services
-
-class CTunDriverSubConnectionFlow;
-
-class CTunDriverBinder : public CBase, public ESock::MLowerDataSender, public ESock::MLowerControl
-/**
-Common Binder for the tunnel driver binder. This binder will be inherited by IPv4 or IPv6 Binder classes.
-*/
-    {
-public:
-    virtual MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    virtual void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    virtual TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    virtual TInt Control(TUint, TUint, TDes8&);
-    void SetPort(TUint aPort);
-    TUint GetPort();
-protected:
-    CTunDriverBinder(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow);
-protected:
-    __FLOG_DECLARATION_MEMBER;
-private:
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    TUint iPort;
-    };
-
-class CTunDriverBinder4 : public CTunDriverBinder
-    {
-public:
-    static CTunDriverBinder4* NewL(CTunDriverSubConnectionFlow& aLink);
-    ~CTunDriverBinder4();
-    // from MLowerDataSender
-    virtual TInt GetName(TDes& aName);
-    virtual TInt GetConfig(TBinderConfig& aConfig);
-    MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    ESock::MLowerDataSender::TSendResult Send(RMBufChain& aData);
-    void StartSending();
-private:
-    CTunDriverBinder4(CTunDriverSubConnectionFlow& aLink);
-    void ConstructL();
-    void TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv);
-    inline CTunDriverSubConnectionFlow* Flow();
-    virtual void DoSend();
-    virtual void DoProcess();
-    static TInt RecvCallBack(TAny* aCProtocol);
-    static TInt SendCallBack(TAny* aCProtocol);
-private:
-    TInetAddr iLocalAddress;
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    ESock::MUpperDataReceiver* iUpperReceiver;
-    ESock::MUpperControl* iUpperControl;
-    RMBufPktQ iSendQ;
-    RMBufPktQ iRecvQ;
-    CAsyncCallBack* iSendCallBack;
-    CAsyncCallBack* iRecvCallBack;
-    };
-
-CTunDriverSubConnectionFlow* CTunDriverBinder4::Flow()
-    {
-    return &iTunDriverSubConnectionFlow;
-    }
-
-#ifdef IPV6SUPPORT
-class CTunDriverBinder6 : public CTunDriverBinder
-    {
-public:
-    static CTunDriverBinder6* NewL(CTunDriverSubConnectionFlow& aLink);
-    ~CTunDriverBinder6();
-    // from MLowerDataSender
-    virtual TInt GetName(TDes& aName);
-    virtual TInt GetConfig(TBinderConfig& aConfig);
-    MLowerDataSender* Bind(ESock::MUpperDataReceiver& aUpperReceiver , ESock::MUpperControl& aUpperControl);
-    void Unbind (ESock::MUpperDataReceiver& aUpperReceiver, ESock::MUpperControl& aUpperControl);
-    TBool MatchesUpperControl(ESock::MUpperControl* aUpperControl) const;
-    ESock::MLowerDataSender::TSendResult Send(RMBufChain& aData);
-    void StartSending();
-private:
-    CTunDriverBinder6(CTunDriverSubConnectionFlow& aLink);
-    void ConstructL();
-    void TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv);
-    inline CTunDriverSubConnectionFlow* Flow();
-    virtual void DoSend();
-    virtual void DoProcess();
-    static TInt RecvCallBack(TAny* aCProtocol);
-    static TInt SendCallBack(TAny* aCProtocol);
-private:
-    TInetAddr iLocalAddress;
-    CTunDriverSubConnectionFlow& iTunDriverSubConnectionFlow;
-    ESock::MUpperDataReceiver* iUpperReceiver;
-    ESock::MUpperControl* iUpperControl;
-    RMBufPktQ iSendQ;
-    RMBufPktQ iRecvQ;
-    CAsyncCallBack* iSendCallBack;
-    CAsyncCallBack* iRecvCallBack;
-    };
-#endif 
-#endif // _TUNDRIVERBINDER_H

--- a/linklayerprotocols/tundriver/inc/tundriverflow.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +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:
-*   Header file for the Default SubConnection Flow
-* 
-*
-*/
-
-
-
-/**
- @file tundriverflow.h
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERFLOW_H
-#define TUNDRIVERFLOW_H
-
-#include <e32base.h>
-#include <e32std.h>
-#include <comms-infras/ss_subconnflow.h>
-#include <comms-infras/nifif.h>
-#include "tundriverbinder.h"
-#include "tundriverprovision.h"
-
-/**
-Tun Driver SubConnFlow Implementation UID
-*/
-const TInt KTunDriverFlowImplementationUid = 0x10281C3C;
-
-// String literals for protocol name used during flow binding
-_LIT8(KProtocol4, "ip");
-#ifdef IPV6SUPPORT
-_LIT8(KProtocol6, "ip6");
-#endif
-
-class CTunDriverSubConnectionFlowFactory : public ESock::CSubConnectionFlowFactoryBase
-/**
-*/
-    {
-public:
-    static CTunDriverSubConnectionFlowFactory* NewL(TAny* aConstructionParameters);
-    virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocolIntf, ESock::TFactoryQueryBase& aQuery);
-protected:
-    CTunDriverSubConnectionFlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer);
-    };
-
-class CTunDriverBinder4;
-#ifdef IPV6SUPPORT
-class CTunDriverBinder6;
-#endif
-class CTunDriverSubConnectionFlow : public ESock::CSubConnectionFlowBase, public ESock::MFlowBinderControl
-/**
-*/
-    {
-public:
-    static CTunDriverSubConnectionFlow* NewL(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
-
-    // from Messages::ANode (via CSubConnectionFlowBase)
-    virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
-
-    // Methods called from Binders
-    void FlowDown(TInt aError, TInt aAction = MNifIfNotify::EDisconnect);
-    void Progress(TInt aStage, TInt aError);
-    const TTunDriverIp4Provision* Ip4Provision() const;
-#ifdef IPV6SUPPORT
-    const TTunDriverIp6Provision* Ip6Provision() const;
-#endif
-
-    // Functions for dealing with SCPR messages
-    void StartFlowL();
-    void CancelFlow(TInt aError);
-    void StopFlow(TInt aError);
-    void Destroy();
-    void SubConnectionGoingDown();
-    void SubConnectionError(TInt aError);
-
-    // from MFlowBinderControl
-    virtual ESock::MLowerControl* GetControlL(const TDesC8& aProtocol);
-    virtual ESock::MLowerDataSender* BindL(const TDesC8& aProtocol, ESock::MUpperDataReceiver* aReceiver, ESock::MUpperControl* aControl);
-    virtual void Unbind(ESock::MUpperDataReceiver* aReceiver, ESock::MUpperControl* aControl);
-    virtual ESock::CSubConnectionFlowBase* Flow();
-
-protected:
-    CTunDriverSubConnectionFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
-    virtual ~CTunDriverSubConnectionFlow();
-
-    // CSubConnectionFlowBase
-    virtual ESock::MFlowBinderControl* DoGetBinderControlL();
-
-    // Utilities for posting SCPR messages
-    void PostProgressMessage(TInt aStage, TInt aError);
-    void PostDataClientStartedMessage();
-    void PostFlowDownMessage(TInt aError, TInt aAction = MNifIfNotify::EDisconnect);
-    void MaybePostDataClientIdle();
-
-private:
-    void ProvisionConfig(const ESock::RMetaExtensionContainerC& aConfigData);
-
-private:
-    CTunDriverBinder4* iBinder4;
-#ifdef IPV6SUPPORT
-    CTunDriverBinder6* iBinder6;
-#endif
-    const CTunDriverProtoProvision* iProvision;      // cached pointer to provisioning structure in SCPR (in control side memory)
-    TInt iSavedError;                           // errors during processing of ProvisionConfig message
-    enum TMeshMachineFlowState
-            {
-            EStopped,
-            EStarting,
-            EStarted,
-            EStopping,
-            };
-    TMeshMachineFlowState iMMState;
-    __FLOG_DECLARATION_MEMBER;
-public:
-    };
-
-#endif // TUNDRIVERFLOW_H

--- a/linklayerprotocols/tundriver/inc/tundrivermcpr.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:
-*   Header file for the tun driver Mcpr configuration.
-* 
-*
-*/
-
-/**
- @file tundrivermcpr.h
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERMCPR_H
-#define TUNDRIVERMCPR_H
-
-#include <comms-infras/ss_mcprnodemessages.h>
-#include "agentmcpr.h"
-#include "tundrivermcprfactory.h"
-
-
-namespace TunDriverMCprStates
-    {
-	class TSendProvision;
-    }
-
-class CTunDriverMetaConnectionProvider : public CAgentMetaConnectionProvider
-   {
-    friend class TunDriverMCprStates::TSendProvision;
-public:
-    typedef CTunDriverMetaConnectionProviderFactory FactoryType;
-
-	static CTunDriverMetaConnectionProvider* NewL(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
-	virtual ~CTunDriverMetaConnectionProvider();
-
-protected:
-    CTunDriverMetaConnectionProvider(ESock::CMetaConnectionProviderFactoryBase& aFactory, const ESock::TProviderInfo& aProviderInfo);
-    void SetAccessPointConfigFromDbL();
-
-protected:
-	virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
-	void ConstructL();
-    };
-
-#endif //TUNDRIVERMCPR_H

--- a/linklayerprotocols/tundriver/inc/tundrivermcprfactory.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:
-*   Header file for the tunnel driver mcpr factory configuration.
-* 
-*
-*/
-
-/**
- @file tundrivermcprfactory.h
- @internalTechnology
-*/
-
-#ifndef _TUNDRIVERMCPR_FACTORY_H
-#define _TUNDRIVERMCPR_FACTORY_H
-
-#include <comms-infras/ss_metaconnprov.h>
-
-class CTunDriverMetaConnectionProviderFactory : public ESock::CMetaConnectionProviderFactoryBase
-	{
-public:
-    enum { iUid = 0x10281E05 };
-	static CTunDriverMetaConnectionProviderFactory* NewL(TAny* aParentContainer);
-
-protected:
-    CTunDriverMetaConnectionProviderFactory(TUid aFactoryId, ESock::CMetaConnectionFactoryContainer& aParentContainer);
-	ESock::ACommsFactoryNodeId* DoCreateObjectL(ESock::TFactoryQueryBase& aQuery);
-	};
-
-#endif
-//_TUNDRIVERMCPR_FACTORY_H

--- a/linklayerprotocols/tundriver/inc/tundriverprovision.h	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +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:
-*   Header file for tundriver binder provision.
-* 
-*
-*/
-
-
-
-/**
- @file
- @internalTechnology
-*/
-
-#ifndef TUNDRIVERPROVISION_H_
-#define TUNDRIVERPROVISION_H_
-
-#include <comms-infras/metadata.h>
-#include <in_sock.h>			
-#include <metadatabase.h>		
-
-namespace ESock
-	{
-	class CCommsDatIapView;
-	}
-
-class TTunDriverIp4Provision
-    {
-public:
-    inline TInetAddr LocalAddr() const;
-    inline TInetAddr NetMask() const;
-    inline TInetAddr BroadcastAddr() const;
-    inline TInetAddr DefGateway() const;
-    inline TInetAddr PrimaryDns() const;
-    inline TInetAddr SecondaryDns() const;
-    inline TUint32 Order() const;
-
-    inline void SetLocalAddr(TInetAddr);
-    inline void SetNetMask(TInetAddr);
-    inline void SetBroadcastAddr(TInetAddr);
-    inline void SetDefGateway(TInetAddr);
-    inline void SetPrimaryDns(TInetAddr);
-    inline void SetSecondaryDns(TInetAddr);
-    inline void SetOrder(TUint32);
-    
-private:
-    TInetAddr iLocalAddr;
-    TInetAddr iNetMask;
-    TInetAddr iBroadcastAddr;
-    TInetAddr iDefGateway;
-    TInetAddr iPrimaryDns;
-    TInetAddr iSecondaryDns;
-    TUint32 iOrder;
-    };
-
-
-inline TInetAddr TTunDriverIp4Provision::LocalAddr() const { return iLocalAddr; }
-    
-inline TInetAddr TTunDriverIp4Provision::NetMask() const { return iNetMask; }
-    
-inline TInetAddr TTunDriverIp4Provision::BroadcastAddr() const { return iBroadcastAddr; }
-    
-inline TInetAddr TTunDriverIp4Provision::DefGateway() const { return iDefGateway; }
-    
-inline TInetAddr TTunDriverIp4Provision::PrimaryDns() const { return iPrimaryDns; }
-    
-inline TInetAddr TTunDriverIp4Provision::SecondaryDns() const { return iSecondaryDns; }
-
-inline TUint32 TTunDriverIp4Provision::Order() const { return iOrder; }
-
-inline void TTunDriverIp4Provision::SetLocalAddr(TInetAddr aLocalAddr) { iLocalAddr = aLocalAddr;}
-    
-inline void TTunDriverIp4Provision::SetNetMask(TInetAddr aNetMask) { iNetMask = aNetMask;   }
-    
-inline void TTunDriverIp4Provision::SetBroadcastAddr(TInetAddr aBroadcastAddr) { iBroadcastAddr = aBroadcastAddr;   }
-    
-inline void TTunDriverIp4Provision::SetDefGateway(TInetAddr aDefGateway) { iDefGateway = aDefGateway; }
-    
-inline void TTunDriverIp4Provision::SetPrimaryDns(TInetAddr aPrimaryDns) { iPrimaryDns = aPrimaryDns; }
-    
-inline void TTunDriverIp4Provision::SetSecondaryDns(TInetAddr aSecondaryDns) { iSecondaryDns = aSecondaryDns; }
-
-inline void TTunDriverIp4Provision::SetOrder(const TUint32 aOrder) {  iOrder = aOrder; }
-
-#ifdef IPV6SUPPORT
-class TTunDriverIp6Provision
-    {
-public:
-    inline TInetAddr LocalAddr() const;
-    inline TInetAddr NetMask() const;
-    inline TInetAddr BroadcastAddr() const;
-    inline TInetAddr DefGateway() const;
-    inline TInetAddr PrimaryDns() const;
-    inline TInetAddr SecondaryDns() const;
-    inline TUint32 Order() const;
-
-    inline void SetLocalAddr(TInetAddr);
-    inline void SetNetMask(TInetAddr);
-    inline void SetBroadcastAddr(TInetAddr);
-    inline void SetDefGateway(TInetAddr);
-    inline void SetPrimaryDns(TInetAddr);
-    inline void SetSecondaryDns(TInetAddr);
-    inline void SetOrder(TUint32);
-    
-private:
-    TInetAddr iLocalAddr;
-    TInetAddr iNetMask;
-    TInetAddr iBroadcastAddr;
-    TInetAddr iDefGateway;
-    TInetAddr iPrimaryDns;
-    TInetAddr iSecondaryDns;
-    TUint32 iOrder;
-    };
-
-
-inline TInetAddr TTunDriverIp6Provision::LocalAddr() const { return iLocalAddr; }
-    
-inline TInetAddr TTunDriverIp6Provision::NetMask() const { return iNetMask; }
-    
-inline TInetAddr TTunDriverIp6Provision::BroadcastAddr() const { return iBroadcastAddr; }
-    
-inline TInetAddr TTunDriverIp6Provision::DefGateway() const { return iDefGateway; }
-    
-inline TInetAddr TTunDriverIp6Provision::PrimaryDns() const { return iPrimaryDns; }
-    
-inline TInetAddr TTunDriverIp6Provision::SecondaryDns() const { return iSecondaryDns; }
-
-inline TUint32 TTunDriverIp6Provision::Order() const { return iOrder; }
-
-inline void TTunDriverIp6Provision::SetLocalAddr(TInetAddr aLocalAddr) { iLocalAddr = aLocalAddr;}
-    
-inline void TTunDriverIp6Provision::SetNetMask(TInetAddr aNetMask) { iNetMask = aNetMask;   }
-    
-inline void TTunDriverIp6Provision::SetBroadcastAddr(TInetAddr aBroadcastAddr) { iBroadcastAddr = aBroadcastAddr;   }
-    
-inline void TTunDriverIp6Provision::SetDefGateway(TInetAddr aDefGateway) { iDefGateway = aDefGateway; }
-    
-inline void TTunDriverIp6Provision::SetPrimaryDns(TInetAddr aPrimaryDns) { iPrimaryDns = aPrimaryDns; }
-    
-inline void TTunDriverIp6Provision::SetSecondaryDns(TInetAddr aSecondaryDns) { iSecondaryDns = aSecondaryDns; }
-
-inline void TTunDriverIp6Provision::SetOrder(const TUint32 aOrder) {  iOrder = aOrder; }
-#endif
-
-class CTunDriverProtoProvision : public CBase, public Meta::SMetaData
-/**
-Main provisioning info class that aggregates specific provisioning classes.
-*/
-    {
-public:
-    enum 
-        {
-        EUid = 0x10281C3C,          
-        ETypeId = 1
-        };
-
-public:
-    void InitialiseConfigL(ESock::CCommsDatIapView* aIapView);
-    void ProvisionNetworkConfigL(ESock::CCommsDatIapView* aIapView);
-    void ProvisionIp4ConfigL(ESock::CCommsDatIapView* aIapView, TUint32 aOrder);
-#ifdef IPV6SUPPORT
-    void ProvisionIp6ConfigL(ESock::CCommsDatIapView* aIapView, TUint32 aOrder);
-#endif
-
-public:
-    TTunDriverIp4Provision iIp4Provision;
-#ifdef IPV6SUPPORT
-    TTunDriverIp6Provision iIp6Provision;
-#endif
-    
-    DATA_VTABLE
-    };
-#endif // TUNDRIVERPROVISION_H_

--- a/linklayerprotocols/tundriver/src/0x20027F3D.rss	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +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:
-*   Header file for tundriver binder provision.
-* 
-*
-*/
-/**
- * Registry info for Tunnel Driver CFProtocol modules
- @file 0x20027F3D.RSS
- @internalComponent
-*/
-
-#include "ecom/registryinfo.rh"
-
-RESOURCE REGISTRY_INFO theInfo
-{
-dll_uid = 0x20027F3D;
-interfaces = 
-    {
-    INTERFACE_INFO
-        {
-        interface_uid = 0x10281C33;
-        implementations = 
-            {
-           	IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10281C3C;
-                version_no = 1;
-                display_name = "tun driver Flow Factory";
-                default_data = "tundriver";
-                opaque_data = "";
-                }
-            };
-		},
-	INTERFACE_INFO
-        {
-        interface_uid =  0x10274546;
-        implementations = 
-            {
-           IMPLEMENTATION_INFO
-                {
-                implementation_uid = 0x10281E05;
-                version_no = 1;
-                display_name = "tunnel driver Meta Connection Provider Factory";
-                default_data = "tundriverMCprFactory";
-                opaque_data = "";
-                }
-            };
-        }
-    };
-}

--- a/linklayerprotocols/tundriver/src/ecom_impl.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:
-*   ECOM implementation for the Tunnel Driver protocol provider factories
-* 
-*
-*/
-/**
- @file ecom_impl.cpp
- @internalTechnology
-*/
-
-
-#include <ecom/implementationproxy.h>
-#include <ecom/ecom.h>
-
-#include "tundriverflow.h"
-#include "tundrivermcprfactory.h"
-
-//
-// ECOM Implementation
-//
-
-const TImplementationProxy ImplementationTable[] =
-	{   
-	IMPLEMENTATION_PROXY_ENTRY(KTunDriverFlowImplementationUid, CTunDriverSubConnectionFlowFactory::NewL),
-	IMPLEMENTATION_PROXY_ENTRY(CTunDriverMetaConnectionProviderFactory::iUid, CTunDriverMetaConnectionProviderFactory::NewL),
-   	};
-
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-   {
-   aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-   return ImplementationTable;
-   }
-

--- a/linklayerprotocols/tundriver/src/tundriverbinder.cpp	Wed Sep 15 13:53:10 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,729 +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:
-*   Ipv4 and Ipv6 Binder configuration source file.
-* 
-*
-*/
-
-/**
- @file tundriverbinder.cpp
- @internalTechnology
- */
-
-#include <e32std.h>
-#include <eui_addr.h>
-#include <ip4_hdr.h>
-#include <udp_hdr.h>
-#include <in_chk.h>
-#include <in_iface.h>
-#include <comms-infras/nifif.h>
-#include <in_sock.h>
-#include <flow.h>
-#include "tundriverbinder.h"
-#include "tundriverprovision.h"
-
-using namespace ESock;
-
-#ifdef _DEBUG
-_LIT8(KNif,"TunDriver");
-_LIT8(KBinder4,"Binder4");
-#ifdef IPV6SUPPORT
-_LIT8(KBinder6,"Binder6");
-#endif
-#endif
-
-//////////////////////
-// CTunDriverBinder //
-//////////////////////
-
-CTunDriverBinder::CTunDriverBinder(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/*
-* Default constructor for Binder Base Class.
-*/
-        {
-        }
-
-MLowerDataSender* CTunDriverBinder::Bind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* If This Bind function is called, then there is an error in binding.
-* @param Not used here
-* @return NULL.
-*/
-    {
-    return NULL;
-    }
-
-void CTunDriverBinder::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* @param Not used here
-*/
-    {
-    }
-
-void CTunDriverBinder::SetPort(TUint aPort)
-/**
-* CTunDriverBinder::SetPort is used to set port common for Ip4Binder and Ip6Binder
-* @param aPort
-* @return
-*/
-    {
-    iPort = aPort;
-    }
-
-TUint CTunDriverBinder::GetPort()
-/**
-* CTunDriverBinder::GetPort is used to obtain port common for Ip4Binder and Ip6Binder
-* @param Not used here
-* @return iPort
-*/
-    {
-    return iPort;
-    }
-
-TBool CTunDriverBinder::MatchesUpperControl(ESock::MUpperControl* /*aUpperControl*/) const
-/**
-* Virtual Function, Implementation is binder specific (IPv4 or IPv6)
-* If This MatchesUpperControl function is called, then there is an error in binding.
-* @param Not used here
-* @return EFalse.
-*/
-    {
-    return EFalse;
-    }
-
-CTunDriverBinder4* CTunDriverBinder4::NewL(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::NewL
-* This function is invoked by the flow. This CTunDriverBinder4 is IPv4 specific.
-* @param CTunDriverSubConnectionFlow
-* @return CTunDriverSubConnectionFlow.
-*/
-    {
-    CTunDriverBinder4* self = new (ELeave)CTunDriverBinder4(aTunDriverSubConnectionFlow);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-void CTunDriverBinder4::ConstructL()
-/**
-* CTunDriverBinder4::ConstructL is the second-phase constructor.
-* This function is invoked by NewL.
-* This function initializes the asynchronous callback functions for sending and receiving packets.
-* @param 
-* @return.
-*/
-    {
-    TCallBack scb(SendCallBack, this);
-    iSendCallBack = new(ELeave) CAsyncCallBack(scb, EPriorityNormal);
-
-    TCallBack rcb(RecvCallBack, this);
-    iRecvCallBack = new(ELeave) CAsyncCallBack(rcb, EPriorityNormal);
-    }
-
-CTunDriverBinder4::CTunDriverBinder4(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : CTunDriverBinder(aTunDriverSubConnectionFlow),iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default constructor.
-* This function is invoked by NewL.
-* This function initializes localaddress to 0.0.0.0.
-* @param 
-* @return.
-*/
-        {
-        __FLOG_OPEN(KNif, KBinder4);
-        iLocalAddress = KInetAddrNone;
-        __FLOG_3(_L8("CTunDriverBinder4 %08x:\tCTunDriverBinder4(CTunDriverSubConnectionFlow& %08x): iLocalAddress %08x"), this, &aTunDriverSubConnectionFlow, iLocalAddress.Address());
-        }
-
-CTunDriverBinder4::~CTunDriverBinder4()
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default destructor.
-* This function frees the RMBufPkt queues and 
-* deletes the asynchrounous call back pointers initialized at the time of construction.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\t~CTunDriverBinder4()"), this);
-    iRecvQ.Free();
-    iSendQ.Free();
-    delete iRecvCallBack;
-    delete iSendCallBack;
-    }
-
-MLowerDataSender* CTunDriverBinder4::Bind(MUpperDataReceiver& aUpperReceiver, MUpperControl& aUpperControl)
-/**
-* CTunDriverBinder4::Bind Binds upper CommsFramwork Protocol to this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return this.
-*/
-    {
-    __FLOG_3(_L8("CTunDriverBinder4 %08x:\tBind(aUpperReceiver %08x, aUpperControl %08x)"), this, &aUpperReceiver, &aUpperControl);
-    iUpperReceiver = &aUpperReceiver;
-    iUpperControl = &aUpperControl;
-    return this;
-    }
-
-void CTunDriverBinder4::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* CTunDriverBinder4::UnBind UnBinds the assocication of CommsFramwork Protocol from this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\tUnbind()"), this);
-    iUpperReceiver = NULL;
-    iUpperControl = NULL;
-    }
-
-void CTunDriverBinder4::StartSending()
-/**
-* CTunDriverBinder4::StartSending is signaled to the upperlayer that Binder is ready to send packets.
-* This function will be called only once when the interface is started.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder4 %08x:\tBinderReady()"), this);
-    iUpperControl->StartSending();
-    }
-
-TBool CTunDriverBinder4::MatchesUpperControl(ESock::MUpperControl* aUpperControl) const
-/**
-* CTunDriverBinder4::MatchesUpperControl returns whether this binder is associated with the
-* MUpperControl object passed as argument.
-* This function will be called while Unbinding the flow.
-* @param aUpperControl upper layer to match against
-* @return ETrue on a match else EFalse.
-*/
-    {
-    return (aUpperControl == iUpperControl);
-    }
-
-MLowerDataSender::TSendResult CTunDriverBinder4::Send(RMBufChain& aData)
-/**
-* CTunDriverBinder4::Send places the stack packet in SendQueue and breaks the call.
-* Then asynchrounous callback function is invoked.
-* @param aData MBuf chain containing data to send
-* @return ESendAccepted.
-*/
-    {
-    iSendQ.Append(aData);
-    iSendCallBack->CallBack();
-    return ESendAccepted;
-    }
-
-TInt CTunDriverBinder4::GetConfig(TBinderConfig& aConfig)
-/**
-* CTunDriverBinder4::GetConfig populates the interface IPv4 configuration information.
-* This function is invoked by the upperlayer
-* @param aConfig structure.
-* @return KErrNone if IPv4 binderconfiguration exists.
-* @return KErrNotSupported otherwise. 
-*/ 
-    {
-    TBinderConfig4* config = TBinderConfig::Cast<TBinderConfig4>(aConfig);
-
-    if(config == NULL)
-        {
-        return KErrNotSupported;
-        }
-    const TTunDriverIp4Provision* ip4Provision = Flow()->Ip4Provision();
-    // Setup config
-    iLocalAddress = ip4Provision->LocalAddr();
-    config->iInfo.iFeatures = KIfCanBroadcast | KIfCanMulticast;
-    config->iInfo.iMtu = KMTU;
-    config->iInfo.iRMtu = KMTU;
-    config->iInfo.iSpeedMetric = KSpeedMetric;
-    config->iFamily = KAfInet;
-
-    __FLOG_2(_L8("CTunDriverBinder4 %08x:\tGetConfig(): iLocalAddress %08x"), this, iLocalAddress.Address());
-    config->iAddress.SetAddress(iLocalAddress.Address());
-
-
-    TInetAddr address = ip4Provision->DefGateway();
-    config->iDefGate.SetAddress(address.Address());
-    // primary DNS, just make same as default gateway
-    address = ip4Provision->PrimaryDns();
-    config->iNameSer1.SetAddress(address.Address());
-    // secondary DNS
-    address = ip4Provision->SecondaryDns();
-    config->iNameSer2.SetAddress(address.Address());
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder::Control(TUint aLevel, TUint aName, TDes8& aOption)
-/**
-* CTunDriverBinder::Control is to check wether the packet is intended for tundriver or not.
-* Called from the upperlayer to identify the special control functionality.
-* Also the sets the port number.
-* @param aLevel
-* @param aName
-* @param aOption
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/ 
-    {
-    __FLOG_3(_L("CTunDriverBinder %08x:\tControl(aLevel %x, aName %x)"), this, aLevel, aName);
-    if((aLevel == KSolInetIp) && (aName == KSoTunnelPort))
-        {
-        TInetAddr& localAddress = *(TInetAddr*) aOption.Ptr();
-        SetPort(localAddress.Port());
-        return KErrNone;
-        }
-    return KErrNotSupported;
-    }
-
-TInt CTunDriverBinder4::GetName(TDes& aName)
-/**
-* CTunDriverBinder4::GetName is to retreive the Binder4 Name.
-* Called from the upperlayer. aName is filled with Binder4 Name. 
-* @param aName
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    aName.Format(_L("TunDriver4[0x%08x]"), this);
-    __FLOG_2(_L("CTunDriverBinder4 %08x:\tGetName(): %S"), this, &aName);
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder4::RecvCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::RecvCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Receive Buffer.
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder4*)aCProtocol)->DoProcess();
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder4::SendCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::SendCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Send Buffer.
-* DoSend will process the packets if required and place the packet in the RMBufPkt Receive Queue 
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder4*)aCProtocol)->DoSend();
-    return KErrNone;
-    }
-
-void CTunDriverBinder4::DoSend()
-/**
-* CTunDriverBinder4::DoSend will retreive the packet from RMBufPkt Send Buffer.
-* Process the packets if required and puts the packet back in Receive Buffer.
-* Will be invoked by CTunDriverBinder4::SendCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket send;
-    RMBufPacket recv;
-    while (iSendQ.Remove(send))
-        {
-        TunnelProcessing(send,recv);
-        iRecvQ.Append(recv);
-        iRecvCallBack->CallBack();
-        send.Free();
-        }
-    }
-
-void CTunDriverBinder4::DoProcess()
-/**
-* CTunDriverBinder4::DoProcess will retreive the packet from RMBufPkt Receive Buffer.
-* send the packet to IP Layer for processing the packet.
-* Will be invoked by CTunDriverBinder4::ReceiveCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket packet;
-    while (iRecvQ.Remove(packet))
-        {
-        iUpperReceiver->Process(packet);
-        }
-    }
-
-void CTunDriverBinder4::TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv )
-/**
-* CTunDriverBinder4::TunnelProcessing will encapsulate with IPv4 Header if the packet is to be tunneled.
-* IP Number and port number will be configure by TUN Client.
-* If the IPPacket contains TOS Option set with 192, Packet is encapsulated else packet will be send as is.
-* Will be invoked by CTunDriverBinder4::DoSend
-* @param aPacket contains the raw packet.
-* @param aRecv will contain the payload and the encapsulated IPv4 Header.
-* @return  
-*/
-    {
-    TInt  ret;
-    TUint origPktLen;
-
-    TInet6HeaderIP4* lip4 = (TInet6HeaderIP4*) aPacket.First()->Next()->Ptr();
-    TInt outerHdrLen = TInet6HeaderIP4::MinHeaderLength()
-                       + TInet6HeaderUDP::MinHeaderLength();
-    
-    if((lip4->TOS() & KTUNDriverTos) == KTUNDriverTos)
-        {
-        RMBufChain outerHdr;
-        aRecv.Assign(aPacket);
-        RMBufPktInfo *info = aRecv.Unpack();
-        aRecv.SetInfo(info);
-        
-        origPktLen = aRecv.Length();
-        TRAP(ret, outerHdr.AllocL(outerHdrLen));
-        if (ret != KErrNone)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer IP header.");
-            aRecv.Free();
-            }
-
-        aRecv.Prepend(outerHdr);
-        info->iLength += outerHdrLen;
-
-        TInet6Checksum<TInet6HeaderUDP> outerUdp(aRecv, 20);
-        if (outerUdp.iHdr == NULL)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer UDP header.");
-            aRecv.Free();
-            }
-
-        outerUdp.iHdr->SetSrcPort(GetPort());
-        outerUdp.iHdr->SetDstPort(GetPort());
-        outerUdp.iHdr->SetLength(origPktLen + TInet6HeaderUDP::MinHeaderLength());
-        outerUdp.iHdr->SetChecksum(0);       // Compute checksum
-
-        TInet6Checksum<TInet6HeaderIP4> outerIP(aRecv);
-        outerIP.iHdr->Init();
-        outerIP.iHdr->SetHeaderLength(TInet6HeaderIP4::MinHeaderLength());
-        outerIP.iHdr->SetTotalLength(origPktLen + outerHdrLen);
-        outerIP.iHdr->SetTOS(1);
-        outerIP.iHdr->SetProtocol(KProtocolInetUdp);
-        outerIP.iHdr->SetSrcAddr(iLocalAddress.Address()) ;
-        outerIP.iHdr->SetDstAddr(iLocalAddress.Address());
-        outerIP.ComputeChecksum();
-        aRecv.Pack();
-        }
-    }
-#ifdef IPV6SUPPORT
-CTunDriverBinder6* CTunDriverBinder6::NewL(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder6::NewL
-* This function is invoked by the flow. This CTunDriverBinder4 is IPv4 specific.
-* @param CTunDriverSubConnectionFlow
-* @return CTunDriverSubConnectionFlow.
-*/
-    {
-    CTunDriverBinder6* self = new (ELeave)CTunDriverBinder6(aTunDriverSubConnectionFlow);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-void CTunDriverBinder6::ConstructL()
-/**
-* CTunDriverBinder4::ConstructL is the second-phase constructor.
-* This function is invoked by NewL.
-* This function initializes the asynchronous callback functions for sending and receiving packets.
-* @param 
-* @return.
-*/
-    {
-    TCallBack scb(SendCallBack, this);
-    iSendCallBack = new(ELeave) CAsyncCallBack(scb, EPriorityNormal);
-
-    TCallBack rcb(RecvCallBack, this);
-    iRecvCallBack = new(ELeave) CAsyncCallBack(rcb, EPriorityNormal);
-    }
-
-CTunDriverBinder6::CTunDriverBinder6(CTunDriverSubConnectionFlow& aTunDriverSubConnectionFlow) : CTunDriverBinder(aTunDriverSubConnectionFlow),iTunDriverSubConnectionFlow(aTunDriverSubConnectionFlow)
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default constructor.
-* This function is invoked by NewL.
-* This function initializes localaddress to 0.0.0.0.
-* @param 
-* @return.
-*/        
-    {
-    __FLOG_OPEN(KNif, KBinder6);
-    iLocalAddress.SetAddress(KInet6AddrNone);
-    __FLOG_3(_L8("CTunDriverBinder6 %08x:\tCTunDriverBinder6(CTunDriverSubConnectionFlow& %08x): iLocalAddress %08x"), this, &aTunDriverSubConnectionFlow, iLocalAddress.Address());
-    }
-
-CTunDriverBinder6::~CTunDriverBinder6()
-/**
-* CTunDriverBinder4::CTunDriverBinder4 is the default destructor.
-* This function frees the RMBufPkt queues and 
-* deletes the asynchrounous call back pointers initialized at the time of construction.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\t~CTunDriverBinder6()"), this);
-    iRecvQ.Free();
-    iSendQ.Free();
-    delete iRecvCallBack;
-    delete iSendCallBack;
-    }
-
-MLowerDataSender* CTunDriverBinder6::Bind(MUpperDataReceiver& aUpperReceiver, MUpperControl& aUpperControl)
-/**
-* CTunDriverBinder4::Bind Binds upper CommsFramwork Protocol to this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return this.
-*/
-    {
-    __FLOG_3(_L8("CTunDriverBinder6 %08x:\tBind(aUpperReceiver %08x, aUpperControl %08x)"), this, &aUpperReceiver, &aUpperControl);
-    iUpperReceiver = &aUpperReceiver;
-    iUpperControl = &aUpperControl;
-    return this;
-    }
-
-void CTunDriverBinder6::Unbind(MUpperDataReceiver& /*aUpperReceiver*/, MUpperControl& /*aUpperControl*/)
-/**
-* CTunDriverBinder4::UnBind UnBinds the assocication of CommsFramwork Protocol from this CommsFramwork Protocol.
-* @param aUpperReceiver A pointer to Upper layer Receive class
-* @param aUpperControl A pointer to Upper layer control class
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\tUnbind()"), this);
-    iUpperReceiver = NULL;
-    iUpperControl = NULL;
-    }
-
-void CTunDriverBinder6::StartSending()
-/**
-* CTunDriverBinder4::StartSending is signaled to the upperlayer that Binder is ready to send packets.
-* This function will be called only once when the interface is started.
-* @param 
-* @return.
-*/
-    {
-    __FLOG_1(_L8("CTunDriverBinder6 %08x:\tBinderReady()"), this);
-    iUpperControl->StartSending();
-    }
-
-TBool CTunDriverBinder6::MatchesUpperControl(ESock::MUpperControl* aUpperControl) const
-/**
-* CTunDriverBinder4::MatchesUpperControl returns whether this binder is associated with the
-* MUpperControl object passed as argument.
-* This function will be called while Unbinding the flow.
-* @param aUpperControl upper layer to match against
-* @return ETrue on a match else EFalse.
-*/
-    {
-    return (aUpperControl == iUpperControl);
-    }
-
-MLowerDataSender::TSendResult CTunDriverBinder6::Send(RMBufChain& aData)
-/**
-* CTunDriverBinder4::Send places the stack packet in SendQueue and breaks the call.
-* Then asynchrounous callback function is invoked.
-* @param aData MBuf chain containing data to send
-* @return ESendAccepted.
-*/
-    {
-    iSendQ.Append(aData);
-    iSendCallBack->CallBack();
-    return ESendAccepted;
-    }
-
-TInt CTunDriverBinder6::GetConfig(TBinderConfig& aConfig)
-/**
-* CTunDriverBinder4::GetConfig populates the interface IPv4 configuration information.
-* This function is invoked by the upperlayer
-* @param aConfig structure.
-* @return KErrNone if IPv4 binderconfiguration exists.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    TBinderConfig6* config = TBinderConfig::Cast<TBinderConfig6>(aConfig);
-
-    if(config == NULL)
-        {
-        return KErrNotSupported;
-        }
-    const TTunDriverIp6Provision* ip6Provision = Flow()->Ip6Provision();
-    // Setup config
-    iLocalAddress = ip6Provision->LocalAddr();
-    config->iInfo.iFeatures = KIfCanBroadcast | KIfCanMulticast;
-    config->iInfo.iMtu = KMTU;
-    config->iInfo.iRMtu = KMTU;
-    config->iInfo.iSpeedMetric = KSpeedMetric;
-    config->iFamily = KAfInet6;
-
-    __FLOG_2(_L8("CTunDriverBinder6 %08x:\tGetConfig(): iLocalAddress %08x"), this, iLocalAddress.Address());
-
-    // primary DNS, just make same as default gateway
-    TInetAddr address = ip6Provision->PrimaryDns();
-    config->iNameSer1 = address;
-    // secondary DNS
-    address = ip6Provision->SecondaryDns();
-    config->iNameSer2 = address;
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::GetName(TDes& aName)
-/**
-* CTunDriverBinder4::GetName is to retreive the Binder4 Name.
-* Called from the upperlayer. aName is filled with Binder4 Name. 
-* @param aName
-* @return KErrNone if packet is intended for Ipv4 tundriver.
-* @return KErrNotSupported otherwise. 
-*/
-    {
-    aName.Format(_L("TunDriver6[0x%08x]"), this);
-    __FLOG_2(_L("CTunDriverBinder6 %08x:\tGetName(): %S"), this, &aName);
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::RecvCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::RecvCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Receive Buffer.
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder6*)aCProtocol)->DoProcess();
-    return KErrNone;
-    }
-
-TInt CTunDriverBinder6::SendCallBack(TAny* aCProtocol)
-/**
-* CTunDriverBinder4::SendCallBack is asynchronous callback function to send the packets to IP Layer.
-* Will be invoked whenever there is a packet in the RMBufPkt Send Buffer.
-* DoSend will process the packets if required and place the packet in the RMBufPkt Receive Queue 
-* @param aCProtocol contains the this object.
-* @return KErrNone 
-*/
-    {
-    ((CTunDriverBinder6*)aCProtocol)->DoSend();
-    return KErrNone;
-    }
-
-void CTunDriverBinder6::DoSend()
-/**
-* CTunDriverBinder4::DoSend will retreive the packet from RMBufPkt Send Buffer.
-* Process the packets if required and puts the packet back in Receive Buffer.
-* Will be invoked by CTunDriverBinder4::SendCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket send;
-    RMBufPacket recv;
-    while (iSendQ.Remove(send))
-        {
-        TunnelProcessing(send,recv);
-        iRecvQ.Append(recv);
-        iRecvCallBack->CallBack();
-        send.Free();
-        }
-    }
-
-void CTunDriverBinder6::DoProcess()
-/**
-* CTunDriverBinder4::DoProcess will retreive the packet from RMBufPkt Receive Buffer.
-* send the packet to IP Layer for processing the packet.
-* Will be invoked by CTunDriverBinder4::ReceiveCallback
-* @param 
-* @return  
-*/
-    {
-    RMBufPacket packet;
-    while (iRecvQ.Remove(packet))
-        {
-        iUpperReceiver->Process(packet);
-        }
-    }
-
-void CTunDriverBinder6::TunnelProcessing(RMBufPacket& aPacket, RMBufPacket& aRecv )
-/**
-* CTunDriverBinder4::TunnelProcessing will encapsulate with IPv4 Header if the packet is to be tunneled.
-* IP Number and port number will be configure by TUN Client.
-* If the IPPacket contains TOS Option set with 192, Packet is encapsulated else packet will be send as is.
-* Will be invoked by CTunDriverBinder4::DoSend
-* @param aPacket contains the raw packet.
-* @param aRecv will contain the payload and the encapsulated IPv4 Header.
-* @return  
-*/
-    {
-    TInt  ret;
-    TUint origPktLen;
-
-    TInet6HeaderIP* lip6 = (TInet6HeaderIP*) aPacket.First()->Next()->Ptr();
-    TInt outerHdrLen = TInet6HeaderIP4::MinHeaderLength()
-                       + TInet6HeaderUDP::MinHeaderLength();
-    
-    if((lip6->HopLimit() & KTUNDriverTos) == KTUNDriverTos)        
-        {
-        RMBufChain outerHdr;
-        aRecv.Assign(aPacket);
-        RMBufPktInfo *info = aRecv.Unpack();
-        aRecv.SetInfo(info);
-        
-        origPktLen = aRecv.Length();
-        TRAP(ret, outerHdr.AllocL(outerHdrLen));
-        if (ret != KErrNone)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer IP header.");
-            aRecv.Free();
-            }
-
-        TInet6HeaderIP *hdrBuf = (TInet6HeaderIP*) outerHdr.First()->Buffer();
-        aRecv.Prepend(outerHdr);
-        info->iLength += outerHdrLen;
-
-        TInet6Checksum<TInet6HeaderUDP> outerUdp(aRecv, 20);
-        if (outerUdp.iHdr == NULL)
-            {
-            RDebug::Printf("\nVirtual tunnel nif: tunnel processing: Error in Allocating the outer UDP header.");
-            aRecv.Free();
-            }
-
-        outerUdp.iHdr->SetSrcPort(GetPort());
-        outerUdp.iHdr->SetDstPort(GetPort());
-        outerUdp.iHdr->SetLength(origPktLen + TInet6HeaderUDP::MinHeaderLength());
-        outerUdp.iHdr->SetChecksum(0);
-
-        TInet6Checksum<TInet6HeaderIP> outerIP(aRecv);
-        outerIP.iHdr->Init();
-        outerIP.iHdr->SetHopLimit(1);
-        outerIP.iHdr->SetNextHeader(KProtocolInetUdp);
-        outerIP.iHdr->SetSrcAddr(iLocalAddress.Ip6Address());
-        outerIP.iHdr->SetDstAddr(iLocalAddress.Ip6Address());
-        aRecv.Pack();
-        }
-    }
-    
-CTunDriverSubConnectionFlow* CTunDriverBinder6::Flow()
-    {
-    return &iTunDriverSubConnectionFlow;
-    }
-
-#endif