--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentcpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentcpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
}
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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);
}
/**
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/agentscpractivities.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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<CoreNetStates::KProviderStopped>)
--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/tunnelagentcpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -22,6 +22,7 @@
#include <comms-infras/ss_log.h>
#include <elements/sm_core.h>
#include <comms-infras/corecpractivities.h>
+#include <comms-infras/ss_corepractivities.h>
#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;
}
--- a/linklayerprotocols/pppnif/SPPP/pppscpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/linklayerprotocols/pppnif/SPPP/pppscpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
}
--- a/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoCPR.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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)
--- a/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/IPProtoSCPR.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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();
}
--- a/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/ipnetworklayer/src/ipprotodeftscpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
--- a/networkcontrol/iptransportlayer/src/IPCpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/IPCpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
}
--- a/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipdeftbasescpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
--- a/networkcontrol/iptransportlayer/src/ipdeftscpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipdeftscpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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;
--- a/networkcontrol/iptransportlayer/src/ipscpr.cpp Wed Aug 18 11:18:20 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipscpr.cpp Thu Sep 02 22:05:12 2010 +0300
@@ -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*/)