# HG changeset patch # User hgs # Date 1282708383 -19800 # Node ID 5eca823bbf17c730a0778873c7f8c1f08618b8d9 # Parent b285782036ce5dfe494c263e3175bded126f36f5 201031_01 diff -r b285782036ce -r 5eca823bbf17 linklayercontrol/networkinterfacemgr/agentprcore/src/agentcpr.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentcpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentcpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -53,12 +53,6 @@ using namespace ESock; using namespace NetStateMachine; -//We reserve space for two preallocated activities that may start concurrently on the CPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KAgentCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - // Agent SCPR Going Down Activity namespace AgentDataClientGoneDownActivity { @@ -116,7 +110,7 @@ { CAgentConnectionProvider* self = new (ELeave) CAgentConnectionProvider(aFactory); CleanupStack::PushL(self); - self->ConstructL(KAgentCPRPreallocatedActivityBufferSize); + self->ConstructL(); CleanupStack::Pop(self); return self; } diff -r b285782036ce -r 5eca823bbf17 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -56,12 +56,6 @@ using namespace ESock; using namespace NetStateMachine; -//We reserve space for two preallocated activities that may start concurrently on the SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KAgentSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - /** Creates an Agent SubConnection Provider @param aFactory The parent factory which has created the SCPr @@ -71,7 +65,7 @@ { CAgentSubConnectionProvider* self = new (ELeave) CAgentSubConnectionProvider(aFactory, AgentSCprActivities::agentSCprActivities::Self()); CleanupStack::PushL(self); - self->ConstructL(KAgentSCPRPreallocatedActivityBufferSize); + self->ConstructL(); CleanupStack::Pop(self); return self; } @@ -245,6 +239,7 @@ iStoppingReason = aReason; AgentProvisionInfo()->AgentAdapter()->DisconnectAgent(aReason); } + //ProgressL(KConnectionUninitialised); } /** diff -r b285782036ce -r 5eca823bbf17 linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -74,7 +74,7 @@ namespace AgentSCprStopActivity { // Note: use of TStopYourFlows/TAwaitingFlowDown/TNoTag (i.e. no looping) as there is only one flow at the Agent level. -DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, AgentSCprStop, TCFDataClient::TStop, MeshMachine::CNodeRetryActivity::NewL) +DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, AgentSCprStop, TCFDataClient::TStop, MeshMachine::CPreallocatedNodeRetryActivity::New) FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingDataClientStop, PRDataClientStopActivity::TNoTagOrProviderStoppedBlockedByStart) NODEACTIVITY_ENTRY(KNoTag, SCprStates::TStopYourFlows, CoreNetStates::TAwaitingDataClientStopped, MeshMachine::TTag) diff -r b285782036ce -r 5eca823bbf17 linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp --- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -22,6 +22,7 @@ #include #include #include +#include #include "tunnelagentcpr.h" #include "tunnelagentcprstates.h" @@ -46,12 +47,6 @@ using namespace AgentCprStates; using namespace TunnelAgentCprStates; -//We reserve space for two preallocated activities that may start concurrently on the CPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KTunnelCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - namespace TunnelAgentCprStartActivity { DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStart, TunnelCprStart, TCFServiceProvider::TStart, PRActivities::CStartActivity::NewL) @@ -65,7 +60,6 @@ LAST_NODEACTIVITY_ENTRY(KErrorTag, MeshMachine::TDoNothing) NODEACTIVITY_END() } - namespace TunnelGoneDownActivity { DECLARE_DEFINE_NODEACTIVITY(ECFActivityGoneDown, TunnelGoneDown, TCFControlClient::TGoneDown) @@ -104,7 +98,7 @@ { CTunnelAgentConnectionProvider* self = new (ELeave) CTunnelAgentConnectionProvider(aFactory); CleanupStack::PushL(self); - self->ConstructL(KTunnelCPRPreallocatedActivityBufferSize); + self->ConstructL(); CleanupStack::Pop(self); return self; } diff -r b285782036ce -r 5eca823bbf17 linklayerprotocols/pppnif/SPPP/pppscpr.cpp --- a/linklayerprotocols/pppnif/SPPP/pppscpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/linklayerprotocols/pppnif/SPPP/pppscpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -38,12 +38,6 @@ _LIT8(KPppSCprSubTag, "pppscpr"); #endif -//We reserve space for two preallocated activities that may start concurrently on the SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KPPPSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - namespace PppSCprStates { @@ -101,7 +95,7 @@ { CPppSubConnectionProvider* self = new (ELeave) CPppSubConnectionProvider(aFactory, PppSCprActivities::pppSCprActivities::Self()); CleanupStack::PushL(self); - self->ConstructL(KPPPSCPRPreallocatedActivityBufferSize); + self->ConstructL(); CleanupStack::Pop(); return self; } diff -r b285782036ce -r 5eca823bbf17 networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp --- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -57,14 +57,6 @@ using namespace NetStateMachine; using namespace PRActivities; - - -//We reserve space for two preallocated activities that may start concurrently on the CPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPProtoCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // Activities @@ -297,7 +289,7 @@ iTimer = COneShotTimer::NewL(ESocketTimerPriority, this); ADataMonitoringProvider::ConstructL(); - CCoreConnectionProvider::ConstructL(KIPProtoCPRPreallocatedActivityBufferSize); + CCoreConnectionProvider::ConstructL(); } void CIPProtoConnectionProvider::ReturnInterfacePtrL(ADataMonitoringProtocolReq*& aInterface) diff -r b285782036ce -r 5eca823bbf17 networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp --- a/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -33,12 +33,6 @@ using namespace IPProtoSCpr; using namespace MeshMachine; -//We reserve space for two preallocated activities that may start concurrently on the SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPProtoSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // Activities @@ -142,7 +136,7 @@ void CIPProtoSubConnectionProvider::ConstructL() { ADataMonitoringProvider::ConstructL(); - CCoreSubConnectionProvider::ConstructL(KIPProtoSCPRPreallocatedActivityBufferSize); + CCoreSubConnectionProvider::ConstructL(); } diff -r b285782036ce -r 5eca823bbf17 networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp --- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -35,12 +35,6 @@ using namespace IPProtoDeftSCpr; using namespace MeshMachine; -//We reserve space for two preallocated activities that may start concurrently on the default SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPProtoDeftSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // Activities @@ -58,7 +52,7 @@ namespace IPProtoDeftSCprDataClientStopActivity { -DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, IPProtoDeftSCprStop, TCFDataClient::TStop, MeshMachine::CNodeRetryActivity::NewL) +DECLARE_DEFINE_CUSTOM_NODEACTIVITY(ECFActivityStopDataClient, IPProtoDeftSCprStop, TCFDataClient::TStop, MeshMachine::CPreallocatedNodeRetryActivity::New) FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingDataClientStop, TNoTagOrProviderStoppedOrDaemonReleased) NODEACTIVITY_ENTRY(KNoTag, TStopNetCfgExt, TAwaitingStateChange, TDaemonReleasedStateChangedOrNoTag) NODEACTIVITY_ENTRY(KNoTag, TForwardToControlProviderAndResetSentTo, TAwaitingStateChange, TDaemonReleasedStateChangedOrNoTagBackward) @@ -173,7 +167,7 @@ void CIPProtoDeftSubConnectionProvider::ConstructL() { ADataMonitoringProvider::ConstructL(); - CCoreSubConnectionProvider::ConstructL(KIPProtoDeftSCPRPreallocatedActivityBufferSize); + CCoreSubConnectionProvider::ConstructL(); } @@ -196,6 +190,9 @@ CIPProtoDeftSubConnectionProvider::~CIPProtoDeftSubConnectionProvider() { + // In case network is not configured i.e. AP might get close in case for WIFi for an example, DHCP registration + //will get failed. There is not point listening to such Progresses. So can notification and delete + //delete CNetCfgExtNotify pointer). if(iNetworkConfigurationState == EFalse) { if(iNotify) @@ -206,6 +203,7 @@ } if (iControl) delete iControl; + //incase registration is successful and Network is configured. if (iNotify) { delete iNotify; diff -r b285782036ce -r 5eca823bbf17 networkcontrol/iptransportlayer/src/IPCpr.cpp --- a/networkcontrol/iptransportlayer/src/IPCpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/iptransportlayer/src/IPCpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -41,12 +41,6 @@ using namespace NetStateMachine; using namespace MeshMachine; -//We reserve space for two preallocated activities that may start concurrently on the CPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // CIPConnectionProvider methods @@ -56,7 +50,7 @@ { CIPConnectionProvider* provider = new (ELeave) CIPConnectionProvider(aFactory); CleanupStack::PushL(provider); - provider->ConstructL(KIPCPRPreallocatedActivityBufferSize); + provider->ConstructL(); CleanupStack::Pop(provider); return provider; } diff -r b285782036ce -r 5eca823bbf17 networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp --- a/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -50,12 +50,6 @@ using namespace PRActivities; using namespace CoreNetStates; -//We reserve space for two preallocated activities that may start concurrently on the default base SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPDeftBaseSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // States @@ -361,7 +355,7 @@ { CIpDefaultBaseSubConnectionProvider* provider = new (ELeave) CIpDefaultBaseSubConnectionProvider(aFactory, IPDeftBaseSCprActivities::ipdeftbasescprActivityMap::Self()); CleanupStack::PushL(provider); - provider->ConstructL(KIPDeftBaseSCPRPreallocatedActivityBufferSize); + provider->ConstructL(); CleanupStack::Pop(provider); return provider; diff -r b285782036ce -r 5eca823bbf17 networkcontrol/iptransportlayer/src/ipdeftscpr.cpp --- a/networkcontrol/iptransportlayer/src/ipdeftscpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/iptransportlayer/src/ipdeftscpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -42,12 +42,6 @@ using namespace PRActivities; using namespace CoreNetStates; -//We reserve space for two preallocated activities that may start concurrently on the default SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPDefaultSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - //-========================================================= // // States @@ -185,7 +179,7 @@ { CIpDefaultSubConnectionProvider* provider = new (ELeave) CIpDefaultSubConnectionProvider(aFactory); CleanupStack::PushL(provider); - provider->ConstructL(KIPDefaultSCPRPreallocatedActivityBufferSize); + provider->ConstructL(); CleanupStack::Pop(provider); return provider; diff -r b285782036ce -r 5eca823bbf17 networkcontrol/iptransportlayer/src/ipscpr.cpp --- a/networkcontrol/iptransportlayer/src/ipscpr.cpp Sat Jul 31 02:05:39 2010 +0530 +++ b/networkcontrol/iptransportlayer/src/ipscpr.cpp Wed Aug 25 09:23:03 2010 +0530 @@ -41,12 +41,6 @@ using namespace ESock; using namespace NetStateMachine; -//We reserve space for two preallocated activities that may start concurrently on the SCPR -//node: destroy and data client stop. -static const TUint KDefaultMaxPreallocatedActivityCount = 2; -static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>); -static const TUint KIPSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize; - namespace IPSCprAddressUpdate { DECLARE_DEFINE_NODEACTIVITY(IPDeftSCprBaseActivities::ECFActivityAddressUpdate, IPSCprAddressUpdate, TCFIPMessage::TDataClientRouted) @@ -168,7 +162,7 @@ IP SubConnection Provider Second Phase Constructor */ { - CIpSubConnectionProviderBase::ConstructL(KIPSCPRPreallocatedActivityBufferSize); + CIpSubConnectionProviderBase::ConstructL(); } RNodeInterface* CIpSubConnectionProvider::NewClientInterfaceL(const TClientType& aClientType, TAny* /*aClientInfo*/)