# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286974082 -10800 # Node ID 32fadeea4023e9fbf80c4353caa89afc4ab348a0 # Parent 34911529ee3cf1cf0c3cc1d9704b7d9ffe532093 Revision: 201039 Kit: 201041 diff -r 34911529ee3c -r 32fadeea4023 hsfw_plat/internet_connectivity_test_service_api/inc/ictscommon.h --- a/hsfw_plat/internet_connectivity_test_service_api/inc/ictscommon.h Wed Sep 15 13:26:06 2010 +0300 +++ b/hsfw_plat/internet_connectivity_test_service_api/inc/ictscommon.h Wed Oct 13 15:48:02 2010 +0300 @@ -28,8 +28,8 @@ // Length of HTTP FW response const TInt KHttpResponseLength = 1024; -// HTTP::HEAD max response time for timer. 5 seconds. -const TInt KHttpResponseTime = 5000000; +// HTTP::HEAD max response time for timer. 7 seconds. +const TInt KHttpResponseTime = 7000000; // DATA TYPES diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/engine/server/src/wsfengine.cpp --- a/wlanutilities/wlansniffer/engine/server/src/wsfengine.cpp Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/engine/server/src/wsfengine.cpp Wed Oct 13 15:48:02 2010 +0300 @@ -375,8 +375,6 @@ // set the scanner to check connected accounts iScanner->ConnectionEstablishedL( aConnectionName ); - iScanner->RestartScanning(); - // notify the observers for ( TInt i( 0 ); i < iObservers.Count(); ++i ) { diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp --- a/wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp Wed Oct 13 15:48:02 2010 +0300 @@ -748,15 +748,6 @@ void CWsfWlanScanner::BssidChanged( TWlanBssid& /*aNewBSsid*/ ) { LOG_ENTERFN( "CWsfWlanScanner::BssidChanged" ); - if ( iScanState == EIdle && !IsActive() ) - { - iCacheLifetime = -1; - iMaxDelay = 0; - // complete ourselves - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - } } @@ -767,15 +758,6 @@ void CWsfWlanScanner::BssLost() { LOG_ENTERFN( "CWsfWlanScanner::BssLost" ); - if ( iScanState == EIdle && !IsActive() ) - { - iCacheLifetime = -1; - iMaxDelay = 0; - // complete ourselves - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - } } @@ -786,15 +768,6 @@ void CWsfWlanScanner::BssRegained() { LOG_ENTERFN( "CWsfWlanScanner::BssRegained" ); - if ( iScanState == EIdle && !IsActive() ) - { - iCacheLifetime = -1; - iMaxDelay = 0; - // complete ourselves - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - } } @@ -843,15 +816,6 @@ void CWsfWlanScanner::TransmitPowerChanged( TUint /*aPower*/ ) { LOG_ENTERFN( "CWsfWlanScanner::TransmitPowerChanged" ); - if ( iScanState == EIdle && !IsActive() ) - { - iCacheLifetime = -1; - iMaxDelay = 0; - // complete ourselves - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - } } @@ -862,15 +826,6 @@ void CWsfWlanScanner::RssChanged( TWlanRssClass /*aRssClass*/, TUint /*aRss*/ ) { LOG_ENTERFN( "CWsfWlanScanner::RssChanged" ); - if ( iScanState == EIdle && !IsActive() ) - { - iCacheLifetime = -1; - iMaxDelay = 0; - // complete ourselves - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete( status, KErrNone ); - } } diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/mainapplication/src/wsfmaincontroller.cpp --- a/wlanutilities/wlansniffer/mainapplication/src/wsfmaincontroller.cpp Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/mainapplication/src/wsfmaincontroller.cpp Wed Oct 13 15:48:02 2010 +0300 @@ -61,8 +61,6 @@ iAppUi = &aAppUi; iModel = &aModel; iWlanInfoBranding = &aWlanInfoBranding; - // Initialize our reference info array - iInfoArray = iModel->WlanList(); iModel->SetConnecting( EFalse ); } @@ -358,9 +356,6 @@ } } } - - //Update icon - iModel->RefreshScanL(); } // --------------------------------------------------------------------------- @@ -603,41 +598,37 @@ void TWsfMainController::UpdateIapIdToInfoArrayL( TWsfWlanInfo& aInfo ) { LOG_ENTERFN( "TWsfMainController::UpdateIapIdToInfoArrayL" ); - - if ( iInfoArray ) + TWsfWlanInfo* temp = iInfoArray->Match( aInfo.iSsid, iInfoArray->Count() ); + if ( temp && !aInfo.Hidden() ) { - TWsfWlanInfo* temp = iInfoArray->Match( aInfo.iSsid, iInfoArray->Count() ); - if ( temp && !aInfo.Hidden() ) + LOG_WRITE( "Info found" ); + + // Check that there aren't any IAPs with same id + TWsfWlanInfo* wlanInfoWithSameIapId = iInfoArray->Match( aInfo.iIapId, + iInfoArray->Count() ); + if ( wlanInfoWithSameIapId ) { - LOG_WRITE( "Info found" ); - - // Check that there aren't any IAPs with same id - TWsfWlanInfo* wlanInfoWithSameIapId = iInfoArray->Match( aInfo.iIapId, - iInfoArray->Count() ); - if ( wlanInfoWithSameIapId ) - { - // info with same id found set its iap id to zero - LOG_WRITE( "info with same id found" ); - wlanInfoWithSameIapId->iIapId = 0; - } - - temp->iIapId = aInfo.iIapId; - - if ( aInfo.iNetworkName.Length() ) - { - // Replace ssid as well since scanner does this same thing - temp->iSsid.Copy( aInfo.iNetworkName ); - } + // info with same id found set its iap id to zero + LOG_WRITE( "info with same id found" ); + wlanInfoWithSameIapId->iIapId = 0; } - else + + temp->iIapId = aInfo.iIapId; + + if ( aInfo.iNetworkName.Length() ) { - LOG_WRITE( "Info not found" ); - TWsfWlanInfo* createdInfo = new (ELeave) TWsfWlanInfo( aInfo ); - createdInfo->iVisibility = ETrue; - createdInfo->iStrengthLevel = EWlanSignalStrengthMax; - iInfoArray->AppendL( createdInfo ); + // Replace ssid as well since scanner does this same thing + temp->iSsid.Copy( aInfo.iNetworkName ); } } + else + { + LOG_WRITE( "Info not found" ); + TWsfWlanInfo* createdInfo = new (ELeave) TWsfWlanInfo( aInfo ); + createdInfo->iVisibility = ETrue; + createdInfo->iStrengthLevel = EWlanSignalStrengthMax; + iInfoArray->AppendL( createdInfo ); + } } // --------------------------------------------------------------------------- diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/model/inc/wsfmodel.h --- a/wlanutilities/wlansniffer/model/inc/wsfmodel.h Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/model/inc/wsfmodel.h Wed Oct 13 15:48:02 2010 +0300 @@ -101,20 +101,13 @@ IMPORT_C void SetEngineObserver( MWsfModelObserver* aObserver ); /** - * Return pointer to the list of WLANs. Ownership not passed. - * @since S60 5.2 - * @return Array of WLANs - */ - inline CWsfWlanInfoArray* WlanList(); - - /** * Return the latest list of found WLANs. Ownership not passed. * @since S60 5.0 * @return Array of WLANs */ IMPORT_C CWsfWlanInfoArray* GetWlanListL(); - /** + /** * Asyncronous request to the server to return wlan list size * @since S60 5.2 * @param aPckg request result @@ -124,11 +117,11 @@ IMPORT_C void GetWlanListSize( TPckgBuf& aPckg, TRequestStatus& aStatus ); - /** + /** * Asyncronous request to the server to return wlan list * @since S60 5.2 * @param aPckg request result - * @param aPtr wlan list + * @param aPtr wlan list * @param aStatus The request status object used to contain * the completion status of the request. */ diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/model/inc/wsfmodel.inl --- a/wlanutilities/wlansniffer/model/inc/wsfmodel.inl Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/model/inc/wsfmodel.inl Wed Oct 13 15:48:02 2010 +0300 @@ -39,13 +39,3 @@ } -// ----------------------------------------------------------------------------- -// CWsfModel::WlanList -// ----------------------------------------------------------------------------- -// -inline CWsfWlanInfoArray* CWsfModel::WlanList() - { - return iArray; - } - - diff -r 34911529ee3c -r 32fadeea4023 wlanutilities/wlansniffer/model/src/wsfmodel.cpp --- a/wlanutilities/wlansniffer/model/src/wsfmodel.cpp Wed Sep 15 13:26:06 2010 +0300 +++ b/wlanutilities/wlansniffer/model/src/wsfmodel.cpp Wed Oct 13 15:48:02 2010 +0300 @@ -253,8 +253,6 @@ iObserver->ConnectingFinishedL( err ); } - iRefreshing = iSession.RequestScanL(); - return err; }