FCL/sf/mw/ipconnmgmt: comparison cmmanager/cmmgr/cmmpluginbase/src/ccmpluginbaseeng.cpp

equal deleted inserted replaced

-:489cf6208544
+:95d45f234cf3
 #include <datamobilitycommsdattypes.h>
 #include <cmpluginbaseeng.h>
 #include <cmpsettingsconsts.h>
 #include <featmgr.h>
+#include <cmpluginembdestinationdef.h>
+#include "cmmserverdefs.h"
 #include "ccmpluginbaseengtextresolver.h"
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "ccmpluginbaseengTraces.h"
 using namespace CMManager;
 using namespace CommsDat;
-const TInt KApMaxConnNameLength = 30;
+const TInt KApMaxConnNameLength = 50;
 _LIT( KFormatPostfix, "%02d" );
 _LIT( KFormatLargePostfix, "%d" );
 _LIT( KFormatNameWithPostfix, "%S(%S)" );
 _LIT( KFormatNoPostfix, "%S" );
 const TInt KMaxPostfixLength = 5;
 iLocationRecord = NULL;
 iWapAPRecord = NULL;
 iWapIPBearerRecord = NULL;
 iMetaDataRecord = NULL;
-iIapId = 0;
+iCmId = 0;
 iMetadataTableId = 0;
 iLocationEnabled = EFalse;
 OstTraceFunctionExit0( CCMPLUGINBASEENG_CCMPLUGINBASEENG_EXIT );
 }
 //
 EXPORT_C CCmPluginBaseEng::~CCmPluginBaseEng()
 {
 OstTraceFunctionEntry0( DUP1_CCMPLUGINBASEENG_CCMPLUGINBASEENG_ENTRY );
-iIapId = 0;
+iCmId = 0;
 delete iIapRecord; iIapRecord = NULL;
 delete iProxyRecord; iProxyRecord = NULL;
 delete iServiceRecord; iServiceRecord = NULL;
 delete iNetworkRecord; iNetworkRecord = NULL;
 delete iLocationRecord; iLocationRecord = NULL;
 iLocationEnabled = EFalse;
 ResetBearerRecords();
-LoadL( iIapId );
+LoadL( iCmId );
 OstTraceFunctionExit0( CCMPLUGINBASEENG_RELOAD_EXIT );
 }
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CCmPluginBaseEng::LoadL( TUint32 aIapId )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_LOADL_ENTRY );
+// Embedded destination must be handled separately first.
+if ( aIapId > KCmDefaultDestinationAPTagId )
+{
+iCmId = aIapId;
+return;
+}
 DoLoadL( aIapId );
 OstTraceFunctionExit0( CCMPLUGINBASEENG_LOADL_EXIT );
 }
 //
 EXPORT_C void CCmPluginBaseEng::CreateNewL( TUint32 aCmId )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_CREATENEWL_ENTRY );
-if ( iIapId )
+if ( iCmId )
 // we already have IAP id ->
 {
 User::Leave( KErrAlreadyExists );
 }
 EnableProxyL( EFalse );
 _LIT( KDefaultConnNameTextId, "txt_occ_setlabel_connection_name_val_connection" );
 HBufC* resolvedText( NULL );
 resolvedText = CCmPluginBaseEngTextResolver::ResolveTextL( KDefaultConnNameTextId );
-if ( resolvedText != NULL )
+if ( resolvedText )
 {
 SetDefaultNameL( *resolvedText );
 }
 else
 {
 iIapRecord->iNetworkWeighting = 0; // it's always 0.
 if ( aCmId != 0 )
 {
 iIapRecord->SetRecordId( aCmId );
-iIapId = 0;
+iCmId = 0;
 }
 else
 {
 iIapRecord->SetRecordId( KCDNewRecordRequest );
 }
 switch ( aRecordIdentifier )
 {
 case KIapRecordIndex:
 {
-aCopyInstance->iIapRecord = static_cast<CCDIAPRecord*>(
+CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iIapRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
+CleanupStack::PushL( iapRecord );
+CopyRecordFieldsL( *iIapRecord, *iapRecord );
+CleanupStack::Pop( iapRecord );
+aCopyInstance->iIapRecord = iapRecord;
 }
 break;
 case KServiceRecordIndex:
 {
 aCopyInstance->iServiceRecord = CopyServiceRecordL();
 // process, in PrepareToUpdateRecordsL()-method.
 }
 break;
 case KNetworkRecordIndex:
 {
-aCopyInstance->iNetworkRecord = static_cast<CCDNetworkRecord*>(
+CCDNetworkRecord* networkRecord = static_cast<CCDNetworkRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iNetworkRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdNetworkRecord ) );
+CleanupStack::PushL( networkRecord );
+CopyRecordFieldsL( *iNetworkRecord, *networkRecord );
+CleanupStack::Pop( networkRecord );
+aCopyInstance->iNetworkRecord = networkRecord;
 }
 break;
 case KWAPAPRecordIndex:
 {
 aCopyInstance->iWapAPRecord = static_cast<CCDWAPAccessPointRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iWapAPRecord ) );
+CCDRecordBase::CreateCopyRecordL( *iWapAPRecord ) );//TODO, convert to generic copy
 }
 break;
 case KWAPBearerRecordIndex:
 {
 aCopyInstance->iWapIPBearerRecord = static_cast<CCDWAPIPBearerRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iWapIPBearerRecord ) );
