FCL/sf/mw/ipconnmgmt: comparison dbcreator/commsdatcreator/Src/cdcreaderxml.cpp

equal deleted inserted replaced

-:f10336de0cd6
+:faa5ef4f80da
 //---------------
 //WPA security
 //---------------
 //WPAPresharedKey         string    WPA/WPA2 pre-shared key in plain text.
 //WPAKeyLength            integer   The length of the WPA/WPA2 pre-shared key.
-//WPAListOfEAPs           string    A list of EAPs in use
+//WPAEapMethod            string    A EAP method in use
 //WPAUseOfPresharedKey    string    WPA/WPA2 pre-shared key usage.
 //=============
 //VPN specific:
 //=============
 //KVpnIapName             string    IAP name used for the connection
 _LIT16( KWEPKey4Data,               "WEPKey4Data" );
 //WPA security
 _LIT16( KWPAPresharedKey,           "WPAPresharedKey" );
 _LIT16( KWPAKeyLength,              "WPAKeyLength" );
-_LIT16( KWPAListOfEAPs,             "WPAListOfEAPs" );
+_LIT16( KWPAEapMethod,              "WPAEapMethod");
 _LIT16( KWPAUseOfPresharedKey,      "WPAUseOfPresharedKey" );
 //EAP security
 _LIT16( KEapGtcUsername,            "EapGtcUsername" );
 _LIT16( KEapGtcSessionValidityTime, "EapGtcSessionValidityTime" );
 _LIT16( KUIPriorityCdma2k,          "UIPriorityCdma2k" );
 _LIT16( KUIPriorityDialOut,         "UIPriorityDialOut" );
 _LIT16( KUIPriorityDialIn,          "UIPriorityDialIn" );
 _LIT16( KUIPriorityVpn,             "UIPriorityVpn" );
 _LIT16( KUIPriorityMip,             "UIPriorityMip" );
-_LIT16( KDefaultConnectionType,     "DefaultConnectionType" );
-_LIT16( KDefaultConnectionName,     "DefaultConnectionName" );
 _LIT16( KUsageOfWlan,               "UsageOfWlan" );
 _LIT16( KCellularDataUsageHome,     "CellularDataUsageHome" );
 _LIT16( KCellularDataUsageVisitor,  "CellularDataUsageVisitor" );
 _LIT16( KGprsLastSocketActivityTimeout, "GprsLastSocketActivityTimeout" );
 _LIT16( KGprsLastSessionClosedTimeout,  "GprsLastSessionClosedTimeout" );
 _LIT16( KWlanShortRetry,            "WlanShortRetry" );
 _LIT16( KWlanRTS,                   "WlanRTS" );
 _LIT16( KWlanTxPowerLevel,          "WlanTxPowerLevel" );
 _LIT16( KWlanRadioMeasurements,     "WlanRadioMeasurements" );
 _LIT16( KWlanPowerMode,             "WlanPowerMode" );
