MCL/sf/mw/wirelessacc: comparison wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp

equal deleted inserted replaced

-:aaabc7526ded
+:a9524956f6b5
 void CWsfWlanScanner::DoCancel()
 {
 LOG_ENTERFN( "CWsfWlanScanner::DoCancel" );
 iTimer.Cancel();
 #ifndef __WINS__
+iWlanMgmtClient->CancelGetAvailableIaps();
 iWlanMgmtClient->CancelGetScanResults();
 #endif
 iScanState = EIdle;
 }
 LOG_ENTERFN( "CWsfWlanScanner::RunL" );
 /*
 * Scan logic
 * 1. Get available IAPs - state = EIdle
-* 2. Do broadcast scan - state = EIdle
+* 2. Do broadcast scan - state = EBroadcastScan
-* 3. Process broadcast scan results - state = EBroadcastScan
+* 3. Process broadcast scan results - state = EProcessBroadcastScan
 * 4. Do direct scans for remaining known networks
 *    from step 2. Get available IAPs - state = EDirectScan
 * 5. Add connected network - state = EFinished
 * 6. Set names and priorities for known networks - state = EFinished
 */
 if ( iScanState == EIdle )
 {
-LOG_WRITE( "broadcast scan phase" );
+LOG_WRITE( "Get available IAPs scan phase" );
 // prepare things for direct scans
 PrepareDirectScan();
 // notify clients
 if ( iObserver )
 {
 iObserver->WlanScanStarted();
 }
 #ifndef __WINS__
 // get available iaps
 // (this only shows iaps with security mode matching to scan results
 // and  also finds hidden wlans for which an iap has been configured)
 iAvailableIaps.Reset();
-iWlanMgmtClient->GetAvailableIaps( iAvailableIaps );
+iWlanMgmtClient->GetAvailableIaps( iCacheLifetime,
+iMaxDelay,
-		// do broadcast scan
+EFalse,
+iStatus,
+iAvailableIaps );
+SetActive();
+#else
+// for testing
+SetActive();
+TRequestStatus* status = &iStatus;
+User::RequestComplete( status, KErrNone );
+#endif
+iScanState = EBroadcastScan;
+}
+else if ( iScanState == EBroadcastScan )
+{
+LOG_WRITEF( "GetAvailableIaps returned iStatus=%d", iStatus.Int() );
+if ( iStatus.Int() )
+{
+LOG_WRITE( "Error in getting available IAPs - leave" );
+User::Leave( iStatus.Int() );
+}
+#ifdef _DEBUG
+for ( TInt i = 0; i < iAvailableIaps.Count(); ++i )
+{
+LOG_WRITEF( "iAvailableIaps array index[%d] IapId[%d] rssi[%d]", i,
+iAvailableIaps[i].iIapId, iAvailableIaps[i].iRssi );
+}
+#endif
+#ifndef __WINS__
+// do broadcast scan
 iWlanMgmtClient->GetScanResults( iStatus, *iScanInfo );
 SetActive();
 #else
 // for testing
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 #endif
+iScanState = EProcessBroadcastScan;
-iScanState = EBroadcastScan;
+}
-}
+else if ( iScanState == EProcessBroadcastScan )
-else if ( iScanState == EBroadcastScan )
 {
 // process broadcast scan results
 DoScanForNetworksL();
 // now it's time to initiate direct scan
 // reset the timer if we are responsible for scheduling scans
 iTimer.Cancel();
 iTimer.After( iStatus,
 TTimeIntervalMicroSeconds32( iScanningInterval ) );
 Cancel();
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 }
 iScanState = EIdle;
 }
 if ( matchArray.Count() )
 {
 LOG_WRITE( "Info found" );
 TWsfWlanInfo* temp = matchArray[0];
 temp->iConnectionState = EConnected;
+temp->iIapId = connectedInfo->iIapId;
 temp->iSsid.Copy( connectedSsidOrIap );
 temp->iNetworkName.Zero();
 }
 else
 {
 wi->iSecurityMode == EWlanSecModeWpa ||
 wi->iSecurityMode == EWlanSecModeWpa2 )?
 &Keap: &KNullDesC );
 HBufC16 *ssid = TWsfWlanInfo::GetSsidAsUnicodeLC( wi->iSsid );
-LOG_WRITEF( "[%S] %S %S %S", ssid, sm, psk,
+LOG_WRITEF( "[%S] IapId=%d %S %S %S", ssid, wi->iIapId, sm, psk,
 wi->iVisibility? &KNullDesC: &Khidden );
 CleanupStack::PopAndDestroy( ssid );
 }
 }
 {
 // the scanning has failed, re-issue the scan timer
 iTimer.Cancel();
 iTimer.After( iStatus,
 TTimeIntervalMicroSeconds32( iScanningInterval ) );
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 }
 return KErrNone;
 }
 iScanState = EIdle;
 if ( !iShowAvailability )
 {
 // in case show wlan availability is off, carry out a scan now
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 }
 }
 if ( iScanState == EIdle && ( IsActive() || iShowAvailability ) )
 {
 // we have been waiting for the timer to complete
 // cancel it manually
 Cancel();
+iCacheLifetime = 0;
+iMaxDelay = 0;
 // then complete ourselves
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 restarted = ETrue;
 if ( !iShowAvailability )
 {
 // still, life goes on
 iTimer.After( iStatus, TTimeIntervalMicroSeconds32(
 iScanningInterval ) );
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 }
 }
 }
 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 );
 }
 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 );
 }
 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 );
 }
 void CWsfWlanScanner::NewNetworksDetected()
 {
 LOG_ENTERFN( "CWsfWlanScanner::NewNetworksDetected" );
 if ( iScanState == EIdle && !IsActive() )
 {
+iCacheLifetime = -1;
+iMaxDelay = 0;
 // complete ourselves
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 }
 void CWsfWlanScanner::OldNetworksLost()
 {
 LOG_ENTERFN( "CWsfWlanScanner::OldNetworksLost" );
 if ( iScanState == EIdle && !IsActive() )
 {
+iCacheLifetime = -1;
+iMaxDelay = 0;
 // complete ourselves
 SetActive();
 TRequestStatus* status = &iStatus;
 User::RequestComplete( status, KErrNone );
 }
 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 );
 }
 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 );
 }
 LOG_ENTERFN( "CWsfWlanScanner::DoScanForNetworksL" );
 // start by making sure the scan array is empty
 iScanArray->Reset();
