equal
deleted
inserted
replaced
21 */ |
21 */ |
22 |
22 |
23 |
23 |
24 #include <comms-infras/corescprstates.h> |
24 #include <comms-infras/corescprstates.h> |
25 #include <comms-infras/corescpractivities.h> |
25 #include <comms-infras/corescpractivities.h> |
26 #include "ipprotocprstates.h" |
26 #include "IPProtoCprStates.h" |
27 |
27 |
28 #include "ipprotodeftscpr.h" |
28 #include "ipprotodeftscpr.h" |
29 #include "ipprotodeftscprstates.h" |
29 #include "ipprotodeftscprstates.h" |
30 #include <comms-infras/linkmessages.h> // for TLinkMessage |
30 #include <comms-infras/linkmessages.h> // for TLinkMessage |
31 #include <comms-infras/ss_msgintercept.h> |
31 #include <comms-infras/ss_msgintercept.h> |
162 CIPProtoDeftSubConnectionProvider::CIPProtoDeftSubConnectionProvider(ESock::CSubConnectionProviderFactoryBase& aFactory) |
162 CIPProtoDeftSubConnectionProvider::CIPProtoDeftSubConnectionProvider(ESock::CSubConnectionProviderFactoryBase& aFactory) |
163 :CCoreSubConnectionProvider(aFactory, IPProtoDeftSCpr::stateMap::Self()), |
163 :CCoreSubConnectionProvider(aFactory, IPProtoDeftSCpr::stateMap::Self()), |
164 ALegacySubConnectionActiveApiExt(this), |
164 ALegacySubConnectionActiveApiExt(this), |
165 TIfStaticFetcherNearestInHierarchy(this), |
165 TIfStaticFetcherNearestInHierarchy(this), |
166 iNotify(NULL), |
166 iNotify(NULL), |
167 iControl(NULL) |
167 iControl(NULL), |
|
168 iNetworkConfigurationState(EFalse) |
168 { |
169 { |
169 LOG_NODE_CREATE(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider); |
170 LOG_NODE_CREATE(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider); |
170 } |
171 } |
171 |
172 |
172 void CIPProtoDeftSubConnectionProvider::ConstructL() |
173 void CIPProtoDeftSubConnectionProvider::ConstructL() |
193 return prov; |
194 return prov; |
194 } |
195 } |
195 |
196 |
196 CIPProtoDeftSubConnectionProvider::~CIPProtoDeftSubConnectionProvider() |
197 CIPProtoDeftSubConnectionProvider::~CIPProtoDeftSubConnectionProvider() |
197 { |
198 { |
|
199 if(iNetworkConfigurationState == EFalse) |
|
200 { |
|
201 if(iNotify) |
|
202 { |
|
203 delete iNotify; |
|
204 iNotify = NULL; |
|
205 } |
|
206 } |
198 if (iControl) |
207 if (iControl) |
199 delete iControl; |
208 delete iControl; |
200 if (iNotify) |
209 if (iNotify) |
|
210 { |
201 delete iNotify; |
211 delete iNotify; |
|
212 iNotify = NULL; |
|
213 } |
202 |
214 |
203 LOG_NODE_DESTROY(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider); |
215 LOG_NODE_DESTROY(KIPProtoDeftScprTag, CIPProtoDeftSubConnectionProvider); |
204 } |
216 } |
205 |
217 |
206 void CIPProtoDeftSubConnectionProvider::ReturnInterfacePtrL(ADataMonitoringProtocolReq*& aInterface) |
218 void CIPProtoDeftSubConnectionProvider::ReturnInterfacePtrL(ADataMonitoringProtocolReq*& aInterface) |