MCL/sf/mw/web: comparison browserutilities/connectionmanager/Src/InternetConnectionManager.cpp

equal deleted inserted replaced

-:79859ed3eea9
+:919f36ff910f
 //INCLUDE FILES
 	//System Includes
 #include <bldvariant.hrh>
+#include <browser_platform_variant.hrh>
 #include <ApAccessPointItem.h>
-#include <VpnApEngine.h>
+#include <VpnAPEngine.h>
 #include <AknNotifyStd.h>
 #include <AknGlobalNote.h>
 #include <e32std.h>
 #include <ApUtils.h>
 #include <ApDataHandler.h>
 #include <cdbstore.h>
 #include <coemain.h>
 #include <bautils.h>
 #include <connectionmanager.rsg>
-#include <barsread.h>
+#include <BARSREAD.H>
 #include <Avkon.rsg>
-#include <ErrorUI.h>
+#include <errorui.h>
-#include <AknGlobalConfirmationQuery.h>
+#include <aknglobalconfirmationquery.h>
-#include <AknQueryDialog.h>
+#include <aknquerydialog.h>
-#include <AknWaitDialog.h>
+#include <aknwaitdialog.h>
 #include <cdblen.h>
 #include <StringLoader.h>
 #include <connectprog.h>
 #include <nd_err.h>
-#include <commdbconnpref.h>
+#include <CommDbConnPref.h>
-#include <mmtsy_names.h>
+#include <MmTsy_names.h>
 #include <etelmm.h>
 #include <data_caging_path_literals.hrh>
 #include <AknsUtils.h>
 #include <avkon.mbg>
 #include <ConnMan.mbg>
 #include <rconnmon.h>
-#include <agentdialog.h>
+#include <AgentDialog.h>
 #include <ConnectionUiUtilities.h>
 #include <AknQueryDialog.h>
 #include <WlanCdbCols.h>
 #include <etelpckt.h>
-#include <featmgr.h>
+#include <FeatMgr.h>
 #include <cmmanagerext.h>
 #include <cmdestinationext.h>
 #include <commsdat.h>
-#include <commsdattypeinfov1_1.h>
+#include <CommsDatTypeInfoV1_1.h>
 	//User Includes
-#include "InternetConnectionManager.h"
+#include <internetconnectionmanager.h>
-#include "ConnMan.hrh"
+#include "connman.hrh"
-#include "ConnectionManagerLogger.h"
+#include "connectionmanagerlogger.h"
-#include "ConnectionObservers.h"
+#include <connectionobservers.h>
-#include "ConnManActiveConnector.h"
+#include "connmanactiveconnector.h"
 using namespace CMManager;
 // CONSTANTS
 _LIT(KConnectionResourceFile, "\\resource\\ConnectionManager.rsc");
+#ifdef BRDO_OCC_ENABLED_FF
+//As per OCC, number of Connection observer states
+const TInt KMaxOccStages = 1;
+#endif
 // ============================ MEMBER FUNCTIONS ===============================
 //--------------------------------------------------------------------------
 //CInternetConnectionManager::ConnectL( TUint32 aIAPId1, TUint32 aIAPId2 )
 //--------------------------------------------------------------------------
 EXPORT_C TInt CInternetConnectionManager::ConnectL(  TUint32 /*aIAPId1*/, TUint32 /*aIAPId2*/ )
 query.Format(_L("%s\\%s"), IAP, COMMDB_NAME);
 User::LeaveIfError( iConnection.GetDesSetting( query, val ) );
 iConnName = val.AllocL();
