--- a/wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp	Fri Feb 19 23:55:42 2010 +0200
+++ b/wlanutilities/wlansniffer/engine/server/src/wsfwlanscanner.cpp	Fri Mar 12 15:48:54 2010 +0200
@@ -334,12 +334,13 @@
         delete iScanResults;
         iScanResults = results;
 
+#ifdef _DEBUG
+        DumpScanResultsL( iScanArray );
+#endif
+        
         // we may let go the scan array contents...
         iScanArray->Reset();
     
-#ifdef _DEBUG
-        DumpScanResultsL( iScanArray );
-#endif
         // notify clients that data is ready
         if ( iObserver )
             {
@@ -476,12 +477,15 @@
 //    
 void CWsfWlanScanner::DumpScanResultsL( CWsfWlanInfoArray* aArray )
     {
+    LOG_ENTERFN( "CWsfWlanScanner::DumpScanResultsL" );
     _LIT( Kopen, "open" );
     _LIT( Kwep, "wep" );
     _LIT( Kwpa, "wpa" );
     _LIT( Kwpa2, "wpa2" );        
     _LIT( K802, "802.1x" );
-    const TDesC* secModes[4] = { &Kopen, &Kwep, &K802, &Kwpa };
+    _LIT( KWAPI, "WAPI" );
+    _LIT( KUnknown, "Unknown" );
+
     _LIT( Kpsk, "psk" );
     _LIT( Keap, "eap" );
     _LIT( Khidden, "<hidden>" );
@@ -507,6 +511,13 @@
                 break;
             case EWlanSecMode802_1x:
                 sm = &K802;
+                break;
+            case EWlanSecModeWAPI:
+                sm = &KWAPI;
+                break;
+            default:
+                sm = &KUnknown;
+                break;
             }
         
         const TDesC* psk = wi->UsesPreSharedKey()? &Kpsk: