--- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp Thu May 13 22:51:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp Mon May 24 20:32:47 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 17.1.4 %
+* %version: 28 %
*/
// This is enumeration of EAPOL source code.
@@ -37,6 +37,8 @@
#include <EapTypeInfo.h>
#include "EapMsChapV2DbUtils.h"
+#include "EapConversion.h"
+#include "EapTraceSymbian.h"
// LOCAL CONSTANTS
@@ -47,34 +49,41 @@
// ================= MEMBER FUNCTIONS =======================
-CEapMsChapV2::CEapMsChapV2(const TIndexType aIndexType,
- const TInt aIndex, const eap_type_value_e aEapType /* =eap_type_mschapv2 */)
+CEapMsChapV2::CEapMsChapV2(
+ const TIndexType aIndexType,
+ const TInt aIndex,
+ const eap_type_value_e aEapType)
: iIndexType(aIndexType)
, iIndex(aIndex)
, iTunnelingType(eap_type_none)
, iEapType(aEapType)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::CEapMsChapV2()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::CEapMsChapV2()\n"));
+
}
// ----------------------------------------------------------
CEapMsChapV2* CEapMsChapV2::NewL(SIapInfo *aIapInfo)
{
- return new (ELeave) CEapMsChapV2(aIapInfo->indexType, aIapInfo->index);
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::NewL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::NewL()\n"));
+
+ return new (ELeave) CEapMsChapV2(aIapInfo->indexType, aIapInfo->index, eap_type_mschapv2);
}
// ----------------------------------------------------------
CEapMsChapV2* CEapMsChapV2::NewPlainMSCHAPv2L(SIapInfo *aIapInfo)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::NewPlainMSCHAPv2L()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::NewPlainMSCHAPv2L()\n"));
+
return new (ELeave) CEapMsChapV2(
aIapInfo->indexType,
aIapInfo->index,
-#if defined(USE_EAP_EXPANDED_TYPES)
eap_expanded_type_ttls_plain_mschapv2.get_type()
-#else
- eap_type_plain_mschapv2
-#endif //#if defined(USE_EAP_EXPANDED_TYPES)
);
}
@@ -83,6 +92,9 @@
CEapMsChapV2::~CEapMsChapV2()
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::~CEapMsChapV2()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::~CEapMsChapV2()\n"));
+
}
// ----------------------------------------------------------
@@ -104,6 +116,9 @@
#endif // #ifdef USE_EAP_SIMPLE_CONFIG
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::GetStackInterfaceL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::GetStackInterfaceL()\n"));
+
// Create AM
eap_am_type_mschapv2_symbian_c* amEapType = eap_am_type_mschapv2_symbian_c::NewL(
aTools,
@@ -151,28 +166,24 @@
TUint CEapMsChapV2::GetInterfaceVersion()
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::GetInterfaceVersion()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::GetInterfaceVersion()\n"));
+
return KInterfaceVersion;
}
-
// ----------------------------------------------------------
-TInt CEapMsChapV2::InvokeUiL()
-{
- TInt buttonId(0);
- return buttonId;
-}
-
+CEapTypeInfo* CEapMsChapV2::GetInfoL()
+{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::GetInfoL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::GetInfoL()\n"));
-// ----------------------------------------------------------
-CEapTypeInfo* CEapMsChapV2::GetInfoLC()
-{
CEapTypeInfo* info = new(ELeave) CEapTypeInfo(
(TDesC&)KReleaseDate,
(TDesC&)KEapTypeVersion,
(TDesC&)KManufacturer);
- CleanupStack::PushL(info);
return info;
}
@@ -180,30 +191,42 @@
void CEapMsChapV2::DeleteConfigurationL()
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::DeleteConfigurationL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::DeleteConfigurationL()\n"));
+
EapMsChapV2DbUtils::DeleteConfigurationL(iIndexType, iIndex, iTunnelingType);
}
// ----------------------------------------------------------
-void CEapMsChapV2::SetTunnelingType(const TInt aTunnelingType)
-{
-#ifdef USE_EAP_EXPANDED_TYPES
-
- // Vendor id is eap_type_vendor_id_ietf always in this plugin.
- iTunnelingType.set_eap_type_values(eap_type_vendor_id_ietf, aTunnelingType);
+void CEapMsChapV2::SetTunnelingType(const TEapExpandedType aTunnelingType)
+ {
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::SetTunnelingType()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::SetTunnelingType()\n"));
-#else
-
- iTunnelingType = static_cast<eap_type_value_e>(aTunnelingType);
-
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
-}
+ EAP_TRACE_DATA_DEBUG_SYMBIAN(
+ (EAPL("CEapMsChapV2::SetTunnelingType - tunneling type"),
+ aTunnelingType.GetValue().Ptr(), aTunnelingType.GetValue().Length()));
+
+ eap_type_value_e aInternalType;
+
+ TInt err = CEapConversion::ConvertExpandedEAPTypeToInternalType(
+ &aTunnelingType,
+ &aInternalType);
+
+ iTunnelingType = aInternalType;
+
+ }
// ----------------------------------------------------------
+
void CEapMsChapV2::SetIndexL(
const TIndexType aIndexType,
const TInt aIndex)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::SetIndexL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::SetIndexL()\n"));
+
// First delete the target configuration
TIndexType tmpIndexType = iIndexType;
TInt tmpIndex = iIndex;
@@ -221,7 +244,7 @@
RDbNamedDatabase db;
- RDbs session;
+ RFs session;
EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
@@ -240,14 +263,18 @@
iIndexType = aIndexType;
iIndex = aIndex;
- CleanupStack::PopAndDestroy(2); // db
+ CleanupStack::PopAndDestroy(&db);
+ CleanupStack::PopAndDestroy(&session);
}
void CEapMsChapV2::SetConfigurationL(const EAPSettings& aSettings)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::SetConfigurationL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::SetConfigurationL()\n"));
+
RDbNamedDatabase db;
- RDbs session;
+ RFs session;
// This also creates the IAP entry if it doesn't exist
EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
@@ -262,14 +289,18 @@
iIndex,
iTunnelingType);
- CleanupStack::PopAndDestroy(2); // db, session
+ CleanupStack::PopAndDestroy(&db);
+ CleanupStack::PopAndDestroy(&session);
}
void CEapMsChapV2::GetConfigurationL(EAPSettings& aSettings)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::GetConfigurationL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::GetConfigurationL()\n"));
+
RDbNamedDatabase db;
- RDbs session;
+ RFs session;
// This also creates the IAP entry if it doesn't exist
EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
@@ -284,13 +315,17 @@
iIndex,
iTunnelingType);
- CleanupStack::PopAndDestroy(2); // db, session
+ CleanupStack::PopAndDestroy(&db);
+ CleanupStack::PopAndDestroy(&session);
}
void CEapMsChapV2::CopySettingsL(
const TIndexType aDestinationIndexType,
const TInt aDestinationIndex)
{
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::CopySettingsL()\n")));
+ EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapMsChapV2::CopySettingsL()\n"));
+
// First delete the target configuration
TIndexType tmpIndexType = iIndexType;
TInt tmpIndex = iIndex;
@@ -308,7 +343,7 @@
RDbNamedDatabase db;
- RDbs session;
+ RFs session;
EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
@@ -324,7 +359,8 @@
aDestinationIndex,
iTunnelingType);
- CleanupStack::PopAndDestroy(2); // db
+ CleanupStack::PopAndDestroy(&db);
+ CleanupStack::PopAndDestroy(&session);
}