+CCDRecordBase::CreateCopyRecordL( *iWapIPBearerRecord ) );//TODO, convert to generic copy
 }
 break;
 case KMetaDataRecordIndex:
 {
 CCDIAPMetadataRecord* metadataRecord =
 break;
 case KProxyRecordIndex:
 {
 if ( iProxyRecord )
 {
-aCopyInstance->iProxyRecord = static_cast<CCDProxiesRecord*>(
+CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iProxyRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
+CleanupStack::PushL( proxyRecord );
+CopyRecordFieldsL( *iProxyRecord, *proxyRecord );
+CleanupStack::Pop( proxyRecord );
+aCopyInstance->iProxyRecord = proxyRecord;
 }
 }
 break;
 default:
 {
 OstTraceFunctionExit0( CCMPLUGINBASEENG_COPYRECORDDATAL_EXIT );
 }
 // ---------------------------------------------------------------------------
-// CCmPluginBaseEng:: CopyRecordFieldsL
+// Copies the values and attributes of all fields from aSource-record into
-// ---------------------------------------------------------------------------
+// aDestination record. Does not copy the record element ID. Also, does not
-//
+// touch any field in aDestination-record that is NULL in aSource-record.
-void CCmPluginBaseEng::CopyRecordFieldsL(
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CCmPluginBaseEng::CopyRecordFieldsL(
 CommsDat::CMDBRecordBase& aSource,
 CommsDat::CMDBRecordBase& aDestination )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_COPYRECORDFIELDSL_ENTRY );
 const SRecordTypeInfo* recordInfo = aSource.GetRecordInfo();
-if ( recordInfo == NULL )
+if ( !recordInfo )
 {
 User::Leave( KErrCorrupt );
 }
 CMDBElement* ptrSource( NULL );
 CMDBElement* ptrDest( NULL );
-while ( recordInfo != NULL && recordInfo->iTypeId != 0 )
+while ( recordInfo && recordInfo->iTypeId != 0 )
 {
 ptrSource = aSource.GetFieldByIdL( recordInfo->iTypeId );
 ptrDest = aDestination.GetFieldByIdL( recordInfo->iTypeId );
 // Make sure we see only basic type info. Masks out any additional info
 //
 void CCmPluginBaseEng::LoadIAPRecordL( TUint32 aIapId )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_LOADIAPRECORDL_ENTRY );
-iIapId = aIapId;
+iCmId = aIapId;
-// Load IAP record
+// Load IAP record.
-CCDIAPRecord *iapRecord = static_cast<CCDIAPRecord *>(
+CCDIAPRecord *iapRecord = static_cast<CCDIAPRecord*>(
 CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
 CleanupStack::PushL( iapRecord );
-iapRecord->SetRecordId( iIapId );
+iapRecord->SetRecordId( iCmId );
 iapRecord->LoadL( iSession );
 CleanupStack::Pop( iapRecord );
 iIapRecord = iapRecord;
 //
 void CCmPluginBaseEng::LoadProxyRecordL()
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_LOADPROXYSETTINGL_ENTRY );
-// Load Proxy record
+// Load Proxy record.
 CMDBRecordSet<CCDProxiesRecord>* proxieRS =
 new( ELeave ) CMDBRecordSet<CCDProxiesRecord>( KCDTIdProxiesRecord );
 CleanupStack::PushL(proxieRS);
-// Now try to find the linked proxy record
+// Now try to find the linked proxy record.
-// create new record
+// Create new record.
 CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>(
 CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
 CleanupStack::PushL( proxyRecord );
-// Prime record
+// Prime record.
 TPtrC serviceType( iIapRecord->iServiceType );
 proxyRecord->iServiceType.SetL( serviceType );
 proxieRS->iRecords.AppendL( proxyRecord ); // Ownership transfered.
 CleanupStack::Pop( proxyRecord );
 // search for our proxy record and remove it from the array,
 // then destroy the array.
 {
 CCDProxiesRecord* proxyRecord = (*proxieRS)[i];
-// Compare the record id of these 2 services
+// Compare the record id of these 2 services.
 if ( TUint32( proxyRecord->iService ) == TUint32( iIapRecord->iService ) )
 {
 iProxyRecord = proxyRecord;
-// Take ownership of this record
+// Take ownership of this record.
 proxieRS->iRecords.Remove( i );
 break;
 }
 ++i;
 }
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_UPDATEIAPRECORDL_ENTRY );
 CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*>(
 aClientPluginInstance->iGenRecordArray[KIapRecordIndex] );
-if ( iIapId == 0 )
+if ( iCmId == 0 )
 {
 // Otherwise predefined iapid.
 if ( !iIapRecord->RecordId() )
 {
 iIapRecord->SetRecordId( KCDNewRecordRequest );
 CopyAttributes( iapRecord, iIapRecord );
 CheckIfNameModifiedL( iapRecord, iIapRecord );
 iIapRecord->StoreL( iSession );
-iIapId = iIapRecord->RecordId();
+iCmId = iIapRecord->RecordId();
-aClientPluginInstance->iIapId = iIapId;
+aClientPluginInstance->iIapId = iCmId;
 CCDIAPRecord* tempIapRecord = static_cast<CCDIAPRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iIapRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
 CleanupStack::PushL( tempIapRecord );
+CopyRecordFieldsL( *iIapRecord, *tempIapRecord );
 tempIapRecord->SetElementId( iIapRecord->ElementId() );
 aClientPluginInstance->iGenRecordArray.Remove( KIapRecordIndex );
-CleanupStack::PushL( iapRecord );
+delete iapRecord;
+iapRecord = NULL;
 aClientPluginInstance->iGenRecordArray.InsertL(
 static_cast<CommsDat::CCDRecordBase*>( tempIapRecord ),
 KIapRecordIndex );
-CleanupStack::PopAndDestroy( iapRecord );
 CleanupStack::Pop( tempIapRecord );
 }
 else
 {
 delete iIapRecord;
 iIapRecord = NULL;
 iIapRecord = static_cast<CCDIAPRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iapRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
+CopyRecordFieldsL( *iapRecord, *iIapRecord );
 iIapRecord->SetElementId( iapRecord->ElementId() );
 iIapRecord->ModifyL( iSession );
 }
 }
 CopyAttributes( iapRecord, proxyRecord );
 CheckIfNameModifiedL( iapRecord, proxyRecord );
-if ( proxyRecord->iUseProxyServer )
+delete iProxyRecord;
-{
+iProxyRecord = NULL;
-delete iProxyRecord;
+iProxyRecord = static_cast<CCDProxiesRecord*>(
-iProxyRecord = NULL;
+CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
+CopyRecordFieldsL( *proxyRecord, *iProxyRecord );
-iProxyRecord = static_cast<CCDProxiesRecord*>(
+iProxyRecord->SetElementId( proxyRecord->ElementId() );
-CCDRecordBase::CreateCopyRecordL( *proxyRecord ) );
-iProxyRecord->SetElementId( proxyRecord->ElementId() );
+if ( !iProxyRecord->RecordId() )
+{
-if ( !iProxyRecord->RecordId() )
+// New proxy setting -> create new record.
-{
+iProxyRecord->iService = iServiceRecord->RecordId();
-// New proxy setting -> create new record.
+iProxyRecord->iServiceType.SetL( iIapRecord->iServiceType );
-iProxyRecord->iService = iServiceRecord->RecordId();
-iProxyRecord->iServiceType.SetL( iIapRecord->iServiceType );
+// By default protocol is set to "http".
+if ( TPtrC( proxyRecord->iProtocolName ).Length() == 0 )
-// By default protocol is set to "http".
+{
-if ( TPtrC( proxyRecord->iProtocolName ).Length() == 0 )
+iProxyRecord->iProtocolName.SetL( KDefProxyProtocolName );
-{
+}
-iProxyRecord->iProtocolName.SetL( KDefProxyProtocolName );
-}
+iProxyRecord->SetRecordId( KCDNewRecordRequest );
+iProxyRecord->StoreL( iSession );
-iProxyRecord->SetRecordId( KCDNewRecordRequest );
+CopyRecordFieldsL( *iProxyRecord, *proxyRecord );
-iProxyRecord->StoreL( iSession );
+proxyRecord->SetElementId( iProxyRecord->ElementId() );
-proxyRecord->SetElementId( iProxyRecord->ElementId() );
-proxyRecord->iService = iServiceRecord->RecordId();
-proxyRecord->iServiceType.SetL( iIapRecord->iServiceType );
-}
-else
-// Already existing record -> update only.
-{
-iProxyRecord->ModifyL( iSession );
-}
 }
 else
-{
+// Already existing record -> update only.
-if ( iProxyRecord->RecordId() )
+{
-{
+iProxyRecord->ModifyL( iSession );
-iProxyRecord->DeleteL( iSession );
-}
 }
 OstTraceFunctionExit0( CCMPLUGINBASEENG_UPDATEPROXYRECORDL_EXIT );
 }
 iNetworkRecord = NULL;
 CheckIfNameModifiedL( iapRecord, networkRecord );
 iNetworkRecord = static_cast<CCDNetworkRecord*>(
-CCDRecordBase::CreateCopyRecordL( *networkRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdNetworkRecord ) );
+CopyRecordFieldsL( *networkRecord, *iNetworkRecord );
 iNetworkRecord->SetElementId( networkRecord->ElementId() );
 if ( !iNetworkRecord->RecordId() )
 {
 User::Leave( KErrNotSupported );
 }
 if ( !iProxyRecord )
 {
-iProxyRecord = static_cast<CCDProxiesRecord *>(
+iProxyRecord = static_cast<CCDProxiesRecord*>(
 CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
 }
 iProxyRecord->iUseProxyServer = aEnable;
 CheckIfNameModifiedL( iapRecord, wapAPRecord );
 CheckIfNameModifiedL( iapRecord, wapIPBearerRecord );
 iWapAPRecord = static_cast<CCDWAPAccessPointRecord*>(
-CCDRecordBase::CreateCopyRecordL( *wapAPRecord ) );
+CCDRecordBase::CreateCopyRecordL( *wapAPRecord ) );//TODO, convert to generic copy
 iWapAPRecord->SetElementId( wapAPRecord->ElementId() );
 iWapIPBearerRecord = static_cast<CCDWAPIPBearerRecord*>(
-CCDRecordBase::CreateCopyRecordL( *wapIPBearerRecord ) );
+CCDRecordBase::CreateCopyRecordL( *wapIPBearerRecord ) );//TODO, convert to generic copy
 iWapIPBearerRecord->SetElementId( wapIPBearerRecord->ElementId() );
 if ( !iWapAPRecord->RecordId() )
 {
 iWapAPRecord->SetRecordId( KCDNewRecordRequest );
 CCDRecordBase* aSrcRecord,
 CCDRecordBase* aDstRecord )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_COPYATTRIBUTES_ENTRY );
-if ( aSrcRecord == NULL || aDstRecord == NULL )
+if ( !aSrcRecord || !aDstRecord )
 {
 OstTraceFunctionExit0( CCMPLUGINBASEENG_COPYATTRIBUTES_EXIT );
 return;
 }
 CCDWAPIPBearerRecord* wapBearerRecord = static_cast<CCDWAPIPBearerRecord*>(
 CCDRecordBase::RecordFactoryL( KCDTIdWAPIPBearerRecord ) );
 CleanupStack::PushL( wapBearerRecord );
-wapBearerRecord->iWAPIAP = iIapId;
+wapBearerRecord->iWAPIAP = iCmId;
 wapRS->iRecords.AppendL( wapBearerRecord );
 CleanupStack::Pop( wapBearerRecord );
 wapBearerRecord = NULL;
 const TDesC& aName,
 const TUint32& aIapId )
 {
 OstTraceFunctionEntry0( CCMPLUGINBASEENG_DOMAKEVALIDNAMEL_ENTRY );
+const TInt decimalBase = 10;
 TBool changed( EFalse );
 HBufC* temp = HBufC::NewLC( KApMaxConnNameLength );
 HBufC* temp2 = HBufC::NewLC( KApMaxConnNameLength );
 HBufC* corrname = EnsureMaxLengthLC( aName, changed );
 {
 changed = ETrue;
 postfix++;
 // Check the length of postfix, check text length accordingly.
 pf = postfix;
-for ( i = 1; i < 10; i++ )
+for ( i = 1; i < decimalBase; i++ )
 {
-pf /= 10;
+pf /= decimalBase;
 if ( !pf )
 break;
 }
 TPtr sgdptr( temp->Des() );
 TPtr sgdptr2( temp2->Des() );
 if ( postfix )
 {
-if ( postfix < 10 )
+if ( postfix < decimalBase )
 {
 sgdptr2 = prefix.Left( KApMaxConnNameLength - i - 3 );
 }
 else
 {
 sgdptr2 = prefix.Left( KApMaxConnNameLength );
 }
 if ( postfix )
 {
 TBuf<KMaxPostfixLength> postfixString;
-if ( postfix > 9 )
+if ( postfix >= decimalBase )
 {
 postfixString.Format( KFormatLargePostfix, postfix );
 //     TODO:               AknTextUtils::LanguageSpecificNumberConversion( postfixString );
 }
 else
 CleanupStack::Pop( iapRecord );
 iapRecord = NULL;
 if ( iapRS->FindL( iSession ) )
 {
-if ( iIapId )
+if ( iCmId )
 {
 // This is not a new CM.
 for ( TInt i = 0; i < iapRS->iRecords.Count(); ++i )
 {
 if ( iapRS->iRecords[i]->RecordId() != aIapId )
 {
 iIapRecord->iRecordName.SetL( aName );
 }
 else if ( iNamingMethod == ENamingUnique )
 {
-HBufC* newName = DoMakeValidNameL( aName, iIapId );
+HBufC* newName = DoMakeValidNameL( aName, iCmId );
 if ( newName )
 // Name converted to unique.
 {
 CleanupStack::PushL( newName );
 iIapRecord->iRecordName.SetL( aName );
 }
 }
 else if ( iNamingMethod == ENamingNotAccept )
 {
-if ( IsValidNameL( aName, iIapId ) )
+if ( IsValidNameL( aName, iCmId ) )
 {
 iIapRecord->iRecordName.SetL( aName );
 }
 else
 {
 CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>( aProxyRecord );
 proxyRecord->iServerName.SetL( aProxyServer );
 if ( !aProxyServer.Length() )
 {
-proxyRecord->iPortNumber = 0;
 proxyRecord->iUseProxyServer = EFalse;
 }
 else
 {
 proxyRecord->iUseProxyServer = ETrue;
 aClientPluginInstance->iLocationEnabled = iLocationEnabled;
 if ( iIapRecord )
 {
 CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iIapRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
+CleanupStack::PushL( iapRecord );
+CopyRecordFieldsL( *iIapRecord, *iapRecord );
 iapRecord->SetElementId( iIapRecord->ElementId() );
-CleanupStack::PushL( iapRecord );
 aClientPluginInstance->iGenRecordArray.AppendL(
 static_cast<CommsDat::CCDRecordBase*>( iapRecord ) );
 CleanupStack::Pop( iapRecord );
 }
 else
 }
 if ( iNetworkRecord )
 {
 CCDNetworkRecord* networkRecord = static_cast<CCDNetworkRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iNetworkRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdNetworkRecord ) );
+CleanupStack::PushL( networkRecord );
+CopyRecordFieldsL( *iNetworkRecord, *networkRecord );
 networkRecord->SetElementId( iNetworkRecord->ElementId() );
-CleanupStack::PushL( networkRecord );
 aClientPluginInstance->iGenRecordArray.AppendL(
 static_cast<CommsDat::CCDRecordBase*>( networkRecord ) );
 CleanupStack::Pop( networkRecord );
 }
 else
 }
 if ( iWapAPRecord )
 {
 CCDWAPAccessPointRecord* wapAPRecord = static_cast<CCDWAPAccessPointRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iWapAPRecord ) );
+CCDRecordBase::CreateCopyRecordL( *iWapAPRecord ) );//TODO, convert to generic copy
 wapAPRecord->SetElementId( iWapAPRecord->ElementId() );
 CleanupStack::PushL( wapAPRecord );
 aClientPluginInstance->iGenRecordArray.AppendL(
 static_cast<CommsDat::CCDRecordBase*>( wapAPRecord ) );
 CleanupStack::Pop( wapAPRecord );
 }
 if ( iWapIPBearerRecord )
 {
 CCDWAPIPBearerRecord* wapIPBearerRecord = static_cast<CCDWAPIPBearerRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iWapIPBearerRecord ) );
+CCDRecordBase::CreateCopyRecordL( *iWapIPBearerRecord ) );//TODO, convert to generic copy
 wapIPBearerRecord->SetElementId( iWapIPBearerRecord->ElementId() );
 CleanupStack::PushL( wapIPBearerRecord );
 aClientPluginInstance->iGenRecordArray.AppendL(
 static_cast<CommsDat::CCDRecordBase*>( wapIPBearerRecord ) );
 CleanupStack::Pop( wapIPBearerRecord );
 aClientPluginInstance->iGenRecordArray.AppendL( NULL );
 if ( iProxyRecord )
 {
 CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iProxyRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
+CleanupStack::PushL( proxyRecord );
+CopyRecordFieldsL( *iProxyRecord, *proxyRecord );
 proxyRecord->SetElementId( iProxyRecord->ElementId() );
-CleanupStack::PushL( proxyRecord );
 aClientPluginInstance->iGenRecordArray.AppendL(
 static_cast<CommsDat::CCDRecordBase*>( proxyRecord ) );
 CleanupStack::Pop( proxyRecord );
 }
 else
 switch ( aAttribute )
 {
 case ECmIapId: // If the CM has an ECmIapId then the ECmIapId is the ECmId.
 case ECmId:
 {
-retVal = static_cast<CCDIAPRecord*>(
+if ( iBearerType == KUidEmbeddedDestination )
-aClientPluginInstance->iGenRecordArray[KIapRecordIndex] )->RecordId();
+{
+retVal = GetBearerIntAttributeL(
+aAttribute,
+aClientPluginInstance->iGenRecordArray,
+aClientPluginInstance->iBearerSpecRecordArray );
+}
+else
+{
+retVal = static_cast<CCDIAPRecord*>(
+aClientPluginInstance->iGenRecordArray[KIapRecordIndex] )->RecordId();
+}
 }
 break;
 case ECmWapId:
 {
 retVal = static_cast<CCDWAPIPBearerRecord*>(
-aClientPluginInstance->iGenRecordArray[KWAPBearerRecordIndex] )->iWAPAccessPointId;
+aClientPluginInstance->iGenRecordArray[KWAPBearerRecordIndex] )
+->iWAPAccessPointId;
 }
 break;
 case ECmIapServiceId:
 {
 retVal = static_cast<CCDIAPRecord*>(
 case ECmSeamlessnessLevel:
 {
 if ( iMetaDataRecord )
 {
 retVal = static_cast<CCDIAPMetadataRecord*>(
-aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] )->iSeamlessness;
+aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] )
+->iSeamlessness;
 }
 else
 {
 User::Leave( KErrNotFound );
 }
 }
 break;
 case ECmLoadResult:
 {
-retVal = KErrNone;
+// This attribute has been deprecated since Symbian^4.
+User::Leave( KErrNotSupported ); //TODO, update attribute definition comments.
 }
 break;
 case ECmNetworkId:
 {
 switch ( aAttribute )
 {
 case ECmProtected:
 {
-retVal = IsProtected();
+if ( iBearerType == KUidEmbeddedDestination )
+{
+retVal = GetBearerBoolAttributeL(
+aAttribute,
+aClientPluginInstance->iGenRecordArray,
+aClientPluginInstance->iBearerSpecRecordArray );
+}
+else
+{
+retVal = IsProtected();
+}
 }
 break;
 case ECmHidden:
 {
-CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*>(
+if ( iBearerType == KUidEmbeddedDestination )
-aClientPluginInstance->iGenRecordArray[KIapRecordIndex] );
+{
-retVal = iapRecord->Attributes() & ECDHidden;
+retVal = GetBearerBoolAttributeL(
+aAttribute,
+aClientPluginInstance->iGenRecordArray,
+aClientPluginInstance->iBearerSpecRecordArray );
+}
+else
+{
+CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*>(
+aClientPluginInstance->iGenRecordArray[KIapRecordIndex] );
+retVal = iapRecord->Attributes() & ECDHidden;
+}
 }
 break;
 case ECmProxyUsageEnabled:
 {
 if ( !aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )
 {
 retVal = EFalse;
 }
+else
-retVal = static_cast<CCDProxiesRecord*>(
+{
-aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )->iUseProxyServer;
+retVal = static_cast<CCDProxiesRecord*>(
+aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )
+->iUseProxyServer;
+}
 }
 break;
 case ECmDestination:
+{
+TRAPD( err, retVal = GetBearerBoolAttributeL(
+aAttribute,
+aClientPluginInstance->iGenRecordArray,
+aClientPluginInstance->iBearerSpecRecordArray ) );
+if ( err )
+{
+retVal = EFalse;
+}
+}
+break;
+case ECmChargeCardUsageEnabled:
+{
+retVal = EFalse;
+}
+break;
+case ECmLocationUsageEnabled:
+{
+retVal = iLocationEnabled;
+}
+break;
+case ECmCoverage:
+// By default the plugin has no network coverage.
 {
 TRAPD( err, retVal = GetBearerBoolAttributeL(
 aAttribute,
 aClientPluginInstance->iGenRecordArray,
 aClientPluginInstance->iBearerSpecRecordArray ) );
 User::Leave( err );
 }
 }
 }
 break;
-case ECmChargeCardUsageEnabled:
-{
-retVal = EFalse;
-}
-break;
-case ECmLocationUsageEnabled:
-{
-retVal = iLocationEnabled;
-}
-break;
-case ECmCoverage:
-// By default the plugin has no network coverage.
-{
-TRAPD( err, retVal = GetBearerBoolAttributeL(
-aAttribute,
-aClientPluginInstance->iGenRecordArray,
-aClientPluginInstance->iBearerSpecRecordArray ) );
-if ( err )
-{
-if ( err == KErrNotFound )
-{
-retVal = EFalse;
-}
-else
-{
-User::Leave( err );
-}
-}
-}
-break;
 case ECmMetaHighlight:
 {
 CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
 aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
 retVal = metadataRecord->iMetadata & EMetaHighlight;
 CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
 aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
 retVal = metadataRecord->iMetadata & EMetaHiddenAgent;
 }
 break;
+case ECmMetaHotSpot:
+{
+CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
+aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
+retVal = metadataRecord->iMetadata & EMetaHotSpot;
+}
+break;
 case ECmVirtual:
 {
-retVal = EFalse;
+// This is bearer specific attribute.
+TRAPD( err, retVal = GetBearerInfoBoolL( aAttribute ) );
+if ( err )
+{
+retVal = EFalse;
+}
 }
 break;
 case ECmWapIPSecurity:
 {
 retVal = static_cast<CCDWAPIPBearerRecord*>(
 switch ( aAttribute )
 {
 case ECmBearerIcon:
 {
-//TODO, read icon name from metadata record after commsdat changes implemented.
+CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
-//CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
+aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
-//        aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
+if ( !metadataRecord )
-//if ( !metadataRecord )
+{
-//    {
+User::Leave( KErrCorrupt );
-//    User::Leave( KErrCorrupt );
+}
-//    }
+retVal = TPtrC( metadataRecord->iIconFileName ).AllocL();
-//retVal = TPtrC( metadataRecord->iIconFileName ).AllocL();
-retVal = KNullDesC().AllocL();//TODO, check this freed
 }
 break;
 case ECmStartPage:
 {
 CCDWAPAccessPointRecord* wapAPRecord = static_cast<CCDWAPAccessPointRecord*>(
 case ECmProxyPortNumber:
 {
 if ( !aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )
 {
 CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iProxyRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
 CleanupStack::PushL( proxyRecord );
+CopyRecordFieldsL( *iProxyRecord, *proxyRecord );
 proxyRecord->SetElementId( iProxyRecord->ElementId() );
-aClientPluginInstance->iGenRecordArray.AppendL(
+aClientPluginInstance->iGenRecordArray.InsertL(
-static_cast<CommsDat::CCDRecordBase*>( proxyRecord ) );
+static_cast<CommsDat::CCDRecordBase*>( proxyRecord ),
+KProxyRecordIndex );
 CleanupStack::Pop( proxyRecord );
 }
 static_cast<CCDProxiesRecord*>(
 aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )->
 case ECmProxyUsageEnabled:
 {
 if ( !aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )
 {
 CCDProxiesRecord* proxyRecord = static_cast<CCDProxiesRecord*>(
-CCDRecordBase::CreateCopyRecordL( *iProxyRecord ) );
+CCDRecordBase::RecordFactoryL( KCDTIdProxiesRecord ) );
 CleanupStack::PushL( proxyRecord );
+CopyRecordFieldsL( *iProxyRecord, *proxyRecord );
 proxyRecord->SetElementId( iProxyRecord->ElementId() );
-aClientPluginInstance->iGenRecordArray.AppendL(
+aClientPluginInstance->iGenRecordArray.InsertL(
-static_cast<CommsDat::CCDRecordBase*>( proxyRecord ) );
+static_cast<CommsDat::CCDRecordBase*>( proxyRecord ),
+KProxyRecordIndex );
 CleanupStack::Pop( proxyRecord );
 }
 static_cast<CCDProxiesRecord*>(
 aClientPluginInstance->iGenRecordArray[KProxyRecordIndex] )->iUseProxyServer =
 metadataRecord->iMetadata = EMetaHiddenAgent | metadataRecord->iMetadata;
 }
 else
 {
 metadataRecord->iMetadata = ~EMetaHiddenAgent & metadataRecord->iMetadata;
+}
+}
+break;
+case ECmMetaHotSpot:
+{
+CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
+aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
+if ( aValue )
+{
+metadataRecord->iMetadata = EMetaHotSpot | metadataRecord->iMetadata;
+}
+else
+{
+metadataRecord->iMetadata = ~EMetaHotSpot & metadataRecord->iMetadata;
 }
 }
 break;
 case ECmWapIPSecurity:
 {
 switch ( aAttribute )
 {
 case ECmBearerIcon:
 {
-//TODO, write icon name to metadata record after commsdat changes implemented.
+CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
-//CCDIAPMetadataRecord* metadataRecord = static_cast<CCDIAPMetadataRecord*>(
+aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
-//        aClientPluginInstance->iGenRecordArray[KMetaDataRecordIndex] );
+if ( !metadataRecord )
-//if ( !metadataRecord )
+{
-//    {
+User::Leave( KErrCorrupt );
-//    User::Leave( KErrCorrupt );
+}
-//    }
+metadataRecord->iIconFileName.SetL( aValue );
-//metadataRecord->iIconFileName.SetL( aValue );
 }
 break;
 case ECmStartPage:
 {
 CCDWAPAccessPointRecord* wapAPRecord = static_cast<CCDWAPAccessPointRecord*>(

changeset 46	95d45f234cf3
parent 27	489cf6208544
child 53	4af712113915