-//maximum number of PacketData AP parameters
-const TInt KMaxPacketDataParam = 28;
-const TInt KMaxLANParam = 26;
-const TInt KMaxWLANParam = 125;
-const TInt KMaxGlobalParam = 42;
-const TInt KMaxVPNParam = 12;
-const TInt KMaxDNParam = 19;
 // ================= MEMBER FUNCTIONS =======================
 // ---------------------------------------------------------
 {
 TDbCreatorFeatures feature( EFeatureNone );
 if ( iLine->FindF( KFeatureHeadPacketData ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeaturePacketData" );
 feature = EFeaturePacketData;
 }
 else if ( iLine->FindF( KFeatureHeadWLAN ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeatureWLAN" );
 feature = EFeatureWLAN;
 }
 else if ( iLine->FindF( KFeatureHeadLAN ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeatureLAN" );
 feature = EFeatureLAN;
 }
 else if ( iLine->FindF( KFeatureHeadVPN ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeatureVPN" );
 feature = EFeatureVPN;
 }
 else if ( iLine->FindF( KFeatureHeadDN ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeatureDN" );
 feature = EFeatureDN;
 }
 else if ( iLine->FindF( KFeatureHeadGlobal ) != KErrNotFound )
 {
+CLOG_WRITE( "CReaderXML::DetectFeatureHead(): EFeatureGlobal" );
 feature = EFeatureGlobal;
 iFoundGlobal = ETrue;
 }
 else
 {
 // CReaderXML::DetectParamL
 // ---------------------------------------------------------
 //
 TInt CReaderXML::DetectParam()
 {
-TInt maxParam( 0 );           //maximum nunber of params in array
 TInt fieldId( KErrNotFound ); //field id of detected parameter
 RArray<EInputParams> *params( NULL ); //pointer to the table used
 //for or detection
 switch ( CurrentFeature() )
 {
 case EFeaturePacketData:
-maxParam = KMaxPacketDataParam;
 params   = &iPDParams;
 break;
 case EFeatureWLAN:
-maxParam = KMaxWLANParam;
 params   = &iWLanParams;
 break;
 case EFeatureLAN:
-maxParam = KMaxLANParam;
 params   = &iLanParams;
 break;
 case EFeatureVPN:
-maxParam = KMaxVPNParam;
 params   = &iVpnParams;
 break;
 case EFeatureDN:
-maxParam = KMaxDNParam;
 params =   &iDNParams;
 break;
 case EFeatureGlobal:
-maxParam = KMaxGlobalParam;
 params   = &iGlobalParams;
 break;
 default:
 User::Panic( KPanicInvalidCase, KErrInvalidCase );
 }
 //looks for parameter match
 HBufC16* paramName = ReadParam( EParamName );
-TBool found ( EFalse );
 if ( paramName == NULL )
 {
 return fieldId;
 }
-for ( TInt idx = 0; idx < maxParam && !found; idx++ )
+TBool found ( EFalse );
+for ( TInt idx = 0; idx < params->Count() && !found; idx++ )
 {
 if ( paramName->CompareF( (*params)[idx].iParam ) == 0 )
 {
 fieldId = (*params)[idx].iId;
 found = ETrue;
 if( ret == NULL )
 {
 CLOG_WRITE_FORMAT( "! Warning: tag could not be allocated %S:",
 &tag );
 }
+// Debugging help; commented out for clearer log.
+//        else
+//            {
+//            if (aSegment == EParamValue)
+//                {
+//                CLOG_WRITE_FORMAT( "CReaderXML::ReadParam: value %S", &tag );
+//                }
+//            else if (aSegment == EParamName)
+//                {
+//                CLOG_WRITE_FORMAT( "CReaderXML::ReadParam: name %S", &tag );
+//                }
+//            }
 }
 return ret;
 }
 iWLanParams.Append( EInputParams( EWEPKey4Length,               KWEPKey4Length ) );
 iWLanParams.Append( EInputParams( EWEPKey4Format,               KWEPKey4Format ) );
 iWLanParams.Append( EInputParams( EWEPKey4Data,                 KWEPKey4Data ) );
 iWLanParams.Append( EInputParams( EWPAPresharedKey,             KWPAPresharedKey ) );
 iWLanParams.Append( EInputParams( EWPAKeyLength,                KWPAKeyLength ) );
-iWLanParams.Append( EInputParams( EWPAListOfEAPs,               KWPAListOfEAPs ) );
+iWLanParams.Append( EInputParams( EWPAEapMethod,                KWPAEapMethod ) );
 iWLanParams.Append( EInputParams( EWPAUseOfPresharedKey,        KWPAUseOfPresharedKey ) );
 iWLanParams.Append( EInputParams( EEapGtcUsername,              KEapGtcUsername ) );
 iWLanParams.Append( EInputParams( EEapGtcSessionValidityTime,   KEapGtcSessionValidityTime ) );
 iWLanParams.Append( EInputParams( EEapGtcEncapsulation,         KEapGtcEncapsulation ) );
 iWLanParams.Append( EInputParams( EEapTlsUsername,              KEapTlsUsername ) );
 iGlobalParams.Append( EInputParams( EUIPriorityCdma2k,      KUIPriorityCdma2k ) );
 iGlobalParams.Append( EInputParams( EUIPriorityDialOut,     KUIPriorityDialOut ) );
 iGlobalParams.Append( EInputParams( EUIPriorityDialIn,      KUIPriorityDialIn ) );
 iGlobalParams.Append( EInputParams( EUIPriorityVpn,         KUIPriorityVpn ) );
 iGlobalParams.Append( EInputParams( EUIPriorityMip,         KUIPriorityMip ) );
-iGlobalParams.Append( EInputParams( EDefaultConnectionType, KDefaultConnectionType ) );
-iGlobalParams.Append( EInputParams( EDefaultConnectionName, KDefaultConnectionName ) );
 iGlobalParams.Append( EInputParams( EUsageOfWlan,           KUsageOfWlan ) );
 iGlobalParams.Append( EInputParams( ECellularDataUsageHome,         KCellularDataUsageHome ) );
 iGlobalParams.Append( EInputParams( ECellularDataUsageVisitor,      KCellularDataUsageVisitor ) );
 iGlobalParams.Append( EInputParams( EGprsLastSocketActivityTimeout, KGprsLastSocketActivityTimeout ) );
 iGlobalParams.Append( EInputParams( EGprsLastSessionClosedTimeout,  KGprsLastSessionClosedTimeout ) );

branch	GCC_SURGE
changeset 49	faa5ef4f80da
parent 37	46a9400b839e
parent 46	95d45f234cf3