FCL/sf/mw/ipconnmgmt: comparison bearermanagement/mpm/src/mpmserver.cpp

equal deleted inserted replaced

-:4dc3bb0099b0
+:c14618f9de99
 #include <commdb.h>
 #include <etel3rdparty.h>                // Voice call notification
 #include <mmtsy_names.h>                 // KMmTsyModuleName
 #include <centralrepository.h>
 #include <es_sock_partner.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
 #include "mpmserver.h"
 #include "mpmserversession.h"
 #include "mpmconnmonevents.h"
 #include "mpmlogger.h"
 #include "mpmdialog.h"
 #include "mpmprivatecrkeys.h"
 #include "mpmcsidwatcher.h"
 #include "mpmdatausagewatcher.h"
 #include "mpmpropertydef.h"
+#include "mpmofflinewatcher.h"
 // ============================= LOCAL FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // PanicServer
 iRoamingQueue( NULL ),
 iStartingQueue( NULL ),
 iWlanQueryQueue( NULL ),
 iConnectDialogQueue( NULL ),
 iDefaultConnection( NULL ),
-iConnectionCounter( 0 )
+iConnectionCounter( 0 ),
+iOfflineMode( ECoreAppUIsNetworkConnectionAllowed )
 {
 }
 // -----------------------------------------------------------------------------
 // Create central repository watcher and start it
 iMpmCsIdWatcher = CMpmCsIdWatcher::NewL();
 iMpmCsIdWatcher->StartL();
 // Create another central repository watcher and start it
-// TODO: Trapped, because currently it may fatally leave in HW.
-// (Possibly because of the capability updates of data usage watcher's CR-keys.)
 TRAPD( duwErr, iMpmDataUsageWatcher = CMpmDataUsageWatcher::NewL( this ) );
 if (duwErr == KErrNone)
 {
 iMpmDataUsageWatcher->StartL();
 }
 else
 {
 iMpmDataUsageWatcher = NULL;
 MPMLOGSTRING( "CMPMServer::ConstructL: CMpmDataUsageWatcher::NewL() failed!" )
+}
+// Create another central repository watcher and start it
+TRAPD( owErr, iMpmOfflineWatcher = CMpmOfflineWatcher::NewL( this ) );
+if (owErr == KErrNone)
+{
+iMpmOfflineWatcher->StartL();
+}
+else
+{
+iMpmOfflineWatcher = NULL;
+MPMLOGSTRING( "CMPMServer::ConstructL: CMpmOfflineWatcher::NewL() failed!" )
 }
 // Define P&S keys (snap & iap) for the user connection
 TInt ret = RProperty::Define( KMPMUserConnectionCategory,
 KMPMPSKeyUserConnectionSnap,
 delete iDefaultConnection;
 delete iMpmCsIdWatcher;
 delete iMpmDataUsageWatcher;
+delete iMpmOfflineWatcher;
 iDedicatedClients.Close();
 delete iCommsDatAccess;
 }
 iActiveBMConns[index1].iConnInfo.iState = aState;
 iActiveBMConns[index1].iConnInfo.iAppUid = aSession.AppUid();
 }
 }
-if ( aState == EStarted )
+if ( aState == EStarted && aSession.ChooseBestIapCalled() )
 {
-TInt ret = KErrNone;
+UpdateActiveConnection( aSession );
-TRAP ( ret, UpdateActiveConnectionL( aSession ) );
-if ( ret != KErrNone )
-{
-iActiveBearerType = EMPMBearerTypeNone;
-iActiveIapId = 0;
-iActiveSnapId = 0;
-}
 }
 #ifdef _DEBUG
 // Dump array of active connections to log in order to support testing.
 //
 //
 iActiveBMConns[index1].iConnInfo.iIapId = 0;
 iActiveBMConns[index1].iConnInfo.iState = EIdle;
 // Change state of P&S keys if needed
