FCL/sf/mw/ipappprotocols: comparison realtimenetprots/sipfw/ProfileAgent/AlrMonitor/src/sipalrsnapmonitor.cpp

equal deleted inserted replaced

-:0a1ad22c7bdc
+:2c7192069824
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::NewLC
 // -----------------------------------------------------------------------------
 //
 CSipAlrSnapMonitor* CSipAlrSnapMonitor::NewLC(
-TSipSNAPConfigurationData aSnapData,
+TUint32 aSnapId,
 MSipAlrObserver& aObserver,
 RSocketServ& aSocketServer,
-CSipSystemStateMonitor& aSystemStateMonitor)
+CSipSystemStateMonitor& aSystemStateMonitor )
 	{
 	CSipAlrSnapMonitor* self =
 	    new ( ELeave ) CSipAlrSnapMonitor(
-	        aSnapData, aSocketServer, aSystemStateMonitor);
+	        aSnapId, aSocketServer, aSystemStateMonitor );
 CleanupStack::PushL( self );
 self->ConstructL( aObserver );
 return self;
 	}
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::CSipAlrSnapMonitor
 // -----------------------------------------------------------------------------
 //
 CSipAlrSnapMonitor::CSipAlrSnapMonitor(
-TSipSNAPConfigurationData aSnapData,
+TUint32 aSnapId,
 RSocketServ& aSocketServer,
-CSipSystemStateMonitor& aSystemStateMonitor) :
+CSipSystemStateMonitor& aSystemStateMonitor ) :
 CActive ( CActive::EPriorityStandard ),
-iSnapData( aSnapData ),
+iSnapId( aSnapId ),
 iSocketServer( aSocketServer ),
 	iSystemStateMonitor( aSystemStateMonitor )
 	{
-	iPrefs.SetSnap( aSnapData.iSnapId );
+	iPrefs.SetSnap( iSnapId );
 	CActiveScheduler::Add( this );
 	}
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::ConstructL
 void CSipAlrSnapMonitor::ConstructL( MSipAlrObserver& aObserver )
 	{
 	PROFILE_DEBUG1( "CSipAlrSnapMonitor::ConstructL entered" )
 	iSystemStateMonitor.StartMonitoringL(
-	    CSipSystemStateMonitor::ESnapAvailability, SnapId(), *this );
+	    CSipSystemStateMonitor::ESnapAvailability, iSnapId, *this );
 	AddObserverL( aObserver );
