--- a/dbcreator/commsdatcreator/Inc/cdcprocessorwlan.h Thu Aug 19 10:18:49 2010 +0300
+++ b/dbcreator/commsdatcreator/Inc/cdcprocessorwlan.h Tue Aug 31 15:35:44 2010 +0300
@@ -28,7 +28,8 @@
#include <cmmanagerext.h>
#include <cmconnectionmethodext.h>
#include <metadatabase.h>
-#include <EapSettings.h>
+#include <EapGeneralSettings.h>
+#include <EapExpandedType.h>
#include "cdcprocessorbase.h"
@@ -49,7 +50,7 @@
~CEapTypeElement();
HBufC* iName;
EAPSettings* iEapSettings;
- EAPSettings::TEapType iEncapsulatingEapId;
+ TEapExpandedType iEncapsulatingEapId;
};
@@ -220,6 +221,13 @@
void SaveWPAL( TUint32 aIapId );
/**
+ * Gets the expanded EAP type
+ * @param aFieldId is the id of the field
+ * @return expanded EAP type
+ */
+ TEapExpandedType GetExpandedEapTypeIdL( TDesC& aField );
+
+ /**
* Gets the TagContainer index that belongst to the given WPA field
* @param aFieldId is the id of the field
* @return index in TagContainer
@@ -260,51 +268,25 @@
/*
* Sets the values of the expanded Eap lists to the database
- * @param aGeneric for accessing the database records
+ * @param aServiceId for accessing the EAP data
*/
- void SetExpandedEapListL( CMDBGenericRecord* aGeneric );
+ void SetExpandedEapListL( const TUint aServiceId );
- /*
- * Creates expanded Eap list from the common Eap list
- * @param aEapList the common Eap list from which the expanded list
- * will be created
- * @param aEnabledNeed indicates the type of the result expanded
- * Eap list. If it is ETrue then the enabled expanded
- * Eap list will be created. Else the disbled one.
- * @return The created expanded Eap list. It can be empty.
- */
- HBufC8* ExpandedEapListLC( HBufC16* aEapList, TBool aEnabledNeed );
-
- /*
- * Adds one item to the expanded Eap list
- * @param aExpandedEapList to which the new item will be added.
- * @param aSlice the common Eap list slice containing one
- * 3 digit long number with sign.
- */
- void AddToList( HBufC8* aExpandedEapList, TPtrC16 aSlice );
-
private:
void AddSecurityDataL( TInt aField, HBufC* aPtrTag, TBool aIsWep );
- void AddEAPSettingL( const TInt aField, const HBufC16* const aValue );
+ void AddEAPSettingL( const TInt aField, HBufC16* aValue );
TBool EAPSetting( const TInt aField );
void FillCipherSuitesL( const HBufC16* const aPtrTag, const TInt aEapIndex );
- EAPSettings::TEapType GetEapTypeIdFromSettingId( const TInt aField );
-
- TUint FindCertificateEntryL( const CertificateEntry::TCertType aCertType, const TInt aEapIndex );
+ TEapExpandedType GetEapTypeIdFromSettingId( const TInt aField );
- void ConvertSubjectKeyIdToBinaryL( const HBufC16* const aSubjectKeyIdString, TDes& aBinaryKey);
- /*
- // @var Stores indexes of WEP fields
- TInt iWEPIndex[KWEPKeyNumOfFields];
-
- // @var Stores indexes of WPA fields
- TInt iWPAIndex[KWPAKeyNumOfFields];
- */
+ TUint FindCertificateEntryL( const EapCertificateEntry::TCertType aCertType, const TInt aEapIndex );
+
+ void ConvertSubjectKeyIdToBinaryL( const HBufC16* const aSubjectKeyIdString, TKeyIdentifier& aBinaryKey);
// @var Indicates the WLAN security mode
TDbCreatorSecurityMode iSecurityMode;
@@ -322,15 +304,9 @@
// @var HBufC for empty WEP and WPA tags
HBufC* iEmptyTag;
-
- // @var Stores indexes of WEP fields
- ////RPointerArray< HBufC > iWepData;
HBufC* iWepData[KWEPKeyNumOfFields];
- // @var Stores indexes of WPA fields
- ////RPointerArray< HBufC > iWpaData;
-
HBufC* iWpaData[KWPAKeyNumOfFields];
TInt iDataStart;
@@ -343,4 +319,4 @@
#endif PROCESSOR_WLAN_H
-// End of File.
\ No newline at end of file
+// End of File.