-TInt ret = KErrNone;
+if ( aSession.ChooseBestIapCalled() )
+{
-TRAP ( ret, UpdateActiveConnectionL( aSession ) );
+UpdateActiveConnection( aSession );
-if ( ret != KErrNone )
-{
-iActiveBearerType = EMPMBearerTypeNone;
-iActiveIapId = 0;
-iActiveSnapId = 0;
 }
 }
 #ifdef _DEBUG
 // Dump array of active connections to log in order to support testing.
 //
 // If Connection Id found, remove it.
 //
 iActiveBMConns.Remove( i );
 // Update active connection
-TInt ret = KErrNone;
+if ( aSession.ChooseBestIapCalled() )
+{
-TRAP ( ret, UpdateActiveConnectionL( aSession ) );
+UpdateActiveConnection( aSession );
-if ( ret != KErrNone )
-{
-iActiveBearerType = EMPMBearerTypeNone;
-iActiveIapId = 0;
-iActiveSnapId = 0;
 }
 }
 }
 #ifdef _DEBUG
 iActiveBMConns[i].iConnInfo.iState = EStarted;
 }
 }
 }
-TInt ret = KErrNone;
+if ( aSession.ChooseBestIapCalled() )
+{
-TRAP ( ret, UpdateActiveConnectionL( aSession ) );
+UpdateActiveConnection( aSession );
-if ( ret != KErrNone )
-{
-iActiveBearerType = EMPMBearerTypeNone;
-iActiveIapId = 0;
-iActiveSnapId = 0;
 }
 #ifdef _DEBUG
 // Dump array of active connections to log in order to support testing.
 //
 iActiveBMConns[i].iConnInfo.iState = EIdle;
 }
 }
 // Update active connection
-TInt ret = KErrNone;
+if ( aSession.ChooseBestIapCalled() )
+{
-TRAP ( ret, UpdateActiveConnectionL( aSession ) );
+UpdateActiveConnection( aSession );
-if ( ret != KErrNone )
-{
-iActiveBearerType = EMPMBearerTypeNone;
-iActiveIapId = 0;
-iActiveSnapId = 0;
 }
 }
 }
 #ifdef _DEBUG
 // CMPMServer::StopConnections
 // -----------------------------------------------------------------------------
 //
 void CMPMServer::StopConnections( TInt aIapId )
 {
+MPMLOGSTRING2( "CMPMServer::StopConnections aIapId = %d", aIapId )
 for (TInt index = 0; index < iSessions.Count(); index++)
 {
-/*        if (iSessions[index]->UserConnection())
+CMPMServerSession* session = iSessions[index];
-continue;
-*/
 // Stop connection
 if ( aIapId == 0 )
 {
-iSessions[index]->StopConnection();
+session->StopConnection();
 }
-else
+else if ( GetBMIap( session->ConnectionId() ) == aIapId )
 {
-TRAP_IGNORE( iSessions[index]->StopIAPNotificationL( aIapId ));
+TRAP_IGNORE( session->StopIAPNotificationL( aIapId ));
 }
+}
 }