-	if(IsSnapAvailable())
-	    {
-// SNAP is already Available to be started.
-// No Need to wait for Notification from System State Monitor.
-	    StartSnap();
-	    }
 	PROFILE_DEBUG1( "CSipAlrSnapMonitor::ConstructL returns" )
 	}
 // -----------------------------------------------------------------------------
 	ResetState();
 	iObservers.Close();
 	iSystemStateMonitor.StopMonitoring(
-	    CSipSystemStateMonitor::ESnapAvailability, SnapId(), *this );
+	    CSipSystemStateMonitor::ESnapAvailability, iSnapId, *this );
 	PROFILE_DEBUG1( "CSipAlrSnapMonitor::~CSipAlrSnapMonitor returns" )
 	}
 // -----------------------------------------------------------------------------
 	else if ( err == KErrCancel )
 		{
 		for ( TInt i = iObservers.Count() - 1; i >= 0; --i )
 			{
 			iObservers[i].iObserver->AlrEvent(
-				MSipAlrObserver::EOfferedIapRejected, SnapId(), KNoIap );
+				MSipAlrObserver::EOfferedIapRejected, iSnapId, KNoIap );
 			}
 		}
 else
 {
 ResetState();
 //
 void CSipAlrSnapMonitor::NewCarrierActive(
 TAccessPointInfo aNewAP,
 TBool /*aIsSeamless*/ )
 {
-PROFILE_DEBUG3( "CSipSnapAlrMonitor::NewCarrierActive", SnapId() )
+PROFILE_DEBUG3( "CSipSnapAlrMonitor::NewCarrierActive", iSnapId )
 NotifyInitializedObservers( aNewAP.AccessPoint(),
 MSipAlrObserver::EIapActive );
 }
 if ( !iCommsMobilityAO )
 	{
 	PROFILE_DEBUG1( "CSipSnapAlrMonitor::Error iCommsMobilityAO==NULL")
 	return;
 	}
-if ( aError == KErrNotFound && !BearerId())
+if ( aError == KErrNotFound)
 	    {
 	    NotifyInitializedObservers( KNoIap,
 	    							MSipAlrObserver::ENoNewIapAvailable );
 	    }
 // MMobilityProtocolResp::Error is called from ~CActiveCommsMobilityApiExt.
 // Flag iDying prevents starting the RConnection if not needed.
 if ( !iDying )
 {
 ResetState();
-if(!BearerId())
-{
-PROFILE_DEBUG3( "CSipSnapAlrMonitor::Error, Start Snap as Bearer Id is ", BearerId() )
 StartSnap();
-}
 }
 }
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::SystemVariableUpdated
 PROFILE_DEBUG4( "CSipAlrSnapMonitor::SystemVariableUpdated, snap, value",
 aObjectId, aValue )
 if ( !IsActive() &&
 aVariable == CSipSystemStateMonitor::ESnapAvailability &&
-aObjectId == SnapId() )
+aObjectId == iSnapId )
 {
 if ( aValue == CSipSystemStateMonitor::ESnapAvailable )
 {
 if ( StartSnap() != KErrNone )
 {
 // CSipAlrSnapMonitor::SnapId
 // -----------------------------------------------------------------------------
 //
 TUint32 CSipAlrSnapMonitor::SnapId() const
 	{
-	return iSnapData.iSnapId;
+	return iSnapId;
 	}
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::AddObserverL
 // -----------------------------------------------------------------------------
 		if ( iObservers[i].iObserver == &aObserver )
 			{
 			iObservers.Remove( i );
 			}
 		}
-	iObservers.Compress();
 	return iObservers.Count() == 0;
 	}
 // -----------------------------------------------------------------------------
 			// So after last AlrEvent(), don't access this object's data.
 			PROFILE_DEBUG3( "CSipAlrSnapMonitor::RefreshL error", err )
 			for ( TInt i = iObservers.Count() - 1; i >= 0; --i )
 				{
 				iObservers[i].iObserver->AlrEvent(
-					MSipAlrObserver::ERefreshError, SnapId(), KNoIap );
+					MSipAlrObserver::ERefreshError, iSnapId, KNoIap );
 				}
 			}
 }
 PROFILE_DEBUG1( "CSipAlrSnapMonitor::Refresh returns" )
 // -----------------------------------------------------------------------------
 //
 TInt CSipAlrSnapMonitor::StartSnap()
 {
 PROFILE_DEBUG1( "CSipAlrSnapMonitor::StartSnap entered" )
 TInt err = KErrNone;
 if ( !IsActive() && IsSnapAvailable() )
 {
 PROFILE_DEBUG1( "CSipAlrSnapMonitor::StartSnap SNAP is available" )
 	err = iConnection.Open( iSocketServer );
 		PROFILE_DEBUG3( "CSipAlrSnapMonitor::StartSnap Open done, err=", err )
 	if ( err == KErrNone )
 	    {
-if(BearerId())
+	iConnection.Start( iPrefs, iStatus );
-{
+	SetActive();
-if(BearerId()== 1)
-{
-iExtPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN);
-}
-else if(BearerId() == 2)
-{
-iExtPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerCellular);
-}
-				PROFILE_DEBUG1( "CSipAlrSnapMonitor::Starting Bearer Filtered connection" )
-iExtPrefs.SetSnapId( SnapId());
-TRAPD(error, iPrefList.AppendL(&iExtPrefs));
-				if(error)
-				{
-				return error;
-				}
-// Start connecting
-iConnection.Start( iPrefList, iStatus );
-SetActive();
-}
-else
-{
-				PROFILE_DEBUG1( "CSipAlrSnapMonitor::Starting Normal Connection" )
-iConnection.Start( iPrefs, iStatus );
-SetActive();
-}
 	    }
 }
 	PROFILE_DEBUG3( "CSipAlrSnapMonitor::StartSnap returns", err )
 return err;
 }
 // -----------------------------------------------------------------------------
 // CSipAlrSnapMonitor::CreateMobilityAoL
 // -----------------------------------------------------------------------------
 //
 {
 PROFILE_DEBUG1( "CSipAlrSnapMonitor::ResetState entered" )
 DestroyMobilityAo();
 Cancel();
-//    iConnection.Close();
+iConnection.Close();
 iMigrationAllowedByClient = EFalse;
 iConnectionActive = EFalse;
 iPreferredCarrierAvailableCalled = EFalse;
 PROFILE_DEBUG1( "CSipAlrSnapMonitor::ResetState returns" )
 }
 // -----------------------------------------------------------------------------
 //
 void CSipAlrSnapMonitor::NotifyObservers( TUint aIapId )
 	{
 	PROFILE_DEBUG4( "CSipSnapAlrMonitor::NotifyObservers SNAP, IAP",
-	        SnapId(), aIapId )
+	                iSnapId, aIapId )
 	NotifyInitializedObservers( aIapId, MSipAlrObserver::EIapAvailable );
 	NotifyNewObservers( aIapId );
 	}
 	for (TInt i = iObservers.Count() - 1; i >= 0; --i)
 		{
 		if ( iObservers[i].iInitialEventDone )
 			{
 			PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyIntitializedObservers",
-			                SnapId() )
+			                iSnapId )
-			iObservers[i].iObserver->AlrEvent( aEvent, SnapId(), aIapId );
+			iObservers[i].iObserver->AlrEvent( aEvent, iSnapId, aIapId );
 			}
 		}
 	}
 // -----------------------------------------------------------------------------
 	{
 	for ( TInt i = iObservers.Count() - 1; i >= 0; --i )
 		{
 		if ( !iObservers[i].iInitialEventDone )
 			{
-			PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyNewObservers", SnapId() )
+			PROFILE_DEBUG3( "CSipAlrSnapMonitor::NotifyNewObservers", iSnapId )
 			iObservers[i].iObserver->AlrEvent(
-			    MSipAlrObserver::EIapAvailable, SnapId(), aIapId );
+			    MSipAlrObserver::EIapAvailable, iSnapId, aIapId );
 			iObservers[i].iInitialEventDone = ETrue;
 			}
 		}
 	}
 // -----------------------------------------------------------------------------
 //
 TBool CSipAlrSnapMonitor::IsSnapAvailable() const
 {
 return ( iSystemStateMonitor.CurrentValue(
-	             CSipSystemStateMonitor::ESnapAvailability, SnapId() ) ==
+	             CSipSystemStateMonitor::ESnapAvailability, iSnapId ) ==
 	                 CSipSystemStateMonitor::ESnapAvailable );
 }
-// -----------------------------------------------------------------------------
-// CSipAlrSnapMonitor::BearerId
-// -----------------------------------------------------------------------------
-//
-TBool CSipAlrSnapMonitor::BearerId()
-{
-return iSnapData.iBearerId;
-}

branch	RCL_3
changeset 56	2c7192069824
parent 49	0a1ad22c7bdc