+CLOG_WRITE_1( "Iap id used : %d", iapId );
+CLOG_WRITE_1( "Conn name   : %S", iConnName);
 }
 else if( !iRequestedAPIds.iFirstPreference )
 {
 TBuf<20> query;
 TBuf<40> val;
 			{
 			connErr = KErrCancel;
 			}
 		else
 			{
+if(iConnection.SubSessionHandle() <= 0)
+{
+				//  RConnection handle is invalid, we haven't opened the RConnection yet.
 		        connErr = iConnection.Open( iServ, KAfInet );
+		       	}
 		        CLOG_WRITE_1( "RConnection: %d", connErr );
 		        if( connErr == KErrNone )
 		            {
 		            // Always pass the IAP Id to RConnection even in silent mode
 		            connErr = iSyncConnector->Connect( overrides );
-		            }
-		        if( connErr != KErrNone )
-		            {
-		            CLOG_WRITE( "Closing all" );
-		            iConnection.Close();
 		            }
 			}
 		}
 	if ( iWaitDialog )
 		{
 	if ( iCommsDbOwned )
 		{
 		delete iCommsDb;
 		}
-if( iConnected )
-{
-iConnection.Close();
-}
 if( !iSilentMode )
 // Temp fix for CDMA
 {
 delete iCurrentAP;
 }
 delete iConnName;
 	delete iWaitDialog;
 	delete iNoteDialog;
 	delete iSyncConnector;
 	iRFs.Close();
+	iConnection.Close();
-iServ.Close();
+	iServ.Close();
 	CLOG_CLOSE;
 	}
 //--------------------------------------------------------------------------
 //CInternetConnectionManager::BearerTypeL
 //--------------------------------------------------------------------------
 TApBearerType CInternetConnectionManager::BearerTypeL( TUint32 aIAPId )
 	{
 	TApBearerType apbearerType = EApBearerTypeAllBearers;
-if( iSilentMode || !iRequestedAPIds.iFirstPreference )
+#ifdef BRDO_OCC_ENABLED_FF
+	if( !iRequestedAPIds.iFirstPreference )
+#else
+	if( iSilentMode || !iRequestedAPIds.iFirstPreference )
+#endif
 // Temp fix for CDMA
 {
 return EApBearerTypeAllBearers;
 }
 EXPORT_C void CInternetConnectionManager::StopConnectionL()
 	{
 CLOG_ENTERFN( "StopConnectionL()" );
 StopConnectionObserving();
-iConnection.Close();
+if( iConnected )
+{
+CLOG_WRITE( "StopConnectionL() Stop the Connection" );
+iConnection.Close();
+TInt err = iConnection.Open( iServ, KAfInet );
+}
+else
+{
+CLOG_WRITE( "Cancel the Connection" );
+CancelConnection();
+}
 //    iServ.Close();
 iConnected = EFalse;
 iEasyWlan = EFalse;
 if( !iSilentMode )
 //Connect with Snap Id if the connection type is Destination Nw
 if (iConnectionType == EDestination)
 	{
-	err = ConnectWithSnapId(iRequestedSnapId);
+	err = ConnectWithSnapIdL(iRequestedSnapId);
 	return err;
 	}
 	else
 		{
 CLOG_ENTERFN( "StartConnectionObservingL()" );
 TName* name = ConnectionNameL();
 __ASSERT_DEBUG( name, User::Panic( KNullDesC, KErrCorrupt ) );
 CleanupStack::PushL( name );
+#ifdef BRDO_OCC_ENABLED_FF
+iSatges[0] = KLinkLayerClosed;
+iStageNotifier->StartNotificationL( name,iSatges,KMaxOccStages,this, ETrue );
+#else
 iSatges[0] = KConnectionUninitialised;
 iSatges[1] = KConnectionClosed;
 iSatges[2] = KLinkLayerClosed;
 iStageNotifier->StartNotificationL( name,iSatges,KMaxStages,this, ETrue );
+#endif
 CleanupStack::PopAndDestroy( name );
 }
 //-------------------------------------------------------------------
 //   CLOG_WRITE_1( "ConnectionStageAchievedL() Stage = %d ", aStage);
 if(iConnected)
 {
 	// this is a connection closed event
 CLOG_WRITE( "ConnectionStageAchievedL() Stoping the connection instead of closing" );
-iConnection.Stop();
 	iConnected = EFalse;
 	if( !iSilentMode )
 // Temp fix for CDMA
 {
 {
 TRAP_IGNORE( DoShowConnectionChangedDlgL() );
 }
 //------------------------------------------------------------------------
+//CInternetConnectionManager::CancelConnection
+//
+void CInternetConnectionManager::CancelConnection()
+{
+CLOG_ENTERFN("CInternetConnectionManager::CancelConnection");
+if(iSyncConnector && iSyncConnector->IsActive())
+{
+CLOG_WRITE( "Connection is cancelled" );
+iSyncConnector->Cancel();
+}
+	}
+//------------------------------------------------------------------------
 //CInternetConnectionManager::AskIap
 //------------------------------------------------------------------------
 EXPORT_C TInt CInternetConnectionManager::AskIap( TUint32& aNewIap )
 {
 CLOG_ENTERFN("AskIap");
 	{
 	CLOG_ENTERFN("CInternetConnectionManager::SetConnectionType");
 	CLOG_WRITE_1( "CInternetConnectionManager::SetConnectionType - %d", aConnectionType );
 	iConnectionType = aConnectionType;
 	}
 //-------------------------------------------------------------------
 //CInternetConnectionManager::SetRequestedSnap
 //-------------------------------------------------------------------
 //
 EXPORT_C void CInternetConnectionManager::SetRequestedSnap (TUint32 aRequestedSnapId)
 if( !iServ.Handle() )
 {
 User::LeaveIfError( iServ.Connect() );
 }
 CLOG_WRITE( "Fully initialized" );
 iInitialized = ETrue;
 }
 //------------------------------------------------------------------------
-//CInternetConnectionManager::ConnectWithSnapId
+//CInternetConnectionManager::ConnectWithSnapIdL
 //------------------------------------------------------------------------
-TInt CInternetConnectionManager::ConnectWithSnapId(TUint32 aRequestedSnapId)
+TInt CInternetConnectionManager::ConnectWithSnapIdL(TUint32 aRequestedSnapId)
 	{
 CLOG_WRITE_1( "CInternetConnectionManager::ConnectWithSnapId - %d", aRequestedSnapId );
 	iInternalError = KErrNone;
 DisplayConnErrorL();
 #ifndef __WINS__
 if( KErrNone == connErr )
 {
-TUint32 iIapID;
+if( iSilentMode )
-TBuf<20> query;
+// Temp fix for CDMA
-query.Format( _L("%s\\%s"), IAP, COMMDB_ID );
+{
-if( iConnection.GetIntSetting( query, iIapID ) == KErrNone )
+TUint32 iapId;
-{
+TBuf<20> query;
-CLOG_WRITE_1( "ConnectWithSnapId::AccessPoint - %d", iIapID );
+TBuf<40> val;
-CApAccessPointItem* ap = APItemFromIAPIdLC( iIapID );
-UpdateCurrentAPL( *ap, EFalse );
+query.Format( _L("%s\\%s"), IAP, COMMDB_ID );
-CleanupStack::PopAndDestroy();  // ap
+User::LeaveIfError( iConnection.GetIntSetting( query, iapId ) );
-}
+iCurrentAP = (CApAccessPointItem*)iapId;
+query.Format(_L("%s\\%s"), IAP, COMMDB_NAME);
+User::LeaveIfError( iConnection.GetDesSetting( query, val ) );
+iConnName = val.AllocL();
+CLOG_WRITE_1( "Iap id used : %d", iapId );
+CLOG_WRITE_1( "Conn name   : %S", iConnName);
+}
+else
+{
+TUint32 iIapID;
+TBuf<20> query;
+query.Format( _L("%s\\%s"), IAP, COMMDB_ID );
+if( iConnection.GetIntSetting( query, iIapID ) == KErrNone )
+{
+CLOG_WRITE_1( "ConnectWithSnapId::AccessPoint - %d", iIapID );
+CApAccessPointItem* ap = APItemFromIAPIdLC( iIapID );
+UpdateCurrentAPL( *ap, EFalse );
+CleanupStack::PopAndDestroy();  // ap
+}
+}
 }
 #endif
 	return connErr;
 	CLOG_WRITE( "ConnMan Overrides set"  );
 	if ( !connErr )
 		{
+		if(iConnection.SubSessionHandle() <= 0)
+			{
+			//  RConnection handle is invalid, we haven't opened the RConnection yet.
 connErr = iConnection.Open( iServ, KAfInet );
+	}
 CLOG_WRITE_1( "RConnection: %d", connErr );
 if( connErr == KErrNone )
 {
 //connect with snap id
 connErr = iSyncConnector->ConnectSnap( overrides );
-}
-if( connErr != KErrNone )
-{
-CLOG_WRITE( "Closing all" );
-iConnection.Close();
 }
 		}
 	CleanupStack::PopAndDestroy();//overrides
 iInternalError = connErr;
 {
 iWaitDialog->SetTextL( aLabel->Des() );
 }
 iWaitDialog->RunLD();
 }
+//-------------------------------------------------------------------
+//CInternetConnectionManager::SetOccPreferences
+//-------------------------------------------------------------------
+void CInternetConnectionManager::SetOccPreferences( TSetOCCPreferences aOCCPreferences)
+{
+if( iSyncConnector )
+iSyncConnector->SetOccPreferences(aOCCPreferences);
+}
 // End of File

branch	RCL_3
changeset 49	919f36ff910f
parent 48	79859ed3eea9