FCL/sf/mw/ipconnmgmt: comparison bearermanagement/mpm/src/mpmcommsdataccess.cpp

equal deleted inserted replaced

-:0c32cf868819
+:70ee5458c95d
 dnRecord->LoadL( *db );
 TUint snapId = dnRecord->iSNAP;
 MPMLOGSTRING2( "CMPMCommsDatAccess::FindAllSnapsL snap %d", snapId )
-// Insert unique ids to array
+// Insert unique IDs to array.
-//
+TInt err = aSnapIds.InsertInOrder( snapId );
-aSnapIds.InsertInOrder( snapId );
+if ( err && err != KErrAlreadyExists )
+{
+User::Leave( err );
+}
 delete dnRecord;
 }
 CleanupStack::PopAndDestroy( dnIAPRecordSet );
 CleanupStack::PopAndDestroy( generic );
 // Store Iap Id, Net Id and empty APN to TConnInfo,
 // so that FindAPN can utilise the information
 // during the validation of next IAP to support
 // using existing WLAN connection SSID.
 //
-aSession.MyServer().Events()->AppendConnInfo( aConnId );
+aSession.MyServer().Events()->AppendConnInfoL( aConnId );
 aSession.MyServer().Events()->SetConnInfo( aConnId,
 aIapId,
 presumedIapId,
 aNetId,
 ssid );
 // Store Iap Id, Net Id and APN to TConnInfo,
 // so that FindAPN can utilise the information
 // during the validation of next IAP to support
 // using existing PDP context per APN.
 //
-aSession.MyServer().Events()->AppendConnInfo( aConnId );
+aSession.MyServer().Events()->AppendConnInfoL( aConnId );
 aSession.MyServer().Events()->SetConnInfo( aConnId,
 aIapId,
 presumedIapId,
 aNetId,
 ptr2 );
 // Don't print duplicates
 //
 if ( found && KErrNotFound == prevRecordIds.Find( linkedAP->RecordId() ) )
 {
-prevRecordIds.Append( linkedAP->RecordId() );
+prevRecordIds.AppendL( linkedAP->RecordId() );
 // Print the DN and host name pointed by DN-IAP entry.
 // HostName is EText field.
 //
 TBuf<KCommsDatTextBufferLength> dn = linkedAP->iRecordName.GetL();
 MPMLOGSTRING3( "Snap: %d Snap Name = %s", (TInt)linkedAP->iRecordTag, dn.PtrZ() )
 linkedAP->iRecordTag = (TInt)dnIAPRecord->iSNAP;
 TBool found = linkedAP->FindL( *db );
 if ( found && KErrNotFound == prevRecordIds.Find( linkedAP->RecordId() ) )
 {
-prevRecordIds.Append( linkedAP->RecordId() );
+prevRecordIds.AppendL( linkedAP->RecordId() );
 // Print the DN and host name pointed by DN-IAP entry.
 // HostName is EText field.
 //
 TBuf<KMaxTextLength + 1> dn = linkedAP->iRecordName.GetL();
 MPMLOGSTRING3( "    Snap: %d Snap Name = %s", (TInt)linkedAP->iRecordTag, dn.PtrZ() )
 //
 if( aIapPath.Find( aVirtualIapId ) == KErrNotFound )
 {
 // append this Iap to path
 //
-aIapPath.Append( aVirtualIapId );
+aIapPath.AppendL( aVirtualIapId );
 }
 else
 {
 MPMLOGSTRING( "CMPMCommsDatAccess::WlanUnderVirtualL: Error, loop\
 detected in configuration. Iap handling not continued" )
 // to belong to the deleted IAP.
 //
 if ( elem.iRanking > 0 )
 {
 // Insert elem into RArray
-//
+aDestNetIds.InsertInOrderAllowRepeatsL( elem, TNetIap::CompareRanking );
-aDestNetIds.InsertInOrderAllowRepeats(elem, TNetIap::CompareRanking);
 }
 else
 {
 if ( elem.iIapId != 0 )
 {
 // drop this virtual iap out from the list of
 // available iaps to prevent from infinitely looping
 //
 if ( aAvailableIAPList[i] != aVirtualIapId )
 {
-tempList.Append( aAvailableIAPList[i] );
+tempList.AppendL( aAvailableIAPList[i] );
 }
 }
 aSession.IapSelectionL()->ChooseBestIAPL( tempMpmConnPref, tempList );
 CleanupStack::PopAndDestroy( &tempList );
 // -----------------------------------------------------------------------------
 // CMPMCommsDatAccess::GetBearerTypeL
 // -----------------------------------------------------------------------------
 //
-TMPMBearerType CMPMCommsDatAccess::GetBearerTypeL( TUint32 aIapId )
+TMPMBearerType CMPMCommsDatAccess::GetBearerTypeL( const TUint32 aIapId )
 {
 MPMLOGSTRING( "CMPMCommsDatAccess::GetBearerTypeL" )
 TMPMBearerType bearerType = EMPMBearerTypeOther;
-RArray<TUint32> wlanArray;
 CMDBSession* db = CMDBSession::NewLC( KCDVersion1_1 );
-CleanupClosePushL( wlanArray );
-BuildWlanArrayL(*db, wlanArray);
 CCDIAPRecord* record = LoadIapRecordLC( aIapId, db );
-TBuf<KMaxTextLength> bearerTypeName( record->iBearerType.GetL() );
 TBuf<KMaxTextLength> serviceTypeName( record->iServiceType.GetL() );
 if ( ( serviceTypeName == TPtrC( KCDTypeNameOutgoingWCDMA ) ) ||
 ( serviceTypeName == TPtrC( KCDTypeNameIncomingWCDMA ) ) )
 {
 // Packet data
 bearerType = EMPMBearerTypePacketData;
 }
-else if ( serviceTypeName == TPtrC( KCDTypeNameLANService ) )
+else
 {
-// LAN or WLAN
+TBuf<KMaxTextLength> bearerTypeName( record->iBearerType.GetL() );
-TUint32 bearerId( record->iBearer );
+if ( serviceTypeName == TPtrC( KCDTypeNameLANService ) )
+{
-if ( ( bearerTypeName == TPtrC( KCDTypeNameLANBearer ) ) &&
+// LAN or WLAN
-( IsWlanBearer( wlanArray, record->iBearer ) ) )
+RArray<TUint32> wlanArray;
-{
+CleanupClosePushL( wlanArray );
-// WLAN
+BuildWlanArrayL( *db, wlanArray );
-bearerType = EMPMBearerTypeWlan;
+if ( ( bearerTypeName == TPtrC( KCDTypeNameLANBearer ) ) &&
+( IsWlanBearer( wlanArray, record->iBearer ) ) )
+{
+// WLAN
+bearerType = EMPMBearerTypeWlan;
+}
+CleanupStack::PopAndDestroy( &wlanArray );
 }
-}
+else if ( ( bearerTypeName == TPtrC( KCDTypeNameVirtualBearer ) ) &&
-else if ( ( bearerTypeName == TPtrC( KCDTypeNameVirtualBearer ) ) &&
+( serviceTypeName == TPtrC ( KCDTypeNameVPNService ) ) )
-( serviceTypeName == TPtrC ( KCDTypeNameVPNService ) ) )
+{
-{
+// VPN
-// VPN
+bearerType = EMPMBearerTypeVpn;
-bearerType = EMPMBearerTypeVpn;
+}
 }
 CleanupStack::PopAndDestroy( record );
-CleanupStack::PopAndDestroy( &wlanArray );
 CleanupStack::PopAndDestroy( db );
 return bearerType;
 }
 // -----------------------------------------------------------------------------
 // CMPMCommsDatAccess::IsWlanBearerL

changeset 73	70ee5458c95d
parent 61	8b0c979bbe8c