FCL/sf/mw/remotemgmt: comparison omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp

equal deleted inserted replaced

-:5d0ec111abfc
+:0deca9b72b62
 #include <cmpluginwlandef.h>
 #include <cmmanagerext.h>
 #include <cmconnectionmethodext.h>
 #include <commdb.h>
 #include <WlanCdbCols.h>
+#include <EapExpandedType.h>
 #include <centralrepository.h>
 #include <pdpcontextmanagerinternalcrkeys.h>
+#include <EapGeneralSettings.h>
+#include <EapTypeDefinitions.h>
 const TUint KIapColumn        = 0x00000100;
 const TUint KLingerColumn     = 0x00000200;
 const TUint KColumnMask       = 0xFFFFFF00;
 const TUint KRowMask          = 0x000000FF;
 			    {
 			    if(aCharacteristic.Name().Compare( KEAP ) == 0)
 			        {
 CEapTypeElement* newEap = new (ELeave) CEapTypeElement;
 newEap->iEAPSettings = new (ELeave) EAPSettings;
-	    newEap->iCertificate = new (ELeave) CertificateEntry;
+	    newEap->iCertificate = new (ELeave) EapCertificateEntry;
 iEapTypeArray.AppendL(newEap);
 			        }
 			    else if(aCharacteristic.Name().Compare( SECSSID ) == 0)
 			        {
 SECssID* newsecSSID = new (ELeave) SECssID;
 if( ( aParameter.Name().Compare( EAPTYPE ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPTYPE" ) );
-ConvertEAPStringToIds( value, eap->iEapTypeString, reinterpret_cast<TUint &> ( eap->iEAPSettings->iEAPType )  );
+ConvertEAPStringToIds( value, eap->iEapTypeString, eap->iEAPSettings->iEAPExpandedType );
 }
 else if( ( aParameter.Name().Compare( EAPUSERNAME ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPUSERNAME" ) );
 if ( eap->iEAPSettings->iUsername.Length() == 0 )
 {
 eap->iEAPSettings->iUsername = value;
 eap->iEAPSettings->iUsernamePresent = ETrue;
+eap->iEAPSettings->iUseAutomaticUsernamePresent = ETrue;
+eap->iEAPSettings->iUseAutomaticUsername = EFalse;
 }
 }// else if
 else if( ( aParameter.Name().Compare( EAPPASSWORD ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPPASSWORD" ) );
 if ( eap->iEAPSettings->iPassword.Length() == 0 )
 {
 eap->iEAPSettings->iPassword = value;
 eap->iEAPSettings->iPasswordPresent = ETrue;
+eap->iEAPSettings-> iShowPassWordPromptPresent = ETrue;
+eap->iEAPSettings-> iShowPassWordPrompt = EFalse;
 }
 }// else if
 else if( ( aParameter.Name().Compare( EAPREALM ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPREALM" ) );
 if ( eap->iEAPSettings->iRealm.Length() == 0 )
 {
 eap->iEAPSettings->iRealm = value;
 eap->iEAPSettings->iRealmPresent = ETrue;
+eap->iEAPSettings->iUseAutomaticRealmPresent = ETrue;
+eap->iEAPSettings->iUseAutomaticRealm = EFalse;
 }
 }// else if
 else if( ( aParameter.Name().Compare( EAPUSEPSEUD ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPUSEPSEUD" ) );
 }// else if
 else if( ( aParameter.Name().Compare( EAPENCAPS ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPENCAPS" ) );
-TUint dummy;
+TEapExpandedType dummy;
 ConvertEAPStringToIds( value, eap->iEncapsulatingExpandedEapId, dummy );
 }// else if
 else if( ( aParameter.Name().Compare( EAPVERSERREALM ) ) == 0 )
 {
 else if( ( aParameter.Name().Compare( EAPISSNAME ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPISSNAME" ) );
-eap->iCertificate->iSubjectName = value;
+eap->iCertificate->SetSubjectName(value);
-eap->iCertificate->iSubjectNamePresent = ETrue;
+eap->iCertificate->SetSubjectNamePresent();
 }// else if
 else if( ( aParameter.Name().Compare( EAPSUBNAME ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSUBNAME" ) );
-eap->iCertificate->iIssuerName = value;
+eap->iCertificate->SetIssuerName(value);
-eap->iCertificate->iIssuerNamePresent = ETrue;
+eap->iCertificate->SetIssuerNamePresent();
 }// else if
 else if( ( aParameter.Name().Compare( EAPCERTTYPE ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPCERTTYPE" ) );
 if ( value == EAPCERTCA )
 			{
 			FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EEapSim" ) );
-eap->iCertificate->iCertType = CertificateEntry::ECA;
+eap->iCertificate->SetCertType(EapCertificateEntry::ECA);
+eap->iEAPSettings-> iUseAutomaticCACertificatePresent = ETrue;
+eap->iEAPSettings-> iUseAutomaticCACertificate = EFalse;
 			}
 		else
 		    {
-		    eap->iCertificate->iCertType = CertificateEntry::EUser;
+		    eap->iCertificate->SetCertType(EapCertificateEntry::EUser);
 		    }
 		// Certificates must be present since this field was added
 		eap->iEAPSettings->iCertificatesPresent = ETrue;
+		eap->iCertificate->SetIsEnabledPresent();
+		eap->iCertificate->SetIsEnabled(ETrue) ;
 }// else if
 else if( ( aParameter.Name().Compare( EAPSERNUM ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSERNUM" ) );
-eap->iCertificate->iSerialNumber = value;
+eap->iCertificate->SetSerialNumber(value);
-eap->iCertificate->iSerialNumberPresent = ETrue;
+eap->iCertificate->SetSerialNumberPresent();
 }// else if
 else if( ( aParameter.Name().Compare( EAPSUBKEYID ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSUBKEYID" ) );
 		else
 			{
 			break;
 			}
 		}
+	TBuf8<KMaxSubKeyLenght> keyIdentifier;
+	keyIdentifier.Copy(key);
 	// store key value only if no errors occurred
 	if (err == KErrNone)
 		{
-		eap->iCertificate->iSubjectKeyID.Copy(key);
+		eap->iCertificate->SetSubjectKeyId(keyIdentifier);
-		eap->iCertificate->iSubjectKeyIDPresent = ETrue;
+		eap->iCertificate->SetSubjectKeyIdPresent();
 		eap->iEAPSettings->iCertificatesPresent = ETrue;
 		}
 	}
 else if( ( aParameter.Name().Compare( EAPTHUMBPRINT ) ) == 0 )
 {
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPTHUMBPRINT" ) );
-eap->iCertificate->iThumbprintPresent = ETrue;
+eap->iCertificate->SetThumbprintPresent();
-eap->iCertificate->iThumbprint = value;
+eap->iCertificate->SetThumbprint(value);
 }// else if
 }
 // -----------------------------------------------------------------------------
 CEapTypeElement* eap = iEapTypeArray[i];
 if ( eap->iEAPSettings->iCertificatesPresent )
 	{
 	FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL Certificate was present." ) );
-	eap->iEAPSettings->iCertificates.AppendL( *eap->iCertificate );
+	eap->iEAPSettings->iCertificates.Append( eap->iCertificate );
 	}
 // Save EAP list
 if ( eap->iEapTypeString.Length() > 0
 	 && eap->iEncapsulatingExpandedEapId.Length() == 0) // AND method is not encapsulated
 {
 eapList[index-offset] = KEapPlus;
 }
 }
+// Set iEncapsulatingEapTypes
-			// Set iEncapsulatingEapTypes
+for ( TInt j = 0; j < iEapTypeArray.Count(); j++ )
-			for ( TInt j = 0; j < iEapTypeArray.Count(); j++ )
+{
-				{
+// Check if any method has this method as the encapsulating method
-				// Check if any method has this method as the encapsulating method
+if ( eap->iEapTypeString == iEapTypeArray[j]->iEncapsulatingExpandedEapId )
-				if ( eap->iEapTypeString == iEapTypeArray[j]->iEncapsulatingExpandedEapId )
+{
-					{
+// Append this method to iEncapsulatedEAPType
-					// Append this method to iEncapsulatedEAPType
+eap->iEAPSettings->iEnabledEncapsulatedEAPExpandedTypes.Append( iEapTypeArray[j]->iEAPSettings->iEAPExpandedType );
-					eap->iEAPSettings->iEncapsulatedEAPTypes.Append( iEapTypeArray[j]->iEAPSettings->iEAPType );
+eap->iEAPSettings->iEnabledEncapsulatedEAPExpandedTypesPresent = ETrue;
-					eap->iEAPSettings->iEncapsulatedEAPTypesPresent = ETrue;
+}
-					}
+}
-				}
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings CEapType::NewL" ) );
 CEapType* eapType = NULL;
-TRAPD( error, ( eapType = CEapType::NewL( eap->iEapTypeString, ELan, serviceId ) ) );
+TRAPD( error, ( eapType = CEapType::NewL( ELan, serviceId, eap->iEAPSettings->iEAPExpandedType ) ) );
 if ( ( error == KErrNone ) && eapType )
 {
 CleanupStack::PushL( eapType );
 // Check if this type is tunneled
 if ( eap->iEncapsulatingExpandedEapId.Length() > 0 )
 	{
-	// It is tunneled. Take the last byte of the expanded id.
+	// It is tunneled.
-	eapType->SetTunnelingType( eap->iEncapsulatingExpandedEapId[KExpandedEapIdLength - 1] );
+	eapType->SetTunnelingType( eap->iEncapsulatingExpandedEapId);
 	}
 FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings SetConfigurationL" ) );
 TRAP_IGNORE( eapType->SetConfigurationL( *eap->iEAPSettings ) );
 		    {
 		    ch = lex.Get();
 		    if ( ch == '+' ) ++numPlus;
 		    else if ( ch == '-' ) ++numMinus;
 		    }
+		// load general EAP settings If
-		// each entry consumes 8 bytes in binary format
+		CEapGeneralSettings* genSettings;
-		HBufC8* enabledEAPPlugin = HBufC8::NewL( 8 * numPlus );
+		genSettings = CEapGeneralSettings::NewL(ELan, serviceId);
-		CleanupStack::PushL( enabledEAPPlugin );
+		CleanupStack::PushL( genSettings );
+		// get lists of enabled/disabled EAPs for the IAP
-		HBufC8* disabledEAPPlugin = HBufC8::NewL( 8 * numMinus );
+		RArray<TEapExpandedType> enabledEapMethods;
-		CleanupStack::PushL( disabledEAPPlugin );
+		RArray<TEapExpandedType> disabledEapMethods;
+		enabledEapMethods.Reset();
+		disabledEapMethods.Reset();
 		lex.Assign( eapList );
 		while ( !lex.Eos() )
 		    {
 		    // beginning of implementation UID
 		    TInt16 implUid = 0;
 		    if ( lex.Val( implUid ) != KErrNone || !implUid )
 		        {
-		        // if the old string is corrupted, null out both lists
-		        enabledEAPPlugin->Des().Zero();
-		        disabledEAPPlugin->Des().Zero();
 		        break;
 		        }
 		    // append it to the appropriate list ('+' enabled, '-' disabled)
 		    _LIT8( KPadding, "\xFE\0\0\0\0\0\0" );
 		    _LIT8( KMsChapV2Padding, "\xFE\xFF\xFF\xFF\0\0\0");
 		    const TInt KPlainMsChapV2ImplUid = 99;
 		    if ( implUid > 0 )
 		        {
-		        enabledEAPPlugin->Des().Append(
+		        TBuf8<KExpandedEapIdLength> tempbuf;
-		                            Abs( implUid ) == KPlainMsChapV2ImplUid?
+		        if(Abs( implUid ) == KPlainMsChapV2ImplUid)
-		                                        KMsChapV2Padding: KPadding );
+		            {
-		        enabledEAPPlugin->Des().Append( Abs( implUid ) );
+		            tempbuf.Append(KMsChapV2Padding);
+		            }
+		        else
+		            {
+		            tempbuf.Append(KPadding);
+		            }
+		        tempbuf.Append(Abs( implUid ));
+		        TEapExpandedType expandedTypebuf(tempbuf);
+		        enabledEapMethods.Append(expandedTypebuf);
 		        }
-		    else if (implUid < 0 )
-		        {
-		        disabledEAPPlugin->Des().Append(
-		                            Abs( implUid ) == KPlainMsChapV2ImplUid?
-		                                        KMsChapV2Padding: KPadding );
-		        disabledEAPPlugin->Des().Append( Abs( implUid ) );
-		        }
 		    // swallow the delimiter (',')
 		    lex.Get();
 		    }
+		genSettings->SetEapMethods(enabledEapMethods, disabledEapMethods);
-	  		wLanServiceTable->WriteTextL( TPtrC( WLAN_ENABLED_EAPS ),
+		CleanupStack::PopAndDestroy( genSettings );
-		                              enabledEAPPlugin?
-		                                    (const TDesC8&)*enabledEAPPlugin:
-		                                    (const TDesC8&)KNullDesC8 );
-		wLanServiceTable->WriteTextL( TPtrC( WLAN_DISABLED_EAPS ),
-		                              disabledEAPPlugin?
-		                                    (const TDesC8&)*disabledEAPPlugin:
-		                                    (const TDesC8&)KNullDesC8 );
-		CleanupStack::PopAndDestroy( disabledEAPPlugin );
-		CleanupStack::PopAndDestroy( enabledEAPPlugin );
 iEapTypeArray.ResetAndDestroy();
 wLanServiceTable->PutRecordChanges();
 User::LeaveIfError( err );
 }
-void CWPAPNapdef::ConvertEAPStringToIds( const TDesC& aEAPString, TDes8& aExpandedId, TUint& aId)
+void CWPAPNapdef::ConvertEAPStringToIds( const TDesC& aEAPString, TDes8& aExpandedId, TEapExpandedType& aID)
 	{
 if ( aEAPString == KEAPSIM )
 		{
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapSim" ) );
 		aExpandedId.Copy( KEapSimTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapSim;
+		aID = *EapExpandedTypeSim.GetType();
 		}
 else if( aEAPString == KEAPAKA )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapAka" ) );
 		aExpandedId.Copy( KEapAkaTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapAka;
+		aID = *EapExpandedTypeAka.GetType();
 }
 else if( aEAPString == KEAPTLS )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapTls" ) );
 		aExpandedId.Copy( KEapTlsTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapTls;
+		aID = *EapExpandedTypeTls.GetType();
 }
 else if( aEAPString == KEAPPEAP )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapPeap" ) );
 		aExpandedId.Copy( KEapPeapTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapPeap;
+		aID = *EapExpandedTypePeap.GetType();
 }
 else if( aEAPString == KEAPTTLS )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapTtls" ) );
 		aExpandedId.Copy( KEapTtlsTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapTtls;
+		aID = *EapExpandedTypeTtls.GetType();
 }
 else if( aEAPString == KEAPLEAP )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapLeap" ) );
 		aExpandedId.Copy( KEapLeapTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapLeap;
+		aID = *EapExpandedTypeLeap.GetType();
 }
 else if( aEAPString == KEAPMSCHAPV2 )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapMschapv2" ) );
 		aExpandedId.Copy( KEapMschapv2TypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapMschapv2;
+		aID = *EapExpandedTypeMsChapv2.GetType();
 }
 else if( aEAPString == KEAPGTC )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapGtc" ) );
 		aExpandedId.Copy( KEapGtcTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapGtc;
+		aID = *EapExpandedTypeGtc.GetType();
 }
 else if( aEAPString == KEAPFAST )
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapFast" ) );
 		aExpandedId.Copy( KEapFastTypeId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapFast;
+		aID = *EapExpandedTypeFast.GetType();
 }
 else
 {
 		FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapNone" ) );
 		aExpandedId.Copy( KEapNoneId, KExpandedEapIdLength );
-		aId = EAPSettings::EEapNone;
+		aID = *EapExpandedTypeNone.GetType();
 }
 	}
 // ---------------------------------------------------------------------------

changeset 35	0deca9b72b62
parent 2	5594fba90824