equal
deleted
inserted
replaced
332 HBufC8* results = iScanArray->SerializeContentLC(); |
332 HBufC8* results = iScanArray->SerializeContentLC(); |
333 CleanupStack::Pop( results ); |
333 CleanupStack::Pop( results ); |
334 delete iScanResults; |
334 delete iScanResults; |
335 iScanResults = results; |
335 iScanResults = results; |
336 |
336 |
337 // we may let go the scan array contents... |
|
338 iScanArray->Reset(); |
|
339 |
|
340 #ifdef _DEBUG |
337 #ifdef _DEBUG |
341 DumpScanResultsL( iScanArray ); |
338 DumpScanResultsL( iScanArray ); |
342 #endif |
339 #endif |
|
340 |
|
341 // we may let go the scan array contents... |
|
342 iScanArray->Reset(); |
|
343 |
343 // notify clients that data is ready |
344 // notify clients that data is ready |
344 if ( iObserver ) |
345 if ( iObserver ) |
345 { |
346 { |
346 iObserver->WlanScanCompleteL(); |
347 iObserver->WlanScanCompleteL(); |
347 } |
348 } |
474 // CWsfWlanScanner::DumpScanResultsL |
475 // CWsfWlanScanner::DumpScanResultsL |
475 // --------------------------------------------------------------------------- |
476 // --------------------------------------------------------------------------- |
476 // |
477 // |
477 void CWsfWlanScanner::DumpScanResultsL( CWsfWlanInfoArray* aArray ) |
478 void CWsfWlanScanner::DumpScanResultsL( CWsfWlanInfoArray* aArray ) |
478 { |
479 { |
|
480 LOG_ENTERFN( "CWsfWlanScanner::DumpScanResultsL" ); |
479 _LIT( Kopen, "open" ); |
481 _LIT( Kopen, "open" ); |
480 _LIT( Kwep, "wep" ); |
482 _LIT( Kwep, "wep" ); |
481 _LIT( Kwpa, "wpa" ); |
483 _LIT( Kwpa, "wpa" ); |
482 _LIT( Kwpa2, "wpa2" ); |
484 _LIT( Kwpa2, "wpa2" ); |
483 _LIT( K802, "802.1x" ); |
485 _LIT( K802, "802.1x" ); |
484 const TDesC* secModes[4] = { &Kopen, &Kwep, &K802, &Kwpa }; |
486 _LIT( KWAPI, "WAPI" ); |
|
487 _LIT( KUnknown, "Unknown" ); |
|
488 |
485 _LIT( Kpsk, "psk" ); |
489 _LIT( Kpsk, "psk" ); |
486 _LIT( Keap, "eap" ); |
490 _LIT( Keap, "eap" ); |
487 _LIT( Khidden, "<hidden>" ); |
491 _LIT( Khidden, "<hidden>" ); |
488 |
492 |
489 for ( TInt i( 0 ); i < aArray->Count(); ++i ) |
493 for ( TInt i( 0 ); i < aArray->Count(); ++i ) |
505 case EWlanSecModeWpa2: |
509 case EWlanSecModeWpa2: |
506 sm = &Kwpa2; |
510 sm = &Kwpa2; |
507 break; |
511 break; |
508 case EWlanSecMode802_1x: |
512 case EWlanSecMode802_1x: |
509 sm = &K802; |
513 sm = &K802; |
|
514 break; |
|
515 case EWlanSecModeWAPI: |
|
516 sm = &KWAPI; |
|
517 break; |
|
518 default: |
|
519 sm = &KUnknown; |
|
520 break; |
510 } |
521 } |
511 |
522 |
512 const TDesC* psk = wi->UsesPreSharedKey()? &Kpsk: |
523 const TDesC* psk = wi->UsesPreSharedKey()? &Kpsk: |
513 ( ( wi->iSecurityMode == EWlanSecMode802_1x || |
524 ( ( wi->iSecurityMode == EWlanSecMode802_1x || |
514 wi->iSecurityMode == EWlanSecModeWpa || |
525 wi->iSecurityMode == EWlanSecModeWpa || |