equal
deleted
inserted
replaced
230 // Client type could be Messages::TClientType::EWorker (Selection Request) |
230 // Client type could be Messages::TClientType::EWorker (Selection Request) |
231 // or ESock::TCFClientType::ECtrl, possibly others but not ESock::TCFClientType::EData |
231 // or ESock::TCFClientType::ECtrl, possibly others but not ESock::TCFClientType::EData |
232 // which is handled by another activity |
232 // which is handled by another activity |
233 __ASSERT_DEBUG(msg.iClientType.Type() != (TUint32)TCFClientType::EData, User::Panic(KSpecAssert_ESockCrStaCPRSC, 3)); |
233 __ASSERT_DEBUG(msg.iClientType.Type() != (TUint32)TCFClientType::EData, User::Panic(KSpecAssert_ESockCrStaCPRSC, 3)); |
234 |
234 |
235 // iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iValue)); |
235 iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iClientType.Flags())); |
236 iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl)); |
236 |
237 //Send confirmation |
237 //Send confirmation |
238 RClientInterface::OpenPostMessageClose(iContext.NodeId(), iContext.iSender, TCFPeer::TJoinComplete().CRef()); |
238 RClientInterface::OpenPostMessageClose(iContext.NodeId(), iContext.iSender, TCFPeer::TJoinComplete().CRef()); |
239 } |
239 } |
240 else |
240 else |
241 { |
241 { |
2125 __ASSERT_DEBUG(iContext.iNodeActivity, CorePrPanic(KPanicNoActivity)); |
2125 __ASSERT_DEBUG(iContext.iNodeActivity, CorePrPanic(KPanicNoActivity)); |
2126 |
2126 |
2127 iContext.iNodeActivity->SetError(static_cast<TSigNumber&>(iContext.iMessage).iValue); |
2127 iContext.iNodeActivity->SetError(static_cast<TSigNumber&>(iContext.iMessage).iValue); |
2128 } |
2128 } |
2129 |
2129 |
2130 DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext) |
2130 EXPORT_DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext) |
2131 void TCancelAndCloseZone0ClientExtIfaces::DoL() |
2131 void TCancelAndCloseZone0ClientExtIfaces::DoL() |
2132 { |
2132 { |
2133 //0 means we will cancel and close all open extensions! |
2133 //0 means we will cancel and close all open extensions! |
2134 TCancelAndCloseAllClientExtItf msg(0); |
2134 TCancelAndCloseAllClientExtItf msg(0); |
2135 iContext.Node().PostToClients<TDefaultClientMatchPolicy>(iContext.NodeId(), msg, |
2135 iContext.Node().PostToClients<TDefaultClientMatchPolicy>(iContext.NodeId(), msg, |
2180 msg.ForwardL(iContext); |
2180 msg.ForwardL(iContext); |
2181 } |
2181 } |
2182 } |
2182 } |
2183 |
2183 |
2184 EXPORT_DEFINE_SMELEMENT(TCancelStart, NetStateMachine::MStateTransition, CoreNetStates::TContext) |
2184 EXPORT_DEFINE_SMELEMENT(TCancelStart, NetStateMachine::MStateTransition, CoreNetStates::TContext) |
2185 void TCancelStart::DoL() |
2185 EXPORT_C void TCancelStart::DoL() |
2186 { |
2186 { |
2187 CNodeActivityBase* startActivity = iContext.Node().FindActivityById(ECFActivityStart); |
2187 CNodeActivityBase* startActivity = iContext.Node().FindActivityById(ECFActivityStart); |
2188 if (startActivity) |
2188 if (startActivity) |
2189 { |
2189 { |
2190 startActivity->Cancel(iContext); |
2190 startActivity->Cancel(iContext); |