-LOG_WRITEF( "GetScanResults returned %d", iStatus.Int() );
+LOG_WRITEF( "GetScanResults returned iStatus=%d", iStatus.Int() );
 if ( iStatus.Int() )
 {
 // if the status is not KErrNone, we cannot be sure that iScanInfo
 // doesn't cause a crash, so it's better to leave
+LOG_WRITE( "Error in getting scan result - leave" );
 User::Leave( iStatus.Int() );
 }
 TInt nElem = 0;
 TBool isHidden( EFalse );
 for( TInt i(0); i < avIapCount; i++ )
 {
 TBool addToArray( ETrue );
 TWsfWlanInfo* availableInfo = new ( ELeave ) TWsfWlanInfo();
 CleanupStack::PushL( availableInfo );
-availableInfo->iIapId = iAvailableIaps[i];
+availableInfo->iIapId = iAvailableIaps[i].iIapId;
 TRAPD( error, GetWlanInfoFromIapL( *availableInfo ) );
 if ( error == KErrNotFound )
 {
 LOG_WRITEF( "Iap id = %d does not exist", availableInfo->iIapId );
 if( addToArray )
 {
 LOG_WRITE( "Add to array" );
 availableInfo->iCoverage = 0;
 availableInfo->iVisibility = 1;
-availableInfo->iStrengthLevel = EWlanSignalUnavailable;
+availableInfo->iStrengthLevel = iAvailableIaps[i].iRssi;
 availableInfo->iTransferRate = 0;
 availableInfo->iConnectionState = ENotConnected;
 iScanArray->AppendL(availableInfo);
 nElem++;
 if ( availableInfo->iIapId )
 {
-LOG_WRITEF( "Append available iap [%d] for direct scan", availableInfo->iIapId );
+LOG_WRITEF( "Append available iap[%d] rssi[%d] for direct scan",
+availableInfo->iIapId, availableInfo->iStrengthLevel );
 iDirectScanIapIDs.Append( availableInfo->iIapId );
 iDirectScanSsids.Append( availableInfo->iSsid );
 }
 CleanupStack::Pop( availableInfo );
 {
 LOG_WRITE( "Info not added" );
 CleanupStack::PopAndDestroy( availableInfo );
 }
 }
+#ifdef _DEBUG
+LOG_WRITE( "Dump scan results - available IAPs" );
+DumpScanResultsL( iScanArray );
+#endif
 // Process the scanned results
 for( iScanInfo->First(); !iScanInfo->IsDone(); iScanInfo->Next() )
 {
 TWsfWlanInfo* wlanInfo = iScanArray->At( nElem );
 // ---------------------------------------------------------------------------
 //
 void CWsfWlanScanner::GetWlanInfoFromIapL( TWsfWlanInfo& aWlanInfo )
 {
 LOG_ENTERFN( "CWsfWlanScanner::GetWlanInfoFromIapL" );
+LOG_WRITEF( "Iap Id = %d", aWlanInfo.iIapId );
 CCommsDatabase* commsDb = CCommsDatabase::NewL();
 CleanupStack::PushL( commsDb );
 CCommsDbTableView* commsDbIapTableView = commsDb->OpenViewMatchingUintLC(
 TUint32 secMode(0);
 wlanTableView->ReadUintL(TPtrC( WLAN_SECURITY_MODE), secMode);
 // Map Wpa2 to Wpa
 secMode = ( secMode == EWlanSecModeWpa2 )? EWlanSecModeWpa : secMode;
 aWlanInfo.iSecurityMode = static_cast<TWlanSecMode>(secMode);
+TUint32 usePsk(0);
+TRAP_IGNORE( wlanTableView->ReadUintL(TPtrC( WLAN_ENABLE_WPA_PSK ),
+usePsk ) );
+aWlanInfo.SetUsesPreSharedKey( usePsk );
 // net mode
 TUint32 netMode(0);
 wlanTableView->ReadUintL(TPtrC( WLAN_CONNECTION_MODE), netMode);
 aWlanInfo.iNetMode = static_cast<TWlanNetMode>(netMode);
 {
 Cancel();
 }
 iTimer.After( iStatus, TTimeIntervalMicroSeconds32(
 iScanningInterval ) );
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 }
 }
 }
 else if ( !iShowAvailability )
 // doCancel resets timer
 LOG_WRITE( "reissuing timer request" );
 Cancel();
 iTimer.After( iStatus, TTimeIntervalMicroSeconds32(
 iScanningInterval ) );
+iCacheLifetime = 0;
+iMaxDelay = 0;
 SetActive();
 }
 }
 }

branch	RCL_3
changeset 20	a9524956f6b5
parent 18	aaabc7526ded