MCL/sf/mw/ipconnmgmt: comparison bearermanagement/mpm/inc/mpmserver.h

equal deleted inserted replaced

-:984e13af52c4
+:fc7b30ed2058
 #include <etelpckt.h>       // RPacketService
 #include "mpmcommon.h"
 #include "rmpm.h"
 #include "mpmroamingwatcher.h"
+#include "mpmdatausagewatcher.h"
 class CMPMCommsDatAccess;
 class CMpmCsIdWatcher;
 class CMpmDataUsageWatcher;
 const TInt    KPhoneRetryCount   = 7;
 // 0.1 seconds
 //
 const TInt    KPhoneRetryTimeout = 100000;
+const TUint32 KMaxOpenTransAttempts = 5;
+const TUint32 KRetryAfter = 200000;
 // The granularity with which iDisconnectQueue will allocate memory chunks.
 // If set to two there will be space for two instances of CMPMDisconnectDlg
 // before new memory will be allocated.
 const TInt    KGranularity       = 2;
 const TUint KMPMPolicyRangeCount = 2;
 // roaming to connected wlan wait interval
 // in micro seconds (10 sec)
 const TInt KRoamingToWlanUpdateInterval = 10000000;
+// roaming to connected hotspot wlan wait interval
+// in micro seconds (120 sec)
+const TInt KRoamingToHotspotWlanUpdateInterval = 120000000;
 //Definition of the ranges of IPC numbers
 const TInt KMPMPolicyRanges[KMPMPolicyRangeCount] =
 {
 0, // 0 -> 19 ; EMPMServerChooseIap,
 class CMPMConfirmDlgRoaming;
 class CMPMConfirmDlgStarting;
 class CMPMDefaultConnection;
 class CMPMWlanQueryDialog;
 class CMPMDialog;
+class CMPMConnPermQueryTimer;
 // CLASS DECLARATION
 /**
 *  Class structure to associate Connection Id
 *  and the list of blacklisted IAPs
 * @since 3.2
 */
 void UpdateSessionConnectionDlgL();
 /**
+* Completes pending messages
+* @since 5.2
+* @param aIapId IAP Id of the connection.
+* @param aError Message status
+* @param aErrorReturned Error value to be returned, NULL if no
+* value should be passed
+* @param aNeededAction Needed action to be returned, NULL if no
+* value should be passed
+*/
+void HandlePendingMsgs( TUint aIapId,
+TInt aError,
+TInt* aErrorReturned,
+TBMNeededAction* aNeededAction );
+/**
 * Handling of blacklisting certain IAP and the presumed IAP for
 * the certain connection.
 * @since 3.1
 * @param aConnId Connection Id
 * @param aIapId IAP Id of the connection.
 * @since 5.2
 */
 static TInt StartForcedRoamingToConnectedWlanL( TAny* aUpdater );
 /**
+* Starts forced roaming sequence to connected hotspot wlan
+*
+* @param aIapInfo Info about available IAPs
+* @return Always zero...
+* @since 5.2
+*/
+static TInt StartForcedRoamingToConnectedHotspotWlanL( TAny* aUpdater );
+/**
 * Starts forced roaming sequence from WLAN if necessary
 *
 * @param aIapInfo Info about available IAPs
 * @since 5.2
 */
 *
 * @since 5.2
 		* @return RoamingWatcher pointer
 */
 inline CMPMRoamingWatcher* RoamingWatcher() const;
+/**
+* Returns the DataUsageWatcher pointer
+*
+* @since 5.2
+* @return DataUsageWatcher pointer
+*/
+inline CMpmDataUsageWatcher* DataUsageWatcher() const;
 public: // Functions from base classes
 /**
 */
 CMPMServerSession* GetServerSession( TConnectionId aConnId ) const;
 /**
 * Stops cellular connections, except MMS
-* @since 5.2
+* @param aSilentOnly stop only silent cellular connections
-*/
+* @since 5.2
-void StopCellularConns();
+*/
+void StopCellularConns( TBool aSilentOnly = EFalse );
 /**
 * Offline mode watcher updates the mode variable stored by MPM server.
 * @since 5.2
 * @param aNewModeValue New offline mode value
 * Called when the "Use WLAN in offline mode" query has been responded.
 * @since 5.2
 * @param aResponse Sets the Offline mode query response value.
 */
 void SetOfflineWlanQueryResponse( TOfflineWlanQueryResponse aResponse);
+/**
+* Starts the connection permission query timer.
+* During the timer, no connection permission query can be initiated.
+* @since 5.2
+*/
+void StartConnPermQueryTimer();
+/**
+* Resets the connection permission query timer.
+* @since 5.2
+*/
+void ResetConnPermQueryTimer();
+/**
+* Returns true if the connection permission query timer is running.
+* During the timer, no connection permission query can be initiated.
+* @since 5.2
+* @return ETrue if timer is running, EFalse otherwise.
+*/
+TBool IsConnPermQueryTimerOn();
 private:
 /**
 * C++ default constructor.
 RArray<TUint32>& aAvailWlanIapIds,
 RAvailableIAPList& aIapList,
 TBool aCheckForBestIap,
 TMPMBearerType aDestinationBearerType );
+/**
+* Check if iap can be disconnected, and disconnect it
+* @since 5.2
+* @param aIapId Iap id for checking
+*/
+void CheckIapForDisconnect( TInt aIapId );
 private: // Data
 // Pointer to the ConnMonEvents object
 CMPMConnMonEvents* iEvents;
 // Is WLAN usage already accepted in this offline session.
 TOfflineWlanQueryResponse iOfflineWlanQueryResponse;
 // Timer to start roaming to connected WLAN network
 CPeriodic* iRoamingToWlanPeriodic;
+// Timer to start roaming to connected WLAN network
+CPeriodic* iRoamingToHotspotWlanPeriodic;
 // TConnMonIapInfo Info about available IAPs
 TConnMonIapInfo iConnMonIapInfo;
+// Connection permission query cancellation delay timer
+CMPMConnPermQueryTimer* iConnPermQueryTimer;
 };
 #include "mpmserver.inl"

branch	RCL_3
changeset 23	fc7b30ed2058
parent 20	4c83dcfb6f1a
child 24	05bc53fe583b