+// -----------------------------------------------------------------------------
+// CMPMServer::UpdateActiveConnection
+// -----------------------------------------------------------------------------
+//
+void CMPMServer::UpdateActiveConnection( CMPMServerSession& aSession )
+{
+// Update active connection
+TInt ret = KErrNone;
+TRAP ( ret, UpdateActiveConnectionL( aSession ) );
+if ( ret != KErrNone )
+{
+iActiveBearerType = EMPMBearerTypeNone;
+iActiveIapId = 0;
+iActiveSnapId = 0;
+}
 }
 // -----------------------------------------------------------------------------
 // CMPMServer::UpdateActiveConnectionL
 // -----------------------------------------------------------------------------
 //
 void CMPMServer::UpdateActiveConnectionL( CMPMServerSession& aSession )
 {
 MPMLOGSTRING( "CMPMServer::UpdateActiveConnectionL" )
-TUint32 snapId;
+TBool keysUpToDate( ETrue );
-if ( !NumberOfActiveConnections() )
+// number of active iaps
+TInt numberOfActive = NumberOfActiveConnections( keysUpToDate );
+if ( numberOfActive == 0 )
 {
 // If no active connections then just reset keys and publish
 iActiveBearerType = EMPMBearerTypeNone;
 iActiveIapId = 0;
 iActiveSnapId = 0;
 PublishActiveConnection();
 return;
 }
-// Check if all active connections are in same snap
+if ( keysUpToDate )
-if ( CommsDatAccess()->AreActiveIapsInSameSnapL(
+{
-iActiveBMConns, snapId ) )
+MPMLOGSTRING( "CMPMServer::UpdateActiveConnectionL: already up-to-date" )
-{
+return;
-// Select active connection according to priority
+}
-CommsDatAccess()->SelectActiveConnectionL (
-snapId,
+if ( numberOfActive > 1 )
-iActiveBMConns,
+{
-iActiveIapId,
+// Check if all active connections are in same snap
-iActiveSnapId,
+TUint32 snapId;
-iActiveBearerType,
-aSession );
+if ( CommsDatAccess()->AreActiveIapsInSameSnapL(
+iActiveBMConns, snapId, *this ) )
-PublishActiveConnection();
+{
-return;
+MPMLOGSTRING( "CMPMServer::UpdateActiveConnectionL: Active iaps are in one SNAP" )
+// Select active connection according to priority
+CommsDatAccess()->SelectActiveConnectionL (
+snapId,
+iActiveBMConns,
+iActiveIapId,
+iActiveSnapId,
+iActiveBearerType,
+aSession );
+PublishActiveConnection();
+return;
+}
+MPMLOGSTRING( "CMPMServer::UpdateActiveConnectionL: Active iaps are in different SNAPs" )
 }
 // Reset active connections
 iActiveBearerType = EMPMBearerTypeNone;
 iActiveIapId = 0;
 iActiveSnapId = 0;
 // Active connections locating in different snaps
 // Use priority order vpn, wlan and packet
 for ( TInt index = 0; index < iActiveBMConns.Count(); index++ )
 {
 CMPMServerSession* serverSession = GetServerSession(
 if ( iActiveBMConns[index].iConnInfo.iState == EStarted &&
 	   serverSession->ChooseBestIapCalled() )
 {
 TMPMBearerType bearerType = EMPMBearerTypeOther;
-if ( iDedicatedClients.Find( iActiveBMConns[index].iConnInfo.iAppUid ) ==
+TInt ret = iDedicatedClients.Find( iActiveBMConns[index].iConnInfo.iAppUid );
-KErrNone )
+if ( ret != KErrNotFound )
 {
 // Skip dedicated client
+MPMLOGSTRING2( "Skip dedicated client = %d", iActiveBMConns[index].iConnInfo.iAppUid )
 continue;
 }
 bearerType = CommsDatAccess()->GetBearerTypeL(
 iActiveBMConns[index].iConnInfo.iIapId );
 iActiveBearerType = bearerType;
 iActiveIapId = iActiveBMConns[index].iConnInfo.iIapId;
 iActiveSnapId = iActiveBMConns[index].iConnInfo.iSnap;
 }
 }
+}
 PublishActiveConnection();
-}
 }
 // -----------------------------------------------------------------------------
 // CMPMServer::MapBearerType
 // -----------------------------------------------------------------------------
 iActiveIapId, iActiveSnapId, iActiveBearerType )
 }
 // -----------------------------------------------------------------------------
 // CMPMServer::NumberOfActiveConnections
