equal
deleted
inserted
replaced
667 //Check whether KDataTransferUnblocked is received and if yes, then traslate it to KConnectionUp (== KLinkLayerOpen) |
667 //Check whether KDataTransferUnblocked is received and if yes, then traslate it to KConnectionUp (== KLinkLayerOpen) |
668 // the log only sees the translated version, this goes into the queue, so it alright I suppose. |
668 // the log only sees the translated version, this goes into the queue, so it alright I suppose. |
669 if (progress.iStage == KDataTransferUnblocked ) |
669 if (progress.iStage == KDataTransferUnblocked ) |
670 { |
670 { |
671 progress.iStage = KConnectionUp; // KLinkLayerOpen |
671 progress.iStage = KConnectionUp; // KLinkLayerOpen |
|
672 } |
|
673 if (progress.iError == KErrForceDisconnected) |
|
674 { |
|
675 progress.iError = KErrDisconnected; |
672 } |
676 } |
673 |
677 |
674 LOG( ESockLog::Printf(KESockConnectionTag, _L("CConnection %08x:\tProgressNotification(TInt aStage %d, TInt aError %d)"), |
678 LOG( ESockLog::Printf(KESockConnectionTag, _L("CConnection %08x:\tProgressNotification(TInt aStage %d, TInt aError %d)"), |
675 &(iContext.Node()), progress.iStage, progress.iError) ); |
679 &(iContext.Node()), progress.iStage, progress.iError) ); |
676 |
680 |
1018 } |
1022 } |
1019 |
1023 |
1020 return EFalse; |
1024 return EFalse; |
1021 } |
1025 } |
1022 |
1026 |
|
1027 DEFINE_SMELEMENT(CStartAttachActivity::TSetIdleIfStopOutstanding, NetStateMachine::MStateTransition, TContext) |
|
1028 void CStartAttachActivity::TSetIdleIfStopOutstanding::DoL() |
|
1029 { |
|
1030 __ASSERT_DEBUG(iContext.iNodeActivity, ConnPanic(KPanicNoActivity)); |
|
1031 ConnActivities::CStartAttachActivity& activity = static_cast<ConnActivities::CStartAttachActivity&>(*iContext.iNodeActivity); |
|
1032 |
|
1033 // If there is a stop activity outstanding then we set this start activity idle |
|
1034 TInt numRunningStopActivities = iContext.Node().CountActivities(ESock::ECFActivityStop); |
|
1035 if (numRunningStopActivities > 0) |
|
1036 { |
|
1037 activity.SetIdle(); |
|
1038 } |
|
1039 } |
|
1040 |
1023 |
1041 |
1024 #ifdef SYMBIAN_NETWORKING_UPS |
1042 #ifdef SYMBIAN_NETWORKING_UPS |
1025 |
1043 |
1026 DEFINE_SMELEMENT(CStartAttachActivity::TSendPolicyCheckRequestToServiceProvider, NetStateMachine::MStateTransition, ConnStates::TContext) |
1044 DEFINE_SMELEMENT(CStartAttachActivity::TSendPolicyCheckRequestToServiceProvider, NetStateMachine::MStateTransition, ConnStates::TContext) |
1027 void CStartAttachActivity::TSendPolicyCheckRequestToServiceProvider::DoL() |
1045 void CStartAttachActivity::TSendPolicyCheckRequestToServiceProvider::DoL() |