connectionmonitoring/connmon/connectionmonitor/src/CWlanSupport.cpp
changeset 20 9c97ad6591ae
parent 18 fcbbe021d614
child 61 8b0c979bbe8c
equal deleted inserted replaced
18:fcbbe021d614 20:9c97ad6591ae
   189     return result;
   189     return result;
   190     }
   190     }
   191 
   191 
   192 
   192 
   193 // -----------------------------------------------------------------------------
   193 // -----------------------------------------------------------------------------
   194 // CWlanSupport::GetSignalStrength
   194 // CWlanSupport::GetSignalStrengthL
   195 // -----------------------------------------------------------------------------
   195 // -----------------------------------------------------------------------------
   196 //
   196 //
   197 TInt CWlanSupport::GetSignalStrengthL(
   197 TInt CWlanSupport::GetSignalStrengthL(
   198         const RMessage2& aMessage,
   198         const RMessage2& aMessage,
   199         TInt& aSignalStrength )
   199         TInt& aSignalStrength )
   414     //LOGEXITFN1("CWlanSupport::AppendAvailableIaps()", err)
   414     //LOGEXITFN1("CWlanSupport::AppendAvailableIaps()", err)
   415     return err;
   415     return err;
   416     }
   416     }
   417 
   417 
   418 // -----------------------------------------------------------------------------
   418 // -----------------------------------------------------------------------------
   419 // CWlanSupport::AppendAvailableIapsBySsid
   419 // CWlanSupport::AppendAvailableIapsBySsidL
   420 // -----------------------------------------------------------------------------
   420 // -----------------------------------------------------------------------------
   421 //
   421 //
   422 TInt CWlanSupport::AppendAvailableIapsBySsidL( RArray<TUint>& aIdArray )
   422 TInt CWlanSupport::AppendAvailableIapsBySsidL( RArray<TUint>& aIdArray )
   423     {
   423     {
   424     LOGENTRFN("CWlanSupport::AppendAvailableIapsBySsidL()")
   424     LOGENTRFN("CWlanSupport::AppendAvailableIapsBySsidL()")
   589 TInt CWlanSupport::GetConnectionSecurity( TInt& aConnectionSecurity )
   589 TInt CWlanSupport::GetConnectionSecurity( TInt& aConnectionSecurity )
   590     {
   590     {
   591     LOGENTRFN("CWlanSupport::GetConnectionSecurity()")
   591     LOGENTRFN("CWlanSupport::GetConnectionSecurity()")
   592     TInt err( KErrNone );
   592     TInt err( KErrNone );
   593 
   593 
   594     TWlanConnectionSecurityMode mode( EWlanConnectionSecurityOpen );
   594     TWlanConnectionExtentedSecurityMode mode( EWlanConnectionExtentedSecurityModeOpen );
   595 
   595 
   596     // Get security mode
   596     // Get security mode
   597     err = iWlanMgmt->GetConnectionSecurityMode( mode );
   597     err = iWlanMgmt->GetExtendedConnectionSecurityMode( mode );
   598     if ( KErrNone == err )
   598     if ( KErrNone == err )
   599         {
   599         {
   600         switch ( mode )
   600         aConnectionSecurity = ConvertWlanExtSecModeToConnMonSecModeV2( mode );
   601             {
       
   602             case EWlanConnectionSecurityOpen:
       
   603                 aConnectionSecurity = EConnMonSecurityOpen;
       
   604                 break;
       
   605             case EWlanConnectionSecurityWep:
       
   606                 aConnectionSecurity = EConnMonSecurityWep;
       
   607                 break;
       
   608             case EWlanConnectionSecurity802d1x:
       
   609                 aConnectionSecurity = EConnMonSecurity802d1x;
       
   610                 break;
       
   611             case EWlanConnectionSecurityWpa:
       
   612                 aConnectionSecurity = EConnMonSecurityWpa;
       
   613                 break;
       
   614             case EWlanConnectionSecurityWpaPsk:
       
   615                 aConnectionSecurity = EConnMonSecurityWpaPsk;
       
   616                 break;
       
   617             default:
       
   618                 aConnectionSecurity = EConnMonSecurityOpen;
       
   619                 break;
       
   620             }
       
   621         LOGIT1("GetConnectionSecurity: security mode %d", aConnectionSecurity)
   601         LOGIT1("GetConnectionSecurity: security mode %d", aConnectionSecurity)
   622         }
   602         }
   623 
   603 
   624     LOGEXITFN1("CWlanSupport::GetConnectionSecurity()", err)
   604     LOGEXITFN1("CWlanSupport::GetConnectionSecurity()", err)
   625     return err;
   605     return err;
   771 
   751 
   772             // Signal strength
   752             // Signal strength
   773             TUint signalStrength(scanInfo->RXLevel());
   753             TUint signalStrength(scanInfo->RXLevel());
   774             LOGIT1("CWlanSupport::GetWLANNetworksL: signalStrength %d", signalStrength)
   754             LOGIT1("CWlanSupport::GetWLANNetworksL: signalStrength %d", signalStrength)
   775 
   755 
   776             // SecurityMode
   756             // Security mode
   777             TUint8 ieLength( 0 );
   757             TInt wlanExtSecurityMode( scanInfo->ExtendedSecurityMode() );
   778             const TUint8* wpaData;
   758             TInt securityModeV2( ConvertWlanExtSecModeToConnMonSecModeV2( wlanExtSecurityMode ) );
   779 
   759             TInt securityMode( ConvertConMonSecModeV2ToConnMonSecMode( securityModeV2 ) );
   780             TUint securityMode( EConnMonSecurityOpen );
       
   781             if ( scanInfo->Capability() & KWlan802Dot11CapabilityPrivacyMask )
       
   782                 {
       
   783                 if ( ( scanInfo->InformationElement(
       
   784                         KWlan802Dot11RsnIE,
       
   785                         ieLength,
       
   786                         &wpaData ) == KErrNone ) ||
       
   787                      ( scanInfo->WpaIE(
       
   788                         ieLength,
       
   789                         &wpaData ) == KErrNone ) )
       
   790                     {
       
   791                     securityMode = EConnMonSecurityWpa; // WPA
       
   792                     }
       
   793                 else
       
   794                     {
       
   795                     securityMode = EConnMonSecurityWep; // WEP
       
   796                     }
       
   797                 }
       
   798             LOGIT1("CWlanSupport::GetWLANNetworksL: securityMode %d", securityMode)
   760             LOGIT1("CWlanSupport::GetWLANNetworksL: securityMode %d", securityMode)
   799 
   761 
   800             // SSID == name
   762             // SSID == name
   801             TBuf8<TConnMonWLANNetwork::KMaxNameLength> name8;
   763             TBuf8<TConnMonWLANNetwork::KMaxNameLength> name8;
   802             TUint8 ieLen( 0 );
   764             TUint8 ieLen( 0 );
   865     return KRequestPending;
   827     return KRequestPending;
   866     }
   828     }
   867 
   829 
   868 
   830 
   869 // -----------------------------------------------------------------------------
   831 // -----------------------------------------------------------------------------
   870 // CWlanSupport::ParseWlanNetworks
   832 // CWlanSupport::ParseWlanNetworksL
   871 // -----------------------------------------------------------------------------
   833 // -----------------------------------------------------------------------------
   872 //
   834 //
   873 void CWlanSupport::ParseWlanNetworksL(
   835 void CWlanSupport::ParseWlanNetworksL(
   874         CWlanScanInfo* aScanInfo,
   836         CWlanScanInfo* aScanInfo,
   875         RConnMonWlanNetworksPtrArray& aWlanNetworks )
   837         RConnMonWlanNetworksPtrArray& aWlanNetworks )
   897             }
   859             }
   898 
   860 
   899         // Signal strength
   861         // Signal strength
   900         TUint signalStrength( aScanInfo->RXLevel() );
   862         TUint signalStrength( aScanInfo->RXLevel() );
   901 
   863 
   902         // SecurityMode
   864         // Security mode
   903         TUint8 ieLength( 0 );
   865         TInt wlanExtSecurityMode( aScanInfo->ExtendedSecurityMode() );
   904         const TUint8* wpaData;
   866         TInt securityModeV2( ConvertWlanExtSecModeToConnMonSecModeV2( wlanExtSecurityMode ) );
   905 
   867         TInt securityMode( ConvertConMonSecModeV2ToConnMonSecMode( securityModeV2 ) );
   906         TUint securityMode( EConnMonSecurityOpen );
   868 
   907         if ( aScanInfo->Capability() & KWlan802Dot11CapabilityPrivacyMask )
   869         // Protected setup
   908             {
   870         TBool protectedSetupSupport( aScanInfo->IsProtectedSetupSupported() );
   909             if ( ( aScanInfo->InformationElement(
       
   910                     KWlan802Dot11RsnIE,
       
   911                     ieLength,
       
   912                     &wpaData ) == KErrNone ) ||
       
   913                  ( aScanInfo->WpaIE(
       
   914                     ieLength,
       
   915                     &wpaData ) == KErrNone ) )
       
   916                 {
       
   917                 securityMode = EConnMonSecurityWpa; // WPA
       
   918                 }
       
   919             else
       
   920                 {
       
   921                 securityMode = EConnMonSecurityWep; // WEP
       
   922                 }
       
   923             }
       
   924 
   871 
   925         // SSID == name
   872         // SSID == name
   926         TBuf8<CConnMonWlanNetwork::KMaxNameLength> name8;
   873         TBuf8<CConnMonWlanNetwork::KMaxNameLength> name8;
   927         TUint8 ieLen( 0 );
   874         TUint8 ieLen( 0 );
   928         const TUint8* ieData;
   875         const TUint8* ieData;
   953         CConnMonWlanNetwork* net = CConnMonWlanNetwork::NewL(
   900         CConnMonWlanNetwork* net = CConnMonWlanNetwork::NewL(
   954                 name,
   901                 name,
   955                 connectionMode,
   902                 connectionMode,
   956                 signalStrength,
   903                 signalStrength,
   957                 securityMode,
   904                 securityMode,
       
   905                 securityModeV2,
       
   906                 protectedSetupSupport,
   958                 bssid,
   907                 bssid,
   959                 KNullDesC() );
   908                 KNullDesC() );
   960         CleanupStack::PushL( net );
   909         CleanupStack::PushL( net );
   961         aWlanNetworks.AppendL( net );
   910         aWlanNetworks.AppendL( net );
   962         CleanupStack::Pop( net );
   911         CleanupStack::Pop( net );
   968     LOGEXITFN("CWlanSupport::ParseWlanNetworksL()")
   917     LOGEXITFN("CWlanSupport::ParseWlanNetworksL()")
   969     }
   918     }
   970 
   919 
   971 
   920 
   972 // -----------------------------------------------------------------------------
   921 // -----------------------------------------------------------------------------
   973 // CWlanSupport::GetCurrentWlanNetwork
   922 // CWlanSupport::GetCurrentWlanNetworkL
   974 // -----------------------------------------------------------------------------
   923 // -----------------------------------------------------------------------------
   975 //
   924 //
   976 TInt CWlanSupport::GetCurrentWlanNetworkL(
   925 TInt CWlanSupport::GetCurrentWlanNetworkL(
   977         RConnMonWlanNetworksPtrArray& aWlanNetwork )
   926         RConnMonWlanNetworksPtrArray& aWlanNetwork )
   978     {
   927     {
   979     LOGENTRFN("CWlanSupport::GetCurrentWlanNetworkL()")
   928     LOGENTRFN("CWlanSupport::GetCurrentWlanNetworkL()")
   980     TInt err( KErrNone );
   929     TInt err( KErrNone );
   981 
   930 
   982     TInt connectionMode;
   931     TInt connectionMode;
   983     TInt connectionSecurity;
   932     TInt connectionSecurity;
       
   933     TInt connectionSecurityV2;
   984     TInt connectionSignalQuality;
   934     TInt connectionSignalQuality;
   985     TBuf<CConnMonWlanNetwork::KMaxNameLength> connectionSsid;
   935     TBuf<CConnMonWlanNetwork::KMaxNameLength> connectionSsid;
   986     TBuf8<CConnMonWlanNetwork::KWlanBssId> connectionBssid;
   936     TBuf8<CConnMonWlanNetwork::KWlanBssId> connectionBssid;
   987 
   937 
   988     // Get connection mode to see if connection exists
   938     // Get connection mode to see if connection exists
   989     err = GetConnectionMode( connectionMode );
   939     err = GetConnectionMode( connectionMode );
   990     if ( KErrNone == err )
   940     if ( KErrNone == err )
   991         {
   941         {
   992         // Get connection security mode
   942         // Get connection security mode
   993         err = GetConnectionSecurity( connectionSecurity );
   943         err = GetConnectionSecurity( connectionSecurityV2 );
       
   944         connectionSecurity = ConvertConMonSecModeV2ToConnMonSecMode( connectionSecurityV2 );
   994         }
   945         }
   995     if ( KErrNone == err )
   946     if ( KErrNone == err )
   996         {
   947         {
   997         // Get connection signal quality
   948         // Get connection signal quality
   998         err = GetConnectionSignalQuality( connectionSignalQuality );
   949         err = GetConnectionSignalQuality( connectionSignalQuality );
  1013         CConnMonWlanNetwork* net = CConnMonWlanNetwork::NewL(
   964         CConnMonWlanNetwork* net = CConnMonWlanNetwork::NewL(
  1014                 connectionSsid,
   965                 connectionSsid,
  1015                 connectionMode,
   966                 connectionMode,
  1016                 connectionSignalQuality,
   967                 connectionSignalQuality,
  1017                 connectionSecurity,
   968                 connectionSecurity,
       
   969                 connectionSecurityV2,
       
   970                 0,
  1018                 connectionBssid,
   971                 connectionBssid,
  1019                 KNullDesC() );
   972                 KNullDesC() );
  1020         CleanupStack::PushL( net );
   973         CleanupStack::PushL( net );
  1021         aWlanNetwork.AppendL( net );
   974         aWlanNetwork.AppendL( net );
  1022         CleanupStack::Pop( net );
   975         CleanupStack::Pop( net );
  1043     return KRequestPending;
   996     return KRequestPending;
  1044     }
   997     }
  1045 
   998 
  1046 
   999 
  1047 // -----------------------------------------------------------------------------
  1000 // -----------------------------------------------------------------------------
  1048 // CWlanSupport::ParseWlanNetworks
  1001 // CWlanSupport::ParseWlanProbeRawBuffersL
  1049 // -----------------------------------------------------------------------------
  1002 // -----------------------------------------------------------------------------
  1050 //
  1003 //
  1051 void CWlanSupport::ParseWlanProbeRawBuffersL(
  1004 void CWlanSupport::ParseWlanProbeRawBuffersL(
  1052         CWlanScanInfo* aScanInfo,
  1005         CWlanScanInfo* aScanInfo,
  1053         RConnMonWlanProbeRawBuffersPtrArray& aWlanProbeRawBuffers )
  1006         RConnMonWlanProbeRawBuffersPtrArray& aWlanProbeRawBuffers )
  1198     LOGEXITFN1("CWlanSupport::WlanSessionIndex()", result)
  1151     LOGEXITFN1("CWlanSupport::WlanSessionIndex()", result)
  1199     return result;
  1152     return result;
  1200     }
  1153     }
  1201 
  1154 
  1202 // -----------------------------------------------------------------------------
  1155 // -----------------------------------------------------------------------------
  1203 // CWlanSupport::SetIntAttribute
  1156 // CWlanSupport::SetIntAttributeL
  1204 // -----------------------------------------------------------------------------
  1157 // -----------------------------------------------------------------------------
  1205 //
  1158 //
  1206 TInt CWlanSupport::SetIntAttributeL(
  1159 TInt CWlanSupport::SetIntAttributeL(
  1207         const RMessage2& aMessage,
  1160         const RMessage2& aMessage,
  1208         const TInt aValue )
  1161         const TInt aValue )
  1230     LOGEXITFN1("CWlanSupport::SetIntAttributeL()", result)
  1183     LOGEXITFN1("CWlanSupport::SetIntAttributeL()", result)
  1231     return result;
  1184     return result;
  1232     }
  1185     }
  1233 
  1186 
  1234 // -----------------------------------------------------------------------------
  1187 // -----------------------------------------------------------------------------
  1235 // CWlanSupport::SetUintAttribute
  1188 // CWlanSupport::SetUintAttributeL
  1236 // -----------------------------------------------------------------------------
  1189 // -----------------------------------------------------------------------------
  1237 //
  1190 //
  1238 TInt CWlanSupport::SetUintAttributeL(
  1191 TInt CWlanSupport::SetUintAttributeL(
  1239         const RMessage2& aMessage,
  1192         const RMessage2& aMessage,
  1240         const TUint aValue )
  1193         const TUint aValue )
  1262     LOGEXITFN1("CWlanSupport::SetUintAttributeL()", result)
  1215     LOGEXITFN1("CWlanSupport::SetUintAttributeL()", result)
  1263     return result;
  1216     return result;
  1264     }
  1217     }
  1265 
  1218 
  1266 // -----------------------------------------------------------------------------
  1219 // -----------------------------------------------------------------------------
  1267 // CWlanSupport::GetIntAttribute
  1220 // CWlanSupport::GetIntAttributeL
  1268 // -----------------------------------------------------------------------------
  1221 // -----------------------------------------------------------------------------
  1269 //
  1222 //
  1270 TInt CWlanSupport::GetIntAttributeL( const RMessage2& aMessage, TInt& aValue )
  1223 TInt CWlanSupport::GetIntAttributeL( const RMessage2& aMessage, TInt& aValue )
  1271     {
  1224     {
  1272     LOGENTRFN("CWlanSupport::GetIntAttributeL()")
  1225     LOGENTRFN("CWlanSupport::GetIntAttributeL()")
  1291     LOGEXITFN1("CWlanSupport::GetIntAttributeL()", err)
  1244     LOGEXITFN1("CWlanSupport::GetIntAttributeL()", err)
  1292     return err;
  1245     return err;
  1293     }
  1246     }
  1294 
  1247 
  1295 // -----------------------------------------------------------------------------
  1248 // -----------------------------------------------------------------------------
  1296 // CWlanSupport::GetUintAttribute
  1249 // CWlanSupport::GetUintAttributeL
  1297 // -----------------------------------------------------------------------------
  1250 // -----------------------------------------------------------------------------
  1298 //
  1251 //
  1299 TInt CWlanSupport::GetUintAttributeL( const RMessage2& aMessage, TUint& aValue )
  1252 TInt CWlanSupport::GetUintAttributeL( const RMessage2& aMessage, TUint& aValue )
  1300     {
  1253     {
  1301     LOGENTRFN("CWlanSupport::GetUintAttributeL()")
  1254     LOGENTRFN("CWlanSupport::GetUintAttributeL()")
  1320     LOGEXITFN1("CWlanSupport::GetUintAttributeL()", err)
  1273     LOGEXITFN1("CWlanSupport::GetUintAttributeL()", err)
  1321     return err;
  1274     return err;
  1322     }
  1275     }
  1323 
  1276 
  1324 // -----------------------------------------------------------------------------
  1277 // -----------------------------------------------------------------------------
  1325 // CWlanSupport::SetStringAttribute
  1278 // CWlanSupport::SetStringAttributeL
  1326 //
  1279 //
  1327 // Currently assumes the descriptor attribute 'aValue' length has been checked
  1280 // Currently assumes the descriptor attribute 'aValue' length has been checked
  1328 // earlier and is short enough.
  1281 // earlier and is short enough.
  1329 // -----------------------------------------------------------------------------
  1282 // -----------------------------------------------------------------------------
  1330 //
  1283 //
  1356     LOGEXITFN1("CWlanSupport::SetStringAttributeL()", err)
  1309     LOGEXITFN1("CWlanSupport::SetStringAttributeL()", err)
  1357     return err;
  1310     return err;
  1358     }
  1311     }
  1359 
  1312 
  1360 // -----------------------------------------------------------------------------
  1313 // -----------------------------------------------------------------------------
  1361 // CWlanSupport::GetStringAttribute
  1314 // CWlanSupport::GetStringAttributeL
  1362 // -----------------------------------------------------------------------------
  1315 // -----------------------------------------------------------------------------
  1363 //
  1316 //
  1364 TInt CWlanSupport::GetStringAttributeL(
  1317 TInt CWlanSupport::GetStringAttributeL(
  1365         const RMessage2& aMessage,
  1318         const RMessage2& aMessage,
  1366         TDes& aValue )
  1319         TDes& aValue )
  1467             }
  1420             }
  1468         }
  1421         }
  1469 
  1422 
  1470     LOGEXITFN1("CWlanSupport::WlanRssGoodEnough()", value)
  1423     LOGEXITFN1("CWlanSupport::WlanRssGoodEnough()", value)
  1471     return value;
  1424     return value;
       
  1425     }
       
  1426 
       
  1427 // -----------------------------------------------------------------------------
       
  1428 // CWlanSupport::ConvertConMonSecModeV2ToConnMonSecMode
       
  1429 // -----------------------------------------------------------------------------
       
  1430 //
       
  1431 TInt CWlanSupport::ConvertConMonSecModeV2ToConnMonSecMode( TInt aConnMonSecModeV2 )
       
  1432     {
       
  1433     TInt connMonSecMode( EConnMonSecurityOpen );
       
  1434     switch ( aConnMonSecModeV2 )
       
  1435         {
       
  1436         case EConnMonSecurityV2Open:
       
  1437             connMonSecMode = EConnMonSecurityOpen;
       
  1438             break;
       
  1439         case EConnMonSecurityV2WepOpen:
       
  1440         case EConnMonSecurityV2WepShared:
       
  1441             connMonSecMode = EConnMonSecurityWep;
       
  1442             break;
       
  1443         case EConnMonSecurityV2802d1x:
       
  1444             connMonSecMode = EConnMonSecurity802d1x;
       
  1445             break;
       
  1446         case EConnMonSecurityV2Wpa:
       
  1447         case EConnMonSecurityV2Wpa2:
       
  1448             connMonSecMode = EConnMonSecurityWpa;
       
  1449             break;
       
  1450         case EConnMonSecurityV2WpaPsk:
       
  1451         case EConnMonSecurityV2Wpa2Psk:
       
  1452             connMonSecMode = EConnMonSecurityWpaPsk;
       
  1453             break;
       
  1454         case EConnMonSecurityV2Wapi:
       
  1455         case EConnMonSecurityV2WapiPsk:
       
  1456             connMonSecMode = EConnMonSecurity802d1x;
       
  1457             break;
       
  1458         default:
       
  1459             connMonSecMode = EConnMonSecurityOpen;
       
  1460             break;
       
  1461         }
       
  1462     return connMonSecMode;
       
  1463     }
       
  1464 
       
  1465 // -----------------------------------------------------------------------------
       
  1466 // CWlanSupport::ConvertWlanExtSecModeToConnMonSecModeV2
       
  1467 // -----------------------------------------------------------------------------
       
  1468 //
       
  1469 TInt CWlanSupport::ConvertWlanExtSecModeToConnMonSecModeV2( TInt aWlanExtSecMode )
       
  1470     {
       
  1471     TInt connMonSecModeV2( EConnMonSecurityV2Open );
       
  1472     switch ( aWlanExtSecMode )
       
  1473         {
       
  1474         case EWlanConnectionExtentedSecurityModeOpen:
       
  1475             connMonSecModeV2 = EConnMonSecurityV2Open;
       
  1476             break;
       
  1477         case EWlanConnectionExtentedSecurityModeWepOpen:
       
  1478             connMonSecModeV2 = EConnMonSecurityV2WepOpen;
       
  1479             break;
       
  1480         case EWlanConnectionExtentedSecurityModeWepShared:
       
  1481             connMonSecModeV2 = EConnMonSecurityV2WepShared;
       
  1482             break;
       
  1483         case EWlanConnectionExtentedSecurityMode802d1x:
       
  1484             connMonSecModeV2 = EConnMonSecurityV2802d1x;
       
  1485             break;
       
  1486         case EWlanConnectionExtentedSecurityModeWpa:
       
  1487             connMonSecModeV2 = EConnMonSecurityV2Wpa;
       
  1488             break;
       
  1489         case EWlanConnectionExtentedSecurityModeWpaPsk:
       
  1490             connMonSecModeV2 = EConnMonSecurityV2WpaPsk;
       
  1491             break;
       
  1492         case EWlanConnectionExtentedSecurityModeWpa2:
       
  1493             connMonSecModeV2 = EConnMonSecurityV2Wpa2;
       
  1494             break;
       
  1495         case EWlanConnectionExtentedSecurityModeWpa2Psk:
       
  1496             connMonSecModeV2 = EConnMonSecurityV2Wpa2Psk;
       
  1497             break;
       
  1498         case EWlanConnectionExtentedSecurityModeWapi:
       
  1499             connMonSecModeV2 = EConnMonSecurityV2Wapi;
       
  1500             break;
       
  1501         case EWlanConnectionExtentedSecurityModeWapiPsk:
       
  1502             connMonSecModeV2 = EConnMonSecurityV2WapiPsk;
       
  1503             break;
       
  1504         default:
       
  1505             connMonSecModeV2 = EConnMonSecurityV2Open;
       
  1506             break;
       
  1507         }
       
  1508     return connMonSecModeV2;
  1472     }
  1509     }
  1473 
  1510 
  1474 // ============================ MEMBER FUNCTIONS ===============================
  1511 // ============================ MEMBER FUNCTIONS ===============================
  1475 
  1512 
  1476 // -----------------------------------------------------------------------------
  1513 // -----------------------------------------------------------------------------
  1786         }
  1823         }
  1787     LOGEXITFN("CWlanSession::SetWlanScanCacheLifetime()")
  1824     LOGEXITFN("CWlanSession::SetWlanScanCacheLifetime()")
  1788     }
  1825     }
  1789 
  1826 
  1790 // -----------------------------------------------------------------------------
  1827 // -----------------------------------------------------------------------------
  1791 // CWlanSession::GetScanResults
  1828 // CWlanSession::GetScanResultsL
  1792 // -----------------------------------------------------------------------------
  1829 // -----------------------------------------------------------------------------
  1793 //
  1830 //
  1794 void CWlanSession::GetScanResultsL( const RMessage2& aMessage )
  1831 void CWlanSession::GetScanResultsL( const RMessage2& aMessage )
  1795     {
  1832     {
  1796     LOGENTRFN("CWlanSession::GetScanResultsL()")
  1833     LOGENTRFN("CWlanSession::GetScanResultsL()")
  2000         }
  2037         }
  2001     //LOGEXITFN("CWlanSession::CompleteActiveRequestsWithError()")
  2038     //LOGEXITFN("CWlanSession::CompleteActiveRequestsWithError()")
  2002     }
  2039     }
  2003 
  2040 
  2004 // -----------------------------------------------------------------------------
  2041 // -----------------------------------------------------------------------------
  2005 // CWlanSession::CompleteActiveRequests
  2042 // CWlanSession::CompleteActiveRequestsL
  2006 // -----------------------------------------------------------------------------
  2043 // -----------------------------------------------------------------------------
  2007 //
  2044 //
  2008 void CWlanSession::CompleteActiveRequestsL(
  2045 void CWlanSession::CompleteActiveRequestsL(
  2009         const TInt aStatus,
  2046         const TInt aStatus,
  2010         CWlanScanInfo* aScanInfo,
  2047         CWlanScanInfo* aScanInfo,
  2174 
  2211 
  2175     LOGEXITFN("CWlanSession::CompleteGetSignalStrengthRequest()")
  2212     LOGEXITFN("CWlanSession::CompleteGetSignalStrengthRequest()")
  2176     }
  2213     }
  2177 
  2214 
  2178 // -----------------------------------------------------------------------------
  2215 // -----------------------------------------------------------------------------
  2179 // CWlanSession::CompleteGetNetworkNamesRequest
  2216 // CWlanSession::CompleteGetNetworkNamesRequestL
  2180 // Completes the asynchronous client request: GetPckgAttribute( KNetworkNames )
  2217 // Completes the asynchronous client request: GetPckgAttribute( KNetworkNames )
  2181 // -----------------------------------------------------------------------------
  2218 // -----------------------------------------------------------------------------
  2182 //
  2219 //
  2183 void CWlanSession::CompleteGetNetworkNamesRequestL(
  2220 void CWlanSession::CompleteGetNetworkNamesRequestL(
  2184         CWlanScanInfo* aScanInfo,
  2221         CWlanScanInfo* aScanInfo,
  2205 
  2242 
  2206     LOGEXITFN("CWlanSession::CompleteGetNetworkNamesRequestL()")
  2243     LOGEXITFN("CWlanSession::CompleteGetNetworkNamesRequestL()")
  2207     }
  2244     }
  2208 
  2245 
  2209 // -----------------------------------------------------------------------------
  2246 // -----------------------------------------------------------------------------
  2210 // CWlanSession::CompleteGetWlanNetworksRequest
  2247 // CWlanSession::CompleteGetWlanNetworksRequestL
  2211 // Completes the asynchronous client request: GetPckgAttribute( KWlanNetworks )
  2248 // Completes the asynchronous client request: GetPckgAttribute( KWlanNetworks )
  2212 // -----------------------------------------------------------------------------
  2249 // -----------------------------------------------------------------------------
  2213 //
  2250 //
  2214 void CWlanSession::CompleteGetWlanNetworksRequestL(
  2251 void CWlanSession::CompleteGetWlanNetworksRequestL(
  2215         CWlanScanInfo* aScanInfo,
  2252         CWlanScanInfo* aScanInfo,
  2257 
  2294 
  2258     LOGEXITFN("CWlanSession::CompleteGetWlanNetworksRequestL()")
  2295     LOGEXITFN("CWlanSession::CompleteGetWlanNetworksRequestL()")
  2259     }
  2296     }
  2260 
  2297 
  2261 // -----------------------------------------------------------------------------
  2298 // -----------------------------------------------------------------------------
  2262 // CWlanSession::CompleteGetWlanSsidNetworksRequest
  2299 // CWlanSession::CompleteGetWlanSsidNetworksRequestL
  2263 // Completes the asynchronous client request: GetPckgAttribute( KWlanSsidNetworks )
  2300 // Completes the asynchronous client request: GetPckgAttribute( KWlanSsidNetworks )
  2264 // -----------------------------------------------------------------------------
  2301 // -----------------------------------------------------------------------------
  2265 //
  2302 //
  2266 void CWlanSession::CompleteGetWlanSsidNetworksRequestL(
  2303 void CWlanSession::CompleteGetWlanSsidNetworksRequestL(
  2267         CWlanScanInfo* aScanInfo,
  2304         CWlanScanInfo* aScanInfo,
  2309 
  2346 
  2310     LOGEXITFN("CWlanSession::CompleteGetWlanSsidNetworksRequestL()")
  2347     LOGEXITFN("CWlanSession::CompleteGetWlanSsidNetworksRequestL()")
  2311     }
  2348     }
  2312 
  2349 
  2313 // -----------------------------------------------------------------------------
  2350 // -----------------------------------------------------------------------------
  2314 // CWlanSession::CompleteGetWlanProbeRawBuffersRequest
  2351 // CWlanSession::CompleteGetWlanProbeRawBuffersRequestL
  2315 // Completes the asynchronous client request: GetPckgAttribute( KWlanProbeRawBuffers )
  2352 // Completes the asynchronous client request: GetPckgAttribute( KWlanProbeRawBuffers )
  2316 // -----------------------------------------------------------------------------
  2353 // -----------------------------------------------------------------------------
  2317 //
  2354 //
  2318 void CWlanSession::CompleteGetWlanProbeRawBuffersRequestL(
  2355 void CWlanSession::CompleteGetWlanProbeRawBuffersRequestL(
  2319         CWlanScanInfo* aScanInfo,
  2356         CWlanScanInfo* aScanInfo,