--- a/datacommsserver/esockserver/core_states/ss_coreprstates.cpp Mon Sep 06 13:49:23 2010 +0100
+++ b/datacommsserver/esockserver/core_states/ss_coreprstates.cpp Mon Sep 13 15:06:46 2010 +0100
@@ -232,8 +232,8 @@
// which is handled by another activity
__ASSERT_DEBUG(msg.iClientType.Type() != (TUint32)TCFClientType::EData, User::Panic(KSpecAssert_ESockCrStaCPRSC, 3));
-// iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iValue));
- iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl));
+ iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iClientType.Flags()));
+
//Send confirmation
RClientInterface::OpenPostMessageClose(iContext.NodeId(), iContext.iSender, TCFPeer::TJoinComplete().CRef());
}
@@ -764,7 +764,7 @@
//TODO: TNodePeerId should become internal. When this happens, FirstOriginator should return
// RNodeInterface.
iContext.iNodeActivity->PostRequestTo(
- address_cast<Messages::TNodeId>(iContext.iNodeActivity->SoleOriginator().RecipientId()),
+ iContext.iNodeActivity->SoleOriginator().Peer(),
TCFDataClient::TBindTo(binderResponse.iNodeId).CRef());
}
@@ -2127,7 +2127,7 @@
iContext.iNodeActivity->SetError(static_cast<TSigNumber&>(iContext.iMessage).iValue);
}
-DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext)
+EXPORT_DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext)
void TCancelAndCloseZone0ClientExtIfaces::DoL()
{
//0 means we will cancel and close all open extensions!
@@ -2182,7 +2182,7 @@
}
EXPORT_DEFINE_SMELEMENT(TCancelStart, NetStateMachine::MStateTransition, CoreNetStates::TContext)
-void TCancelStart::DoL()
+EXPORT_C void TCancelStart::DoL()
{
CNodeActivityBase* startActivity = iContext.Node().FindActivityById(ECFActivityStart);
if (startActivity)