287 // Wait for Policy Server Response |
287 // Wait for Policy Server Response |
288 NODEACTIVITY_ENTRY( S60MCprStates::KWaitPolicyServerResponse, |
288 NODEACTIVITY_ENTRY( S60MCprStates::KWaitPolicyServerResponse, |
289 S60MCprMobilityActivity::TDoNothingOrReSendPendingNotification, |
289 S60MCprMobilityActivity::TDoNothingOrReSendPendingNotification, |
290 CS60MobilityActivity::TAwaitingPreferredCarrierOrStartIAPNotificationOrErrorNotificationOrCancel, // Ok. Error is fatal |
290 CS60MobilityActivity::TAwaitingPreferredCarrierOrStartIAPNotificationOrErrorNotificationOrCancel, // Ok. Error is fatal |
291 S60MCprMobilityActivity::TNoTagOrInformMigrationAvailableBackwardsOrErrorOrCancel ) |
291 S60MCprMobilityActivity::TNoTagOrInformMigrationAvailableBackwardsOrErrorOrCancel ) |
|
292 |
292 // Select the next layer MCPR. |
293 // Select the next layer MCPR. |
293 NODEACTIVITY_ENTRY( KNoTag, |
294 NODEACTIVITY_ENTRY( KNoTag, |
294 MCprStates::TSelectNextLayer, |
295 MCprStates::TSelectNextLayer, |
295 MCprStates::TAwaitingSelectNextLayerCompleted, // Ok. Error is fatal. |
296 MCprStates::TAwaitingSelectNextLayerCompleted, // Ok. Error is fatal. |
296 MeshMachine::TNoTagOrErrorTag ) |
297 CS60MobilityActivity::TNoTagOrRequestReConnectToCurrentSPOrErrorTag ) |
297 //S60MCprStates::TAwaitingSelectNextLayerCompletedOrError, // Not required Error is fatal. MPM should only give valid IAPs. |
298 |
298 //MeshMachine::TNoTagOrErrorTag )// Not required Error is fatal. MPM should only give valid IAPs. |
|
299 // For the moment it is sufficient to use the re-connect activity, in the future we may want to |
299 // For the moment it is sufficient to use the re-connect activity, in the future we may want to |
300 // customise the behavior, for example start the new layer before rebinding it, etc. |
300 // customise the behavior, for example start the new layer before rebinding it, etc. |
301 NODEACTIVITY_ENTRY( KNoTag, |
301 NODEACTIVITY_ENTRY( KNoTag, |
302 S60MCprStates::TRequestReConnect, |
302 S60MCprStates::TRequestReConnect, |
303 MCprStates::TAwaitingReConnectCompleteOrError, // Ok. Error is fatal. |
303 MCprStates::TAwaitingReConnectCompleteOrError, // Ok. Error is fatal. |
304 MeshMachine::TNoTagOrErrorTag ) //Own error handling MPM must be informed when error happens. |
304 S60MCprMobilityActivity::TInformMigrationCompletedOrError ) //Own error handling MPM must be informed when error happens. |
305 // Select or activation failed, Ask MPM to decide if it it possible/sensible to ignore the error and continue. |
305 |
306 // EDoReselect return will fall into EIgnoreError branch. MPM shouldn't return Reselect in this case. |
306 NODEACTIVITY_ENTRY( S60MCprStates::KRequestReConnectToCurrentSP, |
307 // And if it does, then the use of startiapnotification in mobility scenarios should be |
307 S60MCprStates::TRequestReConnectToCurrentSP, |
308 // removed and only reselect should be used. |
308 MCprStates::TAwaitingReConnectCompleteOrError, |
309 /* Not required. PolicyServer should only give valid IAPs. |
309 S60MCprMobilityActivity::TInformMigrationCompletedOrError ) |
310 NODEACTIVITY_ENTRY( KErrorTag, |
310 |
311 S60MCprStates::TProcessError, |
|
312 S60MCprStates::TAwaitingProcessErrorCompleteOrError, |
|
313 S60MCprMobilityActivity::TWaitPolicyServerResponseBackwardOrErrorTag ) |
|
314 */ |
|
315 // If the migration was acepted we loop again waiting for a new, preferred one |
311 // If the migration was acepted we loop again waiting for a new, preferred one |
316 NODEACTIVITY_ENTRY( KNoTag, |
312 NODEACTIVITY_ENTRY( S60MCprStates::KInformMigrationCompleted, |
317 CS60MobilityActivity::TInformMigrationCompleted, |
313 CS60MobilityActivity::TInformMigrationCompleted, |
318 S60MCprMobilityActivity::TAwaitingMigrationAcceptedOrRejectedOrStartupErrorIgnoredOrCancel, |
314 S60MCprMobilityActivity::TAwaitingMigrationAcceptedOrRejectedOrStartupErrorIgnoredOrCancel, |
319 S60MCprMobilityActivity::TNoTagOrErrorTagOrApplicationRejectedOrConsumeRejected ) |
315 S60MCprMobilityActivity::TNoTagOrErrorTagOrApplicationRejectedOrConsumeRejected ) |
|
316 |
320 // Informs policy server that application has accepted the carrier |
317 // Informs policy server that application has accepted the carrier |
321 THROUGH_NODEACTIVITY_ENTRY( KNoTag, |
318 THROUGH_NODEACTIVITY_ENTRY( KNoTag, |
322 CS60MobilityActivity::TSendApplicationAccept, |
319 CS60MobilityActivity::TSendApplicationAccept, |
323 TTag<MobilityMCprStates::KStartMobilityHandshake|NetStateMachine::EBackward> ) |
320 TTag<MobilityMCprStates::KStartMobilityHandshake|NetStateMachine::EBackward> ) |
324 // Informs policy server that application has rejected the carrier |
321 // Informs policy server that application has rejected the carrier |