-// -----------------------------------------------------------------------------
+// Returns number of active iaps.
-//
+// -----------------------------------------------------------------------------
-TInt CMPMServer::NumberOfActiveConnections()
+//
+TInt CMPMServer::NumberOfActiveConnections( TBool& aKeysUpToDate )
 {
 MPMLOGSTRING( "CMPMServer::NumberOfActiveConnections" )
+aKeysUpToDate = ETrue;
 TInt count( 0 );
+RArray<TUint32> activeIaps;
+activeIaps.Reset();
 for ( TInt index = 0; index < iActiveBMConns.Count(); index++ )
 {
 CMPMServerSession* serverSession = GetServerSession(
 iActiveBMConns[index].iConnInfo.iConnId );
 if ( iActiveBMConns[index].iConnInfo.iState == EStarted &&
 serverSession->ChooseBestIapCalled() )
 {
-count++;
+TInt ret = activeIaps.Find( iActiveBMConns[index].iConnInfo.iIapId );
-}
-}
+if ( ret == KErrNotFound )
+{
+activeIaps.Append ( iActiveBMConns[index].iConnInfo.iIapId );
+count++;
+}
+if ( iActiveIapId != iActiveBMConns[index].iConnInfo.iIapId )
+{
+// iap that is different from current active iap was found
+aKeysUpToDate = EFalse;
+}
+}
+}
+activeIaps.Close();
+MPMLOGSTRING2( "CMPMServer::NumberOfActiveConnections: count = %d", count )
 return count;
 }
 // -----------------------------------------------------------------------------
 }
 }
 stoppedIaps.Close();
 }
+// ---------------------------------------------------------------------------
+// CMPMServer::UpdateOfflineMode
+// Offline watcher listens the offline mode and calls this when it's changed.
+// ---------------------------------------------------------------------------
+//
+void CMPMServer::UpdateOfflineMode( TInt newModeValue )
+{
+MPMLOGSTRING2( "CMPMServer::UpdateOfflineMode: Value %d", newModeValue )
+iOfflineMode = newModeValue;
+if ( iOfflineMode == ECoreAppUIsNetworkConnectionAllowed )
+{
+// Offline mode finished, reset the QueryResponse variable.
+iOfflineWlanQueryResponse = EOfflineResponseUndefined;
+}
+}
+// ---------------------------------------------------------------------------
+// CMPMServer::IsPhoneOffline
+// Returns the current offline mode.
+// ---------------------------------------------------------------------------
+//
+TBool CMPMServer::IsPhoneOffline()
+{
+MPMLOGSTRING( "CMPMServer::IsPhoneOffline" )
+TBool retval = EFalse;
+if ( iOfflineMode == ECoreAppUIsNetworkConnectionNotAllowed)
+{
+retval = ETrue;
+MPMLOGSTRING( "CMPMServer::IsPhoneOffline: Yes." )
+}
+return retval;
+}
+// ---------------------------------------------------------------------------
+// CMPMServer::OfflineWlanQueryResponse
+// Tells the "Use WLAN in offline mode" query's response during the
+// current offline mode session.
+// ---------------------------------------------------------------------------
+//
+TOfflineWlanQueryResponse CMPMServer::OfflineWlanQueryResponse()
+{
+MPMLOGSTRING( "CMPMServer::OfflineWlanQueryResponse" )
+#ifndef _PLATFORM_SIMULATOR_
+MPMLOGSTRING2( "CMPMServer::IsOfflineWlanQueryAccepted: %d", iOfflineWlanQueryResponse )
+return iOfflineWlanQueryResponse;
+#else
+// Platsim simulates WLAN and offline-mode. To ease automated testing,
+// offline connection confirmation is not asked in Platsim-variant
+MPMLOGSTRING( "CMPMServer::OfflineWlanQueryResponse: yes for Platsim" )
+return EOfflineResponseYes;
+#endif
+}
+// ---------------------------------------------------------------------------
+// CMPMServer::SetOfflineWlanQueryResponse
+// Called when the "Use WLAN in offline mode" note has been responded.
+// ---------------------------------------------------------------------------
+//
+void CMPMServer::SetOfflineWlanQueryResponse( TOfflineWlanQueryResponse aResponse)
+{
+MPMLOGSTRING( "CMPMServer::SetOfflineWlanQueryResponse" )
+iOfflineWlanQueryResponse = aResponse;
+}
 // -----------------------------------------------------------------------------
 // TMPMBlackListConnId::Append
 // -----------------------------------------------------------------------------
 //
 void TMPMBlackListConnId::Append( TUint32 aIap, TBlacklistCategory aCategory )

branch	RCL_3
changeset 17	c14618f9de99
parent 15	4dc3bb0099b0
child 19	22c3c67e5001