wlan_bearer/wlandbif_cd/src/wdbifwlansettings.cpp
changeset 36 1c425781161e
parent 19 629e60dfa279
child 50 5cdddd04119b
equal deleted inserted replaced
35:5e6ba967244f 36:1c425781161e
    14 * Description:  Handles the custom WLANServiceTable  in CommsDat
    14 * Description:  Handles the custom WLANServiceTable  in CommsDat
    15 *
    15 *
    16 */
    16 */
    17 
    17 
    18 /*
    18 /*
    19 * %version: 12.1.1 %
    19 * %version: 14 %
    20 */
    20 */
    21 
    21 
    22 //  INCLUDE FILES
    22 //  INCLUDE FILES
    23 
    23 
    24 #include <e32svr.h>
    24 #include <e32svr.h>
   165         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WepIndex: %d"),
   165         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WepIndex: %d"),
   166             aSettings.WepIndex));
   166             aSettings.WepIndex));
   167         ReadWepKeysL(aSettings);           
   167         ReadWepKeysL(aSettings);           
   168         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL, Wep keys succesfully read")));
   168         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL, Wep keys succesfully read")));
   169         }
   169         }
   170     else if( aSettings.SecurityMode > Wep)
   170     else if( aSettings.SecurityMode == Wlan8021x )
       
   171         {
       
   172         aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
       
   173         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
       
   174             aSettings.WPAKeyLength));
       
   175         }
       
   176     else if( aSettings.SecurityMode > Wlan8021x )
   171         {
   177         {
   172         aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
   178         aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
   173         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
   179         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
   174             aSettings.WPAKeyLength));       
   180             aSettings.WPAKeyLength));       
   175         aSettings.EnableWpaPsk = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanEnableWpaPsk));
   181         aSettings.EnableWpaPsk = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanEnableWpaPsk));