--- a/hotspotfw/hsserver/inc/hotspotsession.h Thu Aug 19 10:59:40 2010 +0300
+++ b/hotspotfw/hsserver/inc/hotspotsession.h Tue Aug 31 16:18:40 2010 +0300
@@ -27,8 +27,6 @@
#include <wlanmgmtinterface.h>
#include <wlanmgmtcommon.h>
#include <commdb.h>
-#include <ictscommon.h>
-#include <ictsclientinterface.h>
#include "hssnotif.h"
#include "hssiapsettingshandler.h"
#include "hssclientinterface.h"
@@ -51,8 +49,7 @@
* @lib HotSpotServer.exe
* @since Series 60 3.0
*/
-NONSHARABLE_CLASS( CHotSpotSession ) : public CSession2,
- public MIctsObserver,
+NONSHARABLE_CLASS( CHotSpotSession ) : public CSession2,
public MHssLoginTimerObserver,
public MHssLogoutTimerObserver,
public MWlanMgmtNotifications
@@ -96,16 +93,6 @@
void DispatchMessageL( const RMessage2& aMessage );
/**
- * From MICTSObserver. Called when internet connectivity tests are
- * being done.
- * @param aResult Result of tests
- * @param aString String containing possible HTML response
- * @return None
- */
- void ConnectivityObserver( TIctsTestResult aResult,
- const TDesC& aString );
-
- /**
* From MHssLoginTimerObserver. Called when time used for Login(..)
* has run out for client.
* @return None
@@ -150,30 +137,20 @@
*/
void ConstructL();
- /**
- * Initialize Scan to WlanEngine
- * @return None
- */
-
- /**
- * Launch Intenet Connectivity Test Service
- * @return None
- */
- void TestInternetConnectivityL();
-
+
/**
* Starts client register procedures
* @param aMessage, RMessage from client side
* @return None
*/
- void ProcessRegisterL( const RMessage2& aMessage );
+ void ProcessRegister( const RMessage2& aMessage );
/**
* Starts client unregister procedures
* @param aMessage, RMessage from client side
* @return None
*/
- void ProcessUnRegisterL( const RMessage2& aMessage );
+ void ProcessUnRegister( const RMessage2& aMessage );
/**
* Starts login procedures
@@ -181,7 +158,7 @@
* @param aNetId, Network id
* @return KErrNone, if successful, otherwice one of system wide errorcodes.
*/
- TInt ProcessStartLoginL( const TUint aIapId, const TUint aNetId );
+ TInt ProcessStartLogin( const TUint aIapId, const TUint aNetId );
/**
* Starts Join procedures
@@ -226,18 +203,6 @@
void ProcessServerShutdown( const RMessage2& aMessage );
/**
- * Updates UI state of HotSpot browser logon application.
- * @param aMessage, Message for completing request
- */
- void ProcessUiStateL( const RMessage2& aMessage );
-
- /**
- * Start HotSpot browser logon application.
- * @param aString, redirect URL
- */
- void AuthenticateL( const TDesC& aString );
-
- /**
* Removes brackets from the UID
* @param aUid, UID of the client
*/
@@ -317,12 +282,6 @@
* Own
*/
CHssIapSettingsHandler* iIapSettingsHandler;
-
- /**
- * Internet Connectivity testing instance
- * Own
- */
- CIctsClientInterface* iIcts;
/**
* Timer used for client Login procedure