|
47
|
1 |
/*
|
|
|
2 |
* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
|
|
|
3 |
* All rights reserved.
|
|
|
4 |
* This component and the accompanying materials are made available
|
|
|
5 |
* under the terms of "Eclipse Public License v1.0"
|
|
|
6 |
* which accompanies this distribution, and is available
|
|
|
7 |
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
|
|
|
8 |
*
|
|
|
9 |
* Initial Contributors:
|
|
|
10 |
* Nokia Corporation - initial contribution.
|
|
|
11 |
*
|
|
|
12 |
* Contributors:
|
|
|
13 |
*
|
|
|
14 |
* Description: Class stores data for one accesspoint
|
|
|
15 |
*
|
|
|
16 |
*/
|
|
|
17 |
|
|
|
18 |
|
|
|
19 |
|
|
|
20 |
|
|
|
21 |
// INCLUDE FILES
|
|
|
22 |
|
|
|
23 |
#include "CWPAPNapdef.h"
|
|
|
24 |
#include <CWPCharacteristic.h>
|
|
|
25 |
#include <CWPParameter.h>
|
|
|
26 |
#include <featmgr.h>
|
|
|
27 |
#include <WPAdapterUtil.h>
|
|
|
28 |
#include "CWPAPAccesspointItem.h"
|
|
|
29 |
#include "WPAPAdapter.pan"
|
|
|
30 |
#include <WlanCdbCols.h>
|
|
|
31 |
#include <EapType.h>
|
|
|
32 |
#include <EapSettings.h>
|
|
|
33 |
#include "ProvisioningDebug.h"
|
|
|
34 |
#include <cmconnectionmethodext.h>
|
|
|
35 |
#include <cmpluginpacketdatadef.h>
|
|
|
36 |
#include <cmpluginwlandef.h>
|
|
|
37 |
#include <cmmanagerext.h>
|
|
|
38 |
#include <cmconnectionmethodext.h>
|
|
|
39 |
#include <commdb.h>
|
|
|
40 |
#include <WlanCdbCols.h>
|
|
|
41 |
#include <EapExpandedType.h>
|
|
|
42 |
#include <centralrepository.h>
|
|
|
43 |
#include <pdpcontextmanagerinternalcrkeys.h>
|
|
|
44 |
#include <EapGeneralSettings.h>
|
|
|
45 |
#include <EapTypeDefinitions.h>
|
|
|
46 |
|
|
|
47 |
const TUint KIapColumn = 0x00000100;
|
|
|
48 |
const TUint KLingerColumn = 0x00000200;
|
|
|
49 |
const TUint KColumnMask = 0xFFFFFF00;
|
|
|
50 |
const TUint KRowMask = 0x000000FF;
|
|
|
51 |
|
|
|
52 |
// Delay for comms db begintransaction retry (microseconds)
|
|
|
53 |
const TInt KBeginTransRetryDelay = 1000000;
|
|
|
54 |
// Maximum number of retries
|
|
|
55 |
const TInt KBeginTransRetryCount = 7;
|
|
|
56 |
|
|
|
57 |
// ============================ MEMBER FUNCTIONS ===============================
|
|
|
58 |
|
|
|
59 |
// -----------------------------------------------------------------------------
|
|
|
60 |
// CWPAPNapdef::NewLC
|
|
|
61 |
// -----------------------------------------------------------------------------
|
|
|
62 |
//
|
|
|
63 |
CWPAPNapdef* CWPAPNapdef::NewLC( TBool aFollowingLink,
|
|
|
64 |
const TDesC& aDefaultName,
|
|
|
65 |
CWPCharacteristic& aLogicalCharacteristic,
|
|
|
66 |
CWPCharacteristic& aLink )
|
|
|
67 |
{
|
|
|
68 |
CWPAPNapdef* self = new(ELeave) CWPAPNapdef( aFollowingLink,
|
|
|
69 |
aDefaultName,
|
|
|
70 |
aLogicalCharacteristic );
|
|
|
71 |
CleanupStack::PushL( self );
|
|
|
72 |
self->ConstructL();
|
|
|
73 |
aLink.AcceptL( *self );
|
|
|
74 |
return self;
|
|
|
75 |
}
|
|
|
76 |
|
|
|
77 |
// -----------------------------------------------------------------------------
|
|
|
78 |
// Destructor
|
|
|
79 |
// -----------------------------------------------------------------------------
|
|
|
80 |
CWPAPNapdef::~CWPAPNapdef()
|
|
|
81 |
{
|
|
|
82 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::~CWPAPNapdef" ) );
|
|
|
83 |
|
|
|
84 |
iEapTypeArray.ResetAndDestroy();
|
|
|
85 |
iEapTypeArray.Close();
|
|
|
86 |
iSecSSID.ResetAndDestroy();
|
|
|
87 |
iSecSSID.Close();
|
|
|
88 |
iNameServers.Close();
|
|
|
89 |
|
|
|
90 |
}
|
|
|
91 |
|
|
|
92 |
// -----------------------------------------------------------------------------
|
|
|
93 |
// CWPAPNapdef::ValidateL
|
|
|
94 |
// -----------------------------------------------------------------------------
|
|
|
95 |
//
|
|
|
96 |
TBool CWPAPNapdef::ValidateL()
|
|
|
97 |
{
|
|
|
98 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ValidateL" ) );
|
|
|
99 |
|
|
|
100 |
TBool result( ETrue );
|
|
|
101 |
|
|
|
102 |
if ( iBearer == KUidWlanBearerType )
|
|
|
103 |
{
|
|
|
104 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ValidateL wlan" ) );
|
|
|
105 |
if ( iWlanSupported )
|
|
|
106 |
{
|
|
|
107 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ValidateL wlan supported" ) );
|
|
|
108 |
return result;
|
|
|
109 |
}
|
|
|
110 |
else
|
|
|
111 |
{
|
|
|
112 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ValidateL wlan NOT supported" ) );
|
|
|
113 |
return EFalse;
|
|
|
114 |
}
|
|
|
115 |
}
|
|
|
116 |
|
|
|
117 |
// Received unsupported bearer
|
|
|
118 |
if( iBearerUnsupported )
|
|
|
119 |
{
|
|
|
120 |
return EFalse;
|
|
|
121 |
}
|
|
|
122 |
|
|
|
123 |
// Didn't receive a bearer value.
|
|
|
124 |
if ( iBearer == 0 )
|
|
|
125 |
{
|
|
|
126 |
// Access point address type can also tell the bearer
|
|
|
127 |
if( iAccesspointNameType )
|
|
|
128 |
{
|
|
|
129 |
TPtrC addrType( iAccesspointNameType->Value() );
|
|
|
130 |
if( addrType == KAddrTypeAPN )
|
|
|
131 |
{
|
|
|
132 |
iBearer =KUidPacketDataBearerType;
|
|
|
133 |
}
|
|
|
134 |
}
|
|
|
135 |
|
|
|
136 |
// If still couldn't determine the bearer, default to GPRS
|
|
|
137 |
if( iBearer == 0 )
|
|
|
138 |
{
|
|
|
139 |
iBearer = KUidPacketDataBearerType;
|
|
|
140 |
}
|
|
|
141 |
}
|
|
|
142 |
|
|
|
143 |
// "NAP-ADDRESS" (Access point name) must be defined
|
|
|
144 |
if( iAccesspointName )
|
|
|
145 |
{
|
|
|
146 |
if( iAccesspointName->Value() == KNullDesC )
|
|
|
147 |
{
|
|
|
148 |
return EFalse;
|
|
|
149 |
}
|
|
|
150 |
}
|
|
|
151 |
else
|
|
|
152 |
{
|
|
|
153 |
return EFalse;
|
|
|
154 |
}
|
|
|
155 |
|
|
|
156 |
/*
|
|
|
157 |
Combinations of authentication type, username and password and corressponding
|
|
|
158 |
value of prompt for password field. AuthType in this table means that provisioning document
|
|
|
159 |
contained authtype parameter and it was supported by the implementation.
|
|
|
160 |
Provisioning document names are used in table.
|
|
|
161 |
x means that value of the specified parameter is received and it was valid.
|
|
|
162 |
AuthType received & supported
|
|
|
163 |
| AuthName
|
|
|
164 |
| | AuthSecret
|
|
|
165 |
| | | "Prompt for Password"
|
|
|
166 |
no
|
|
|
167 |
x no
|
|
|
168 |
x no
|
|
|
169 |
x x yes
|
|
|
170 |
x no
|
|
|
171 |
x x yes
|
|
|
172 |
x x no
|
|
|
173 |
x x x no
|
|
|
174 |
*/
|
|
|
175 |
|
|
|
176 |
// Set the "prompt password"-value. See the table above. Value is set to true
|
|
|
177 |
// only if we have supported authentication type and either username or password
|
|
|
178 |
// is empty.
|
|
|
179 |
if ( IsReceived( EWPParameterAuthentication_id ) &&
|
|
|
180 |
( ( !iPassword && iUserName ) ||( iPassword && !iUserName ) ) )
|
|
|
181 |
{
|
|
|
182 |
iPromptPassword = ETrue;
|
|
|
183 |
}
|
|
|
184 |
|
|
|
185 |
// IFNETWORKS is a list of possible protocols that a GPRS access points can be
|
|
|
186 |
// used for.
|
|
|
187 |
if( iBearer == KUidPacketDataBearerType && IsReceived( EWPParameterIfNetworks_id ) )
|
|
|
188 |
{
|
|
|
189 |
TLex lex( iIfNetworks->Value() );
|
|
|
190 |
lex.Mark();
|
|
|
191 |
do
|
|
|
192 |
{
|
|
|
193 |
TChar ch( lex.Get() );
|
|
|
194 |
|
|
|
195 |
if( ( !iPdpType && !ch.IsAlphaDigit() ) || ( !iPdpType && lex.Eos() ) )
|
|
|
196 |
{
|
|
|
197 |
if(!lex.Eos())
|
|
|
198 |
{
|
|
|
199 |
lex.UnGet();
|
|
|
200 |
}
|
|
|
201 |
TPtrC value( lex.MarkedToken() );
|
|
|
202 |
if( !lex.Eos() )
|
|
|
203 |
{
|
|
|
204 |
lex.Inc();
|
|
|
205 |
}
|
|
|
206 |
|
|
|
207 |
if( value == KIPv6
|
|
|
208 |
&& FeatureManager::FeatureSupported( KFeatureIdIPv6 ) )
|
|
|
209 |
{
|
|
|
210 |
//iPdpType = EIPv6;
|
|
|
211 |
// CMManager
|
|
|
212 |
iPdpType = RPacketContext::EPdpTypeIPv6;
|
|
|
213 |
result = ETrue;
|
|
|
214 |
}
|
|
|
215 |
else if( value == KIPv6
|
|
|
216 |
&& !FeatureManager::FeatureSupported( KFeatureIdIPv6 ) )
|
|
|
217 |
{
|
|
|
218 |
result = EFalse;
|
|
|
219 |
}
|
|
|
220 |
else if( value == KIPv4 )
|
|
|
221 |
{
|
|
|
222 |
//iPdpType = EIPv4;
|
|
|
223 |
// CMManager
|
|
|
224 |
iPdpType = RPacketContext::EPdpTypeIPv4;
|
|
|
225 |
result = ETrue;
|
|
|
226 |
}
|
|
|
227 |
}
|
|
|
228 |
} while( !lex.Eos() );
|
|
|
229 |
}
|
|
|
230 |
|
|
|
231 |
return result;
|
|
|
232 |
}
|
|
|
233 |
|
|
|
234 |
// -----------------------------------------------------------------------------
|
|
|
235 |
// CWPAPNapdef::AddItemsL
|
|
|
236 |
// -----------------------------------------------------------------------------
|
|
|
237 |
//
|
|
|
238 |
TInt CWPAPNapdef::AddItemsL( RPointerArray<CWPAPAccesspointItem>& aItems,
|
|
|
239 |
CWPAPItemBase* aLogicalProxy,
|
|
|
240 |
CWPAPItemBase* aPhysicalProxy )
|
|
|
241 |
{
|
|
|
242 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddItemsL" ) );
|
|
|
243 |
|
|
|
244 |
TInt count( 0 );
|
|
|
245 |
|
|
|
246 |
if( ( iFollowingLink || IsReceived( EWPParameterInternet_id )
|
|
|
247 |
|| IsReceived( EWPParameterWlan_id ) )
|
|
|
248 |
&& ValidateL() )
|
|
|
249 |
{
|
|
|
250 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddItemsL append" ) );
|
|
|
251 |
CWPAPAccesspointItem* item = CWPAPAccesspointItem::NewLC(
|
|
|
252 |
iDefaultName,
|
|
|
253 |
aLogicalProxy,
|
|
|
254 |
aPhysicalProxy,
|
|
|
255 |
this,
|
|
|
256 |
iCharacteristic );
|
|
|
257 |
User::LeaveIfError( aItems.Append( item ) );
|
|
|
258 |
//Internet Parameter is received
|
|
|
259 |
if (IsReceived(EWPParameterInternet_id) && !iFollowingLink)
|
|
|
260 |
{
|
|
|
261 |
SetInternetIndicator(aItems.Count() - 1);
|
|
|
262 |
}
|
|
|
263 |
|
|
|
264 |
|
|
|
265 |
count++;
|
|
|
266 |
CleanupStack::Pop( item );
|
|
|
267 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddItemsL append done" ) );
|
|
|
268 |
}
|
|
|
269 |
return count;
|
|
|
270 |
}
|
|
|
271 |
|
|
|
272 |
|
|
|
273 |
// -----------------------------------------------------------------------------
|
|
|
274 |
// CWPAPNapdef::SetInternetIndicator
|
|
|
275 |
// -----------------------------------------------------------------------------
|
|
|
276 |
//
|
|
|
277 |
void CWPAPNapdef::SetInternetIndicator(TInt aValue)
|
|
|
278 |
{
|
|
|
279 |
iInternetIndicator = aValue;
|
|
|
280 |
}
|
|
|
281 |
|
|
|
282 |
// -----------------------------------------------------------------------------
|
|
|
283 |
// CWPAPNapdef::GetInternetIndicator
|
|
|
284 |
// -----------------------------------------------------------------------------
|
|
|
285 |
//
|
|
|
286 |
TInt CWPAPNapdef::GetInternetIndicator()
|
|
|
287 |
{
|
|
|
288 |
return iInternetIndicator;
|
|
|
289 |
}
|
|
|
290 |
|
|
|
291 |
|
|
|
292 |
// -----------------------------------------------------------------------------
|
|
|
293 |
// CWPAPNapdef::AddDataL
|
|
|
294 |
// -----------------------------------------------------------------------------
|
|
|
295 |
//
|
|
|
296 |
void CWPAPNapdef::AddDataL( /*CApAccessPointItem& aAPItem*/ RCmConnectionMethodExt& aCmItem )
|
|
|
297 |
{
|
|
|
298 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddDataL" ) );
|
|
|
299 |
|
|
|
300 |
TInt err( KErrNone );
|
|
|
301 |
|
|
|
302 |
if ( iBearer == KUidWlanBearerType )
|
|
|
303 |
{
|
|
|
304 |
if ( iWlanSupported )
|
|
|
305 |
{
|
|
|
306 |
// CMManager
|
|
|
307 |
AddWlanDataL( aCmItem);
|
|
|
308 |
}
|
|
|
309 |
else
|
|
|
310 |
{
|
|
|
311 |
// WLAN is disabled (or does not exist) in the device.
|
|
|
312 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddDataL WLAN disabled." ) );
|
|
|
313 |
User::Leave( KErrNotSupported );
|
|
|
314 |
}
|
|
|
315 |
}
|
|
|
316 |
else
|
|
|
317 |
{
|
|
|
318 |
if ( iConnectionName )
|
|
|
319 |
{
|
|
|
320 |
// CMManager
|
|
|
321 |
aCmItem.SetStringAttributeL( CMManager::ECmName, (iConnectionName->Value().Left( KNameMaxLength )));
|
|
|
322 |
}
|
|
|
323 |
else // Use default name
|
|
|
324 |
{
|
|
|
325 |
// CMManager
|
|
|
326 |
aCmItem.SetStringAttributeL( CMManager::ECmName, iDefaultName );
|
|
|
327 |
}
|
|
|
328 |
|
|
|
329 |
if ( iAccesspointName )
|
|
|
330 |
{
|
|
|
331 |
if ( iBearer == KUidPacketDataBearerType )
|
|
|
332 |
{
|
|
|
333 |
// CMManager
|
|
|
334 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::EPacketDataAPName, iAccesspointName->Value() ));
|
|
|
335 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL value: %S, err: %d"),
|
|
|
336 |
&iAccesspointName->Value(), err));
|
|
|
337 |
}
|
|
|
338 |
else
|
|
|
339 |
{
|
|
|
340 |
// CMManager
|
|
|
341 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::EDialDefaultTelNum, iAccesspointName->Value() ));
|
|
|
342 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::EApIspDefaultTelNumber value: %S, err: %d"),
|
|
|
343 |
&iAccesspointName->Value(), err ) );
|
|
|
344 |
}
|
|
|
345 |
}
|
|
|
346 |
|
|
|
347 |
TRAP ( err, aCmItem.UpdateL() );
|
|
|
348 |
|
|
|
349 |
if ( iUserName )
|
|
|
350 |
{
|
|
|
351 |
// CMManager
|
|
|
352 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::EDialLoginName, iUserName->Value() ));
|
|
|
353 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL EDialLoginName value: %S, err: %d"),
|
|
|
354 |
&iUserName->Value(), err));
|
|
|
355 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::EDialIFAuthName, iUserName->Value() ));
|
|
|
356 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL EDialIFAuthName value: %S, err: %d"),
|
|
|
357 |
&iUserName->Value(), err));
|
|
|
358 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::ECmIFAuthName, iUserName->Value() ));
|
|
|
359 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL ECmIFAuthName value: %S, err: %d"),
|
|
|
360 |
&iUserName->Value(), err));
|
|
|
361 |
}
|
|
|
362 |
|
|
|
363 |
// CMManager
|
|
|
364 |
TRAP ( err, aCmItem.SetBoolAttributeL( CMManager::ECmIFPromptForAuth, iPromptPassword));
|
|
|
365 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL ECmIFPromptForAuth value: %d, err: %d"),
|
|
|
366 |
iPromptPassword, err ));
|
|
|
367 |
|
|
|
368 |
if ( iPassword )
|
|
|
369 |
{
|
|
|
370 |
// CMManager
|
|
|
371 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::EDialLoginPassword, iPassword->Value() ));
|
|
|
372 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL EDialLoginPassword value: %d, err: %d"),
|
|
|
373 |
&iPassword->Value(), err ) );
|
|
|
374 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::ECmIFAuthPass, iPassword->Value() ));
|
|
|
375 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL ECmIFAuthPass value: %d, err: %d"),
|
|
|
376 |
&iPassword->Value(), err ) );
|
|
|
377 |
}
|
|
|
378 |
|
|
|
379 |
// CMManager
|
|
|
380 |
TRAP ( err, aCmItem.SetBoolAttributeL( CMManager::ECmDisablePlainTextAuth, iSecureAuthentication ));
|
|
|
381 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL EApEApIspDisablePlainTextAuth value: %d, err: %d"),
|
|
|
382 |
iSecureAuthentication, err ) );
|
|
|
383 |
|
|
|
384 |
|
|
|
385 |
// IPv6 APs always have dynamic phone address
|
|
|
386 |
//CMManager
|
|
|
387 |
if ( iPhoneIPAddress && iPdpType != RPacketContext::EPdpTypeIPv6 )
|
|
|
388 |
{
|
|
|
389 |
// CMManager IS CORRECT?
|
|
|
390 |
//err = aAPItem.WriteTextL( EApIspIPAddr, iPhoneIPAddress->Value() );
|
|
|
391 |
TRAP ( err, aCmItem.SetStringAttributeL( CMManager::ECmIPAddress, iPhoneIPAddress->Value() ));
|
|
|
392 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddDataL EApIspIPAddr value: %S, err: %d"),
|
|
|
393 |
&iPhoneIPAddress->Value(), err ) );
|
|
|
394 |
}
|
|
|
395 |
|
|
|
396 |
TRAP ( err, aCmItem.UpdateL() );
|
|
|
397 |
for( TInt i( 0 ); i < iNameServers.Count(); i++ )
|
|
|
398 |
{
|
|
|
399 |
WriteDNSAddressL( aCmItem, iNameServers[i]->Value() );
|
|
|
400 |
}
|
|
|
401 |
TRAP ( err, aCmItem.UpdateL() );
|
|
|
402 |
if( FeatureManager::FeatureSupported( KFeatureIdIPv6 )
|
|
|
403 |
&& iPdpType )
|
|
|
404 |
{
|
|
|
405 |
// CMManager
|
|
|
406 |
TRAP ( err, aCmItem.SetIntAttributeL( CMManager::EPacketDataPDPType, iPdpType ));
|
|
|
407 |
}
|
|
|
408 |
|
|
|
409 |
if ( err ) err = 0; // prevent compiler warning
|
|
|
410 |
}
|
|
|
411 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddDataL" ) );
|
|
|
412 |
}
|
|
|
413 |
|
|
|
414 |
// -----------------------------------------------------------------------------
|
|
|
415 |
// CWPAPNapdef::AddWlanDataL
|
|
|
416 |
// -----------------------------------------------------------------------------
|
|
|
417 |
//
|
|
|
418 |
void CWPAPNapdef::AddWlanDataL( RCmConnectionMethodExt& aCmItem )
|
|
|
419 |
{
|
|
|
420 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL" ) );
|
|
|
421 |
|
|
|
422 |
if ( !iWlanSupported )
|
|
|
423 |
{
|
|
|
424 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL WLAN NOT supported." ) );
|
|
|
425 |
User::Leave( KErrNotSupported);
|
|
|
426 |
}
|
|
|
427 |
|
|
|
428 |
TInt err = KErrNone;
|
|
|
429 |
|
|
|
430 |
if ( iConnectionName )
|
|
|
431 |
{
|
|
|
432 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL iConnectionName" ) );
|
|
|
433 |
|
|
|
434 |
//Connection name
|
|
|
435 |
// CMManager
|
|
|
436 |
aCmItem.SetStringAttributeL( CMManager::ECmName, iConnectionName->Value().Left( KNameMaxLength ) );
|
|
|
437 |
|
|
|
438 |
// CMManager
|
|
|
439 |
// Network name
|
|
|
440 |
aCmItem.SetStringAttributeL( CMManager::EWlanSSID, iConnectionName->Value());
|
|
|
441 |
|
|
|
442 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddWlanDataL iConnectionName err (%d) (%S)"), err, &iConnectionName->Value()));
|
|
|
443 |
|
|
|
444 |
}
|
|
|
445 |
else // Use default name
|
|
|
446 |
{
|
|
|
447 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL iConnectionName default" ) );
|
|
|
448 |
aCmItem.SetStringAttributeL( CMManager::EWlanSSID, iDefaultName);
|
|
|
449 |
}
|
|
|
450 |
|
|
|
451 |
//EApWlanNetworkMode Gives network mode, TUint32
|
|
|
452 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL EApWlanNetworkMode" ) );
|
|
|
453 |
// CMManager
|
|
|
454 |
TRAP ( err, aCmItem.SetIntAttributeL( CMManager::EWlanConnectionMode, iNetMode ));
|
|
|
455 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddWlanDataL EApWlanNetworkMode err (%d)"), err));
|
|
|
456 |
|
|
|
457 |
//EApWlanSecurityMode The security mode, TUint32
|
|
|
458 |
if ( iSecMode == 0 )
|
|
|
459 |
{
|
|
|
460 |
// This is needed if Provisioning message does not contain SECMODE parameter
|
|
|
461 |
// AP does not work if secmode is not set
|
|
|
462 |
iSecMode = CMManager::EWlanSecModeOpen;
|
|
|
463 |
}
|
|
|
464 |
|
|
|
465 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::AddWlanDataL EApWlanSecurityMode" ) );
|
|
|
466 |
// CMManager, securitymode causes error -1, this will be set manually in SaveWlanData
|
|
|
467 |
//TRAP ( err, aCmItem.SetIntAttributeL( CMManager::EWlanSecurityMode, iSecMode ));
|
|
|
468 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::AddWlanDataL EApWlanSecurityMode err (%d)"), err));
|
|
|
469 |
|
|
|
470 |
if (err)
|
|
|
471 |
{
|
|
|
472 |
err = KErrNone;
|
|
|
473 |
}
|
|
|
474 |
}
|
|
|
475 |
|
|
|
476 |
// -----------------------------------------------------------------------------
|
|
|
477 |
// CWPAPNapdef::WriteDNSAddressL
|
|
|
478 |
// -----------------------------------------------------------------------------
|
|
|
479 |
//
|
|
|
480 |
void CWPAPNapdef::WriteDNSAddressL( /*CApAccessPointItem& aAPItem*/ RCmConnectionMethodExt& aCmItem,
|
|
|
481 |
const TDesC& aValue )
|
|
|
482 |
{
|
|
|
483 |
// GPRS access points supports IPv6 only if explicitly stated.
|
|
|
484 |
// CMManager
|
|
|
485 |
TBool apSupportsIPv6( iPdpType == RPacketContext::EPdpTypeIPv6 | iBearer != KUidPacketDataBearerType );
|
|
|
486 |
|
|
|
487 |
// If IPv6 is supported, write the DNS address as IPv6 if
|
|
|
488 |
// bearer supports IPv6 and the address format is IPv6
|
|
|
489 |
if( FeatureManager::FeatureSupported( KFeatureIdIPv6 )
|
|
|
490 |
&& apSupportsIPv6
|
|
|
491 |
&& WPAdapterUtil::CheckIPv6( aValue ) )
|
|
|
492 |
{
|
|
|
493 |
// Two name servers per network type
|
|
|
494 |
if( iNumIPv6NameServers < KTwoNameServersPerNetworkType )
|
|
|
495 |
{
|
|
|
496 |
// CMManager
|
|
|
497 |
TRAPD (err, aCmItem.SetStringAttributeL( CMManager::TConnectionMethodCommonAttributes(
|
|
|
498 |
( CMManager::ECmIP6NameServer1 ) + iNumIPv6NameServers ), aValue ) );
|
|
|
499 |
User::LeaveIfError( err );
|
|
|
500 |
iNumIPv6NameServers++;
|
|
|
501 |
}
|
|
|
502 |
}
|
|
|
503 |
else if( CheckIPv4values( aValue) )
|
|
|
504 |
{
|
|
|
505 |
// Two name servers per network type
|
|
|
506 |
if( iNumIPv4NameServers < KTwoNameServersPerNetworkType )
|
|
|
507 |
{
|
|
|
508 |
// CMManager
|
|
|
509 |
TRAPD ( err, aCmItem.SetStringAttributeL( CMManager::TConnectionMethodCommonAttributes(
|
|
|
510 |
( CMManager::ECmIPNameServer1 ) + iNumIPv4NameServers ), aValue ) );
|
|
|
511 |
User::LeaveIfError( err );
|
|
|
512 |
aCmItem.SetBoolAttributeL( CMManager::ECmIPDNSAddrFromServer, EFalse);
|
|
|
513 |
iNumIPv4NameServers++;
|
|
|
514 |
}
|
|
|
515 |
}
|
|
|
516 |
}
|
|
|
517 |
// -----------------------------------------------------------------------------
|
|
|
518 |
// CWPAPNapdef::CheckAddressPart
|
|
|
519 |
// -----------------------------------------------------------------------------
|
|
|
520 |
//
|
|
|
521 |
|
|
|
522 |
TBool CWPAPNapdef:: CheckAddressPart( TLex& aLex )
|
|
|
523 |
{
|
|
|
524 |
TBool result( aLex.Peek().IsDigit() );
|
|
|
525 |
aLex.Inc();
|
|
|
526 |
if( aLex.Peek().IsDigit() )
|
|
|
527 |
{
|
|
|
528 |
aLex.Inc();
|
|
|
529 |
if( aLex.Peek().IsDigit() )
|
|
|
530 |
{
|
|
|
531 |
aLex.Inc();
|
|
|
532 |
}
|
|
|
533 |
}
|
|
|
534 |
|
|
|
535 |
return result;
|
|
|
536 |
}
|
|
|
537 |
|
|
|
538 |
|
|
|
539 |
// -----------------------------------------------------------------------------
|
|
|
540 |
// CWPAPNapdef::CheckIPv4values
|
|
|
541 |
// -----------------------------------------------------------------------------
|
|
|
542 |
//
|
|
|
543 |
|
|
|
544 |
TBool CWPAPNapdef::CheckIPv4values( const TDesC& aValue )
|
|
|
545 |
{
|
|
|
546 |
|
|
|
547 |
TLex aLex( aValue );
|
|
|
548 |
return CheckAddressPart( aLex )
|
|
|
549 |
&& aLex.Get() == '.'
|
|
|
550 |
&& CheckAddressPart( aLex )
|
|
|
551 |
&& aLex.Get() == '.'
|
|
|
552 |
&& CheckAddressPart( aLex )
|
|
|
553 |
&& aLex.Get() == '.'
|
|
|
554 |
&& CheckAddressPart( aLex )
|
|
|
555 |
&& aLex.Get() == '\0';
|
|
|
556 |
|
|
|
557 |
}
|
|
|
558 |
// -----------------------------------------------------------------------------
|
|
|
559 |
// CWPAPNapdef::Name
|
|
|
560 |
// -----------------------------------------------------------------------------
|
|
|
561 |
//
|
|
|
562 |
const TDesC& CWPAPNapdef::Name()
|
|
|
563 |
{
|
|
|
564 |
if ( iConnectionName )
|
|
|
565 |
{
|
|
|
566 |
return iConnectionName->Value();
|
|
|
567 |
}
|
|
|
568 |
else
|
|
|
569 |
{
|
|
|
570 |
return KNullDesC;
|
|
|
571 |
}
|
|
|
572 |
}
|
|
|
573 |
|
|
|
574 |
// -----------------------------------------------------------------------------
|
|
|
575 |
// CWPAPNapdef::VisitL
|
|
|
576 |
// -----------------------------------------------------------------------------
|
|
|
577 |
//
|
|
|
578 |
void CWPAPNapdef::VisitL( CWPCharacteristic& aCharacteristic )
|
|
|
579 |
{
|
|
|
580 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::VisitL(CWPCharacteristic)" ) );
|
|
|
581 |
|
|
|
582 |
TInt type = aCharacteristic.Type();
|
|
|
583 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::VisitL(CWPCharacteristic) type (%d)"), type));
|
|
|
584 |
switch ( type )
|
|
|
585 |
{
|
|
|
586 |
case KWPNapAuthInfo:
|
|
|
587 |
case KWPValidity:
|
|
|
588 |
{
|
|
|
589 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::VisitL(CWPCharacteristic) normal" ) );
|
|
|
590 |
aCharacteristic.AcceptL( *this );
|
|
|
591 |
break;
|
|
|
592 |
}
|
|
|
593 |
case KWPWLAN:
|
|
|
594 |
case KWPWepKey:
|
|
|
595 |
{
|
|
|
596 |
if( iWlanSupported )
|
|
|
597 |
{
|
|
|
598 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::VisitL(CWPCharacteristic) accept WLAN characteristic" ) );
|
|
|
599 |
aCharacteristic.AcceptL( *this );
|
|
|
600 |
}
|
|
|
601 |
}
|
|
56
|
602 |
break;
|
|
47
|
603 |
default:
|
|
|
604 |
{
|
|
|
605 |
if ( ( ( ( aCharacteristic.Name().Compare( KWLAN ) ) == 0 ) ||
|
|
|
606 |
( ( aCharacteristic.Name().Compare( SECSSID ) ) == 0 ) ||
|
|
|
607 |
( ( aCharacteristic.Name().Compare( KEAP ) ) == 0 ) ||
|
|
|
608 |
( ( aCharacteristic.Name().Compare( KCERT ) ) == 0 ) ||
|
|
|
609 |
( ( aCharacteristic.Name().Compare( KWEP ) ) == 0 ) ) && iWlanSupported )
|
|
|
610 |
{
|
|
|
611 |
if(aCharacteristic.Name().Compare( KEAP ) == 0)
|
|
|
612 |
{
|
|
|
613 |
CEapTypeElement* newEap = new (ELeave) CEapTypeElement;
|
|
67
|
614 |
CleanupStack::PushL( newEap );
|
|
47
|
615 |
newEap->iEAPSettings = new (ELeave) EAPSettings;
|
|
|
616 |
newEap->iCertificate = new (ELeave) EapCertificateEntry;
|
|
|
617 |
iEapTypeArray.AppendL(newEap);
|
|
67
|
618 |
CleanupStack::Pop(newEap);
|
|
47
|
619 |
}
|
|
|
620 |
else if(aCharacteristic.Name().Compare( SECSSID ) == 0)
|
|
|
621 |
{
|
|
|
622 |
SECssID* newsecSSID = new (ELeave) SECssID;
|
|
67
|
623 |
CleanupStack::PushL( newsecSSID );
|
|
47
|
624 |
newsecSSID->iSSSID = NULL;
|
|
|
625 |
newsecSSID->iSUSSID = NULL;
|
|
|
626 |
iSecSSID.AppendL(newsecSSID);
|
|
67
|
627 |
CleanupStack::Pop(newsecSSID);
|
|
47
|
628 |
}
|
|
|
629 |
|
|
|
630 |
aCharacteristic.AcceptL( *this );
|
|
|
631 |
}
|
|
|
632 |
}
|
|
|
633 |
}
|
|
|
634 |
|
|
|
635 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::VisitL(CWPCharacteristic) done" ) );
|
|
|
636 |
}
|
|
|
637 |
|
|
|
638 |
// -----------------------------------------------------------------------------
|
|
|
639 |
// CWPAPNapdef::VisitL
|
|
|
640 |
// -----------------------------------------------------------------------------
|
|
|
641 |
//
|
|
|
642 |
void CWPAPNapdef::VisitL( CWPParameter& aParameter )
|
|
|
643 |
{
|
|
|
644 |
TInt id = aParameter.ID();
|
|
|
645 |
TPtrC value( aParameter.Value() );
|
|
|
646 |
|
|
|
647 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::VisitL(CWPParameter) id: %d value: %S"), id, &value));
|
|
|
648 |
|
|
|
649 |
switch ( id )
|
|
|
650 |
{
|
|
|
651 |
case EWPParameterName:
|
|
|
652 |
{
|
|
|
653 |
if ( !iConnectionName )
|
|
|
654 |
{
|
|
|
655 |
iConnectionName = &aParameter;
|
|
|
656 |
}
|
|
|
657 |
break;
|
|
|
658 |
}
|
|
|
659 |
case EWPParameterBearer:
|
|
|
660 |
{
|
|
|
661 |
if ( iBearer != 0 || iBearerUnsupported )
|
|
|
662 |
{
|
|
|
663 |
break; // Already received a bearer information
|
|
|
664 |
}
|
|
|
665 |
|
|
|
666 |
if ( value == KGSMGPRS )
|
|
|
667 |
{
|
|
|
668 |
iBearer = KUidPacketDataBearerType;
|
|
|
669 |
}
|
|
|
670 |
else if ( value == KWLAN && iWlanSupported )
|
|
|
671 |
{
|
|
|
672 |
iBearer = KUidWlanBearerType;
|
|
|
673 |
MarkReceived( EWPParameterWlan_id );
|
|
|
674 |
}
|
|
|
675 |
else
|
|
|
676 |
{
|
|
|
677 |
// Unsupported bearer type
|
|
|
678 |
iBearerUnsupported = ETrue;
|
|
|
679 |
}
|
|
|
680 |
break;
|
|
|
681 |
}
|
|
|
682 |
case EWPParameterNapAddress:
|
|
|
683 |
{
|
|
|
684 |
if ( !iAccesspointName )
|
|
|
685 |
{
|
|
|
686 |
iAccesspointName = &aParameter;
|
|
|
687 |
}
|
|
|
688 |
break;
|
|
|
689 |
}
|
|
|
690 |
case EWPParameterLinger:
|
|
|
691 |
{
|
|
|
692 |
iLinger = &aParameter;
|
|
|
693 |
UdateligerValueL( iLinger );
|
|
|
694 |
break;
|
|
|
695 |
}
|
|
|
696 |
case EWPParameterNapAddrType:
|
|
|
697 |
{
|
|
|
698 |
if ( !iAccesspointNameType )
|
|
|
699 |
{
|
|
|
700 |
iAccesspointNameType = &aParameter;
|
|
|
701 |
}
|
|
|
702 |
break;
|
|
|
703 |
}
|
|
|
704 |
case EWPParameterAuthName:
|
|
|
705 |
{
|
|
|
706 |
if ( !iUserName )
|
|
|
707 |
{
|
|
|
708 |
iUserName = &aParameter;
|
|
|
709 |
}
|
|
|
710 |
break;
|
|
|
711 |
}
|
|
|
712 |
case EWPParameterAuthSecret:
|
|
|
713 |
{
|
|
|
714 |
if ( !iPassword )
|
|
|
715 |
{
|
|
|
716 |
iPassword = &aParameter;
|
|
|
717 |
}
|
|
|
718 |
break;
|
|
|
719 |
}
|
|
|
720 |
case EWPParameterAuthType:
|
|
|
721 |
{
|
|
|
722 |
// If already received don't accept
|
|
|
723 |
if (IsReceived(EWPParameterAuthentication_id))
|
|
|
724 |
{
|
|
|
725 |
break;
|
|
|
726 |
}
|
|
|
727 |
|
|
|
728 |
if ( value == KCHAP || value == KMD5 )
|
|
|
729 |
{
|
|
|
730 |
iSecureAuthentication = ETrue;
|
|
|
731 |
MarkReceived( EWPParameterAuthentication_id );
|
|
|
732 |
}
|
|
|
733 |
else if ( value == KPAP )
|
|
|
734 |
{
|
|
|
735 |
iSecureAuthentication = EFalse;
|
|
|
736 |
MarkReceived( EWPParameterAuthentication_id );
|
|
|
737 |
}
|
|
|
738 |
else
|
|
|
739 |
{
|
|
|
740 |
// Not supported...
|
|
|
741 |
}
|
|
|
742 |
break;
|
|
|
743 |
}
|
|
|
744 |
case EWPParameterLocalAddr: // iPhoneIPAddress
|
|
|
745 |
{
|
|
|
746 |
if ( !iPhoneIPAddress )
|
|
|
747 |
{
|
|
|
748 |
iPhoneIPAddress = &aParameter;
|
|
|
749 |
}
|
|
|
750 |
break;
|
|
|
751 |
}
|
|
|
752 |
case EWPParameterDNSAddr:
|
|
|
753 |
{
|
|
|
754 |
// All name servers must be stored, as some of them might
|
|
|
755 |
// be IPv6 and some IPv4
|
|
|
756 |
User::LeaveIfError( iNameServers.Append( &aParameter ) );
|
|
|
757 |
break;
|
|
|
758 |
}
|
|
|
759 |
case EWPParameterIfNetworks:
|
|
|
760 |
{
|
|
|
761 |
if( !iIfNetworks )
|
|
|
762 |
{
|
|
|
763 |
iIfNetworks = &aParameter;
|
|
|
764 |
MarkReceived( EWPParameterIfNetworks_id );
|
|
|
765 |
}
|
|
|
766 |
break;
|
|
|
767 |
}
|
|
|
768 |
case EWPParameterInternet:
|
|
|
769 |
{
|
|
|
770 |
MarkReceived( EWPParameterInternet_id );
|
|
|
771 |
break;
|
|
|
772 |
}
|
|
|
773 |
//JMan for WLan
|
|
|
774 |
case EWPParameterNapID:
|
|
|
775 |
{
|
|
|
776 |
if ( !iNapID )
|
|
|
777 |
{
|
|
|
778 |
iNapID = &aParameter;
|
|
|
779 |
}
|
|
|
780 |
break;
|
|
|
781 |
}
|
|
|
782 |
// Here case 0 are handled the WLAN parameters that are extensions
|
|
|
783 |
// to OMA Client Provisioning parameter set.
|
|
|
784 |
case 0:
|
|
|
785 |
{
|
|
|
786 |
if( iWlanSupported )
|
|
|
787 |
{
|
|
|
788 |
HandleWLanParametersL( aParameter );
|
|
|
789 |
}
|
|
|
790 |
break;
|
|
|
791 |
}
|
|
|
792 |
//JMan for WLan ends
|
|
|
793 |
default:
|
|
|
794 |
{
|
|
|
795 |
}
|
|
|
796 |
}
|
|
|
797 |
}
|
|
|
798 |
|
|
|
799 |
// -----------------------------------------------------------------------------
|
|
|
800 |
// CWPAPNapdef::HandleWLanParametersL
|
|
|
801 |
// -----------------------------------------------------------------------------
|
|
|
802 |
//
|
|
|
803 |
void CWPAPNapdef::HandleWLanParametersL( CWPParameter& aParameter )
|
|
|
804 |
{
|
|
|
805 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL" ) );
|
|
|
806 |
|
|
|
807 |
if( !iWlanSupported )
|
|
|
808 |
{
|
|
|
809 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL WLAN not supported." ) );
|
|
|
810 |
User::Leave( KErrNotSupported );
|
|
|
811 |
}
|
|
|
812 |
|
|
|
813 |
SECssID* scssid = NULL;
|
|
|
814 |
if( iSecSSID.Count() )
|
|
|
815 |
{
|
|
|
816 |
scssid = iSecSSID[iSecSSID.Count()-1];
|
|
|
817 |
}
|
|
|
818 |
|
|
|
819 |
TPtrC value( aParameter.Value() );
|
|
|
820 |
if( ( aParameter.Name().Compare( PRISSID ) ) == 0 )
|
|
|
821 |
{
|
|
|
822 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriSSID" ) );
|
|
|
823 |
if ( !iPriSSID )
|
|
|
824 |
{
|
|
|
825 |
iPriSSID = &aParameter;
|
|
|
826 |
}
|
|
|
827 |
}
|
|
|
828 |
else if( ( aParameter.Name().Compare( PRIUSSID ) ) == 0 )
|
|
|
829 |
{
|
|
|
830 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriUSSID" ) );
|
|
|
831 |
if ( !iPriUSSID )
|
|
|
832 |
{
|
|
|
833 |
iPriUSSID = &aParameter;
|
|
|
834 |
}
|
|
|
835 |
}// else if
|
|
|
836 |
|
|
|
837 |
else if( ( aParameter.Name().Compare( PRIHSSID ) ) == 0 )
|
|
|
838 |
{
|
|
|
839 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriHSSID" ) );
|
|
|
840 |
if ( !iPriHSSID )
|
|
|
841 |
{
|
|
|
842 |
iPriHSSID = &aParameter;
|
|
|
843 |
}
|
|
|
844 |
}// else if
|
|
|
845 |
|
|
|
846 |
else if( ( aParameter.Name().Compare( SSSID ) ) == 0 )
|
|
|
847 |
{
|
|
|
848 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriHSSID" ) );
|
|
|
849 |
if(scssid!=NULL)
|
|
|
850 |
{
|
|
|
851 |
scssid->iSSSID = &aParameter;
|
|
|
852 |
}
|
|
|
853 |
|
|
|
854 |
|
|
|
855 |
}// else if
|
|
|
856 |
|
|
|
857 |
else if( ( aParameter.Name().Compare( SUSSID ) ) == 0 )
|
|
|
858 |
{
|
|
|
859 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL iPriHSSID" ) );
|
|
|
860 |
if(scssid!=NULL)
|
|
|
861 |
{
|
|
|
862 |
scssid->iSUSSID = &aParameter;
|
|
|
863 |
}
|
|
|
864 |
}// else if
|
|
|
865 |
|
|
|
866 |
else if( ( aParameter.Name().Compare( NETMODE ) ) == 0 )
|
|
|
867 |
{
|
|
|
868 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL netmode" ) );
|
|
|
869 |
if ( value == KADHOC )
|
|
|
870 |
{
|
|
|
871 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL netmode adhoc" ) );
|
|
|
872 |
iNetMode = CMManager::EAdhoc;
|
|
|
873 |
}
|
|
|
874 |
else // default is INFRA
|
|
|
875 |
{
|
|
|
876 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL netmode infra" ) );
|
|
|
877 |
iNetMode =CMManager::EInfra;
|
|
|
878 |
}
|
|
|
879 |
}
|
|
|
880 |
|
|
|
881 |
else if( ( aParameter.Name().Compare( SECMODE ) ) == 0 )
|
|
|
882 |
{
|
|
|
883 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode" ) );
|
|
|
884 |
if ( value == KWEPSEC )
|
|
|
885 |
{
|
|
|
886 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode KWEPSEC" ) );
|
|
|
887 |
iSecMode = CMManager::EWlanSecModeWep;
|
|
|
888 |
}
|
|
|
889 |
else if( value == K8021XSEC )
|
|
|
890 |
{
|
|
|
891 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode K8021XSEC" ) );
|
|
|
892 |
iSecMode = CMManager::EWlanSecMode802_1x;
|
|
|
893 |
}
|
|
|
894 |
else if( value == KWPASEC )
|
|
|
895 |
{
|
|
|
896 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode KWPASEC" ) );
|
|
|
897 |
|
|
|
898 |
iSecMode = CMManager::EWlanSecModeWpa;
|
|
|
899 |
}
|
|
|
900 |
else if( value == KWPA2SEC )
|
|
|
901 |
{
|
|
|
902 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode KWPA2SEC" ) );
|
|
|
903 |
iSecMode = CMManager::EWlanSecModeWpa2;
|
|
|
904 |
}
|
|
|
905 |
else if( value == KWPAPRESSEC )
|
|
|
906 |
{
|
|
|
907 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode KWPAPRESSEC" ) );
|
|
|
908 |
iSecMode = CMManager::EWlanSecModeWpa;
|
|
|
909 |
}
|
|
|
910 |
else if( value == KWPA2PRESSEC )
|
|
|
911 |
{
|
|
|
912 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode KWPA2PRESSEC" ) );
|
|
|
913 |
iSecMode = CMManager::EWlanSecModeWpa2;
|
|
|
914 |
}
|
|
|
915 |
else
|
|
|
916 |
{
|
|
|
917 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL secmode open" ) );
|
|
|
918 |
iSecMode = CMManager::EWlanSecModeOpen;
|
|
|
919 |
}
|
|
|
920 |
}
|
|
|
921 |
|
|
|
922 |
else if( ( aParameter.Name().Compare( WPAPRESKEYASC ) ) == 0 )
|
|
|
923 |
{
|
|
|
924 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL WPAPRESKEYASC" ) );
|
|
|
925 |
if ( !iWpaPresKeyAsc )
|
|
|
926 |
{
|
|
|
927 |
iWpaPresKeyAsc = &aParameter;
|
|
|
928 |
}
|
|
|
929 |
}// else if
|
|
|
930 |
// indicates the default wepkey index
|
|
|
931 |
else if( ( aParameter.Name().Compare( DEFAULTWEPIND ) ) == 0 )
|
|
|
932 |
{
|
|
|
933 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL wepind" ) );
|
|
|
934 |
|
|
|
935 |
TLex lex( value );
|
|
|
936 |
lex.Val( iDefaultWepKeyIndex );
|
|
|
937 |
if ( iDefaultWepKeyIndex >= 4 )
|
|
|
938 |
{
|
|
|
939 |
iDefaultWepKeyIndex = 0;
|
|
|
940 |
}
|
|
|
941 |
}// else if
|
|
|
942 |
|
|
|
943 |
else if( ( aParameter.Name().Compare( WEPAUTHMODE ) ) == 0 )
|
|
|
944 |
{
|
|
|
945 |
if ( value == KWEPAUTHMODEOPEN )
|
|
|
946 |
{
|
|
|
947 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL wepauthmode OPEN" ) );
|
|
|
948 |
iAuthentication = EAuthOpen;
|
|
|
949 |
}
|
|
|
950 |
else if ( value == KWEPAUTHMODESHARED )
|
|
|
951 |
{
|
|
|
952 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL wepauthmode SHARED" ) );
|
|
|
953 |
iAuthentication = EAuthShared;
|
|
|
954 |
}
|
|
|
955 |
}// else if
|
|
|
956 |
|
|
|
957 |
else if( ( aParameter.Name().Compare( WEPKEYLENGTH ) ) == 0 )
|
|
|
958 |
{
|
|
|
959 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL WEPKEYLENGTH" ) );
|
|
|
960 |
if ( !iWepKeyLength )
|
|
|
961 |
{
|
|
|
962 |
iWepKeyLength = &aParameter;
|
|
|
963 |
}
|
|
|
964 |
}// else if
|
|
|
965 |
else if( ( aParameter.Name().Compare( WEPKEYINDEX ) ) == 0 )
|
|
|
966 |
{
|
|
|
967 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL WEPKEYINDEX" ) );
|
|
|
968 |
TLex lex( value );
|
|
|
969 |
lex.Val( iWepInd );
|
|
|
970 |
}// else if
|
|
|
971 |
else if( ( aParameter.Name().Compare( WEPKEYDATA ) ) == 0 )
|
|
|
972 |
{
|
|
|
973 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL WEPKEYDATA" ) );
|
|
|
974 |
|
|
|
975 |
if ( iWepInd < 4 )
|
|
|
976 |
{
|
|
|
977 |
const TUint8 K40Bits = 5;
|
|
|
978 |
const TUint8 K104Bits = 13;
|
|
|
979 |
const TUint8 K232Bits = 29;
|
|
|
980 |
|
|
|
981 |
TBuf8<KMaxLengthOfKeyData> buf8;
|
|
|
982 |
StrCopy( buf8, aParameter.Value() );
|
|
|
983 |
|
|
|
984 |
if(buf8.Length() == K232Bits ||
|
|
|
985 |
buf8.Length() == K104Bits ||
|
|
|
986 |
buf8.Length() == K40Bits )
|
|
|
987 |
{
|
|
|
988 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL ASCI Wep Key" ) );
|
|
|
989 |
HBufC8* buf8Conv = HBufC8::NewLC( KMaxLengthOfKeyData );
|
|
|
990 |
ConvertAsciiToHex( buf8, buf8Conv );
|
|
|
991 |
iKeyData[iWepInd] = *buf8Conv;
|
|
|
992 |
iKeyFormat[iWepInd] = CWPAPNapdef::EAscii;
|
|
|
993 |
CleanupStack::PopAndDestroy( buf8Conv );
|
|
|
994 |
}
|
|
|
995 |
else if( buf8.Length()==K232Bits*2 ||
|
|
|
996 |
buf8.Length()== K104Bits*2 ||
|
|
|
997 |
buf8.Length() == K40Bits*2)
|
|
|
998 |
{
|
|
|
999 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL HEX Wep Key" ) );
|
|
|
1000 |
iKeyData[iWepInd] = buf8;
|
|
|
1001 |
iKeyFormat[iWepInd] = CWPAPNapdef::EHexadecimal;
|
|
|
1002 |
}
|
|
|
1003 |
}
|
|
|
1004 |
|
|
|
1005 |
}// else if
|
|
|
1006 |
|
|
|
1007 |
// Handle EAP parameter
|
|
|
1008 |
HandleEAPParametersCCL( aParameter );
|
|
|
1009 |
|
|
|
1010 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleWLanParametersL done" ) );
|
|
|
1011 |
}
|
|
|
1012 |
|
|
|
1013 |
// -----------------------------------------------------------------------------
|
|
|
1014 |
// CWPAPNapdef::HandleEAPParametersL
|
|
|
1015 |
// -----------------------------------------------------------------------------
|
|
|
1016 |
//
|
|
|
1017 |
void CWPAPNapdef::HandleEAPParametersCCL( CWPParameter& aParameter )
|
|
|
1018 |
{
|
|
|
1019 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL" ) );
|
|
|
1020 |
|
|
|
1021 |
CEapTypeElement* eap = NULL;
|
|
|
1022 |
if ( iEapTypeArray.Count() )
|
|
|
1023 |
{
|
|
|
1024 |
eap = iEapTypeArray[iEapTypeArray.Count()-1];
|
|
|
1025 |
}
|
|
|
1026 |
if(!eap)
|
|
|
1027 |
{
|
|
|
1028 |
return;
|
|
|
1029 |
}
|
|
|
1030 |
|
|
|
1031 |
TPtrC value( aParameter.Value() );
|
|
|
1032 |
|
|
|
1033 |
if( ( aParameter.Name().Compare( EAPTYPE ) ) == 0 )
|
|
|
1034 |
{
|
|
|
1035 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPTYPE" ) );
|
|
|
1036 |
|
|
|
1037 |
ConvertEAPStringToIds( value, eap->iEapTypeString, eap->iEAPSettings->iEAPExpandedType );
|
|
|
1038 |
|
|
|
1039 |
}
|
|
|
1040 |
else if( ( aParameter.Name().Compare( EAPUSERNAME ) ) == 0 )
|
|
|
1041 |
{
|
|
|
1042 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPUSERNAME" ) );
|
|
|
1043 |
if ( eap->iEAPSettings->iUsername.Length() == 0 )
|
|
|
1044 |
{
|
|
|
1045 |
eap->iEAPSettings->iUsername = value;
|
|
|
1046 |
eap->iEAPSettings->iUsernamePresent = ETrue;
|
|
|
1047 |
eap->iEAPSettings->iUseAutomaticUsernamePresent = ETrue;
|
|
|
1048 |
eap->iEAPSettings->iUseAutomaticUsername = EFalse;
|
|
|
1049 |
}
|
|
|
1050 |
}// else if
|
|
|
1051 |
else if( ( aParameter.Name().Compare( EAPPASSWORD ) ) == 0 )
|
|
|
1052 |
{
|
|
|
1053 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPPASSWORD" ) );
|
|
|
1054 |
if ( eap->iEAPSettings->iPassword.Length() == 0 )
|
|
|
1055 |
{
|
|
|
1056 |
eap->iEAPSettings->iPassword = value;
|
|
|
1057 |
eap->iEAPSettings->iPasswordPresent = ETrue;
|
|
|
1058 |
eap->iEAPSettings-> iShowPassWordPromptPresent = ETrue;
|
|
|
1059 |
eap->iEAPSettings-> iShowPassWordPrompt = EFalse;
|
|
|
1060 |
}
|
|
|
1061 |
}// else if
|
|
|
1062 |
else if( ( aParameter.Name().Compare( EAPREALM ) ) == 0 )
|
|
|
1063 |
{
|
|
|
1064 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPREALM" ) );
|
|
|
1065 |
|
|
|
1066 |
if ( eap->iEAPSettings->iRealm.Length() == 0 )
|
|
|
1067 |
{
|
|
|
1068 |
eap->iEAPSettings->iRealm = value;
|
|
|
1069 |
eap->iEAPSettings->iRealmPresent = ETrue;
|
|
|
1070 |
eap->iEAPSettings->iUseAutomaticRealmPresent = ETrue;
|
|
|
1071 |
eap->iEAPSettings->iUseAutomaticRealm = EFalse;
|
|
|
1072 |
}
|
|
|
1073 |
}// else if
|
|
|
1074 |
else if( ( aParameter.Name().Compare( EAPUSEPSEUD ) ) == 0 )
|
|
|
1075 |
{
|
|
|
1076 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPUSEPSEUD" ) );
|
|
|
1077 |
TInt pseudonyms;
|
|
|
1078 |
TLex lex( value );
|
|
|
1079 |
lex.Val( pseudonyms );
|
|
|
1080 |
|
|
|
1081 |
eap->iEAPSettings->iUsePseudonymsPresent = ETrue;
|
|
|
1082 |
if ( pseudonyms == 1 )
|
|
|
1083 |
{
|
|
|
1084 |
eap->iEAPSettings->iUsePseudonyms = ETrue;
|
|
|
1085 |
}
|
|
|
1086 |
else
|
|
|
1087 |
{
|
|
|
1088 |
eap->iEAPSettings->iUsePseudonyms = EFalse;
|
|
|
1089 |
}
|
|
|
1090 |
}// else if
|
|
|
1091 |
else if( ( aParameter.Name().Compare( EAPMAXAUTHS ) ) == 0 )
|
|
|
1092 |
{
|
|
|
1093 |
// not supported
|
|
|
1094 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPMAXAUTHS" ) );
|
|
|
1095 |
}// else if
|
|
|
1096 |
else if( ( aParameter.Name().Compare( EAPENCAPS ) ) == 0 )
|
|
|
1097 |
{
|
|
|
1098 |
|
|
|
1099 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPENCAPS" ) );
|
|
|
1100 |
|
|
|
1101 |
TEapExpandedType dummy;
|
|
|
1102 |
ConvertEAPStringToIds( value, eap->iEncapsulatingExpandedEapId, dummy );
|
|
|
1103 |
|
|
|
1104 |
}// else if
|
|
|
1105 |
else if( ( aParameter.Name().Compare( EAPVERSERREALM ) ) == 0 )
|
|
|
1106 |
{
|
|
|
1107 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPVERSERREALM" ) );
|
|
|
1108 |
|
|
|
1109 |
TInt serverRealm;
|
|
|
1110 |
TLex lex( value );
|
|
|
1111 |
lex.Val( serverRealm );
|
|
|
1112 |
|
|
|
1113 |
eap->iEAPSettings->iVerifyServerRealmPresent = ETrue;
|
|
|
1114 |
|
|
|
1115 |
if ( serverRealm == 1 )
|
|
|
1116 |
{
|
|
|
1117 |
eap->iEAPSettings->iVerifyServerRealm = ETrue;
|
|
|
1118 |
}
|
|
|
1119 |
else
|
|
|
1120 |
{
|
|
|
1121 |
eap->iEAPSettings->iVerifyServerRealm = EFalse;
|
|
|
1122 |
}
|
|
|
1123 |
}// else if
|
|
|
1124 |
else if( ( aParameter.Name().Compare( EAPCLIENTHAUTH ) ) == 0 )
|
|
|
1125 |
{
|
|
|
1126 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPCLIENTHAUTH" ) );
|
|
|
1127 |
|
|
|
1128 |
TInt clientAuthentication;
|
|
|
1129 |
TLex lex( value );
|
|
|
1130 |
lex.Val( clientAuthentication );
|
|
|
1131 |
|
|
|
1132 |
eap->iEAPSettings->iRequireClientAuthenticationPresent = ETrue;
|
|
|
1133 |
|
|
|
1134 |
if ( clientAuthentication == 1 )
|
|
|
1135 |
{
|
|
|
1136 |
eap->iEAPSettings->iRequireClientAuthentication = ETrue;
|
|
|
1137 |
}
|
|
|
1138 |
else
|
|
|
1139 |
{
|
|
|
1140 |
eap->iEAPSettings->iRequireClientAuthentication = EFalse;
|
|
|
1141 |
}
|
|
|
1142 |
}// else if
|
|
|
1143 |
else if( ( aParameter.Name().Compare( EAPSESVALTIME ) ) == 0 )
|
|
|
1144 |
{
|
|
|
1145 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSESVALTIME" ) );
|
|
|
1146 |
|
|
|
1147 |
TInt sessionValidityTime;
|
|
|
1148 |
TLex lex( value );
|
|
|
1149 |
lex.Val( sessionValidityTime );
|
|
|
1150 |
eap->iEAPSettings->iSessionValidityTime = sessionValidityTime;
|
|
|
1151 |
eap->iEAPSettings->iSessionValidityTimePresent = ETrue;
|
|
|
1152 |
|
|
|
1153 |
}// else if
|
|
|
1154 |
else if( ( aParameter.Name().Compare( EAPCIPSUIT ) ) == 0 )
|
|
|
1155 |
{
|
|
|
1156 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPCIPSUIT" ) );
|
|
|
1157 |
|
|
|
1158 |
TInt cipherSuites;
|
|
|
1159 |
TLex lex( value );
|
|
|
1160 |
lex.Val( cipherSuites );
|
|
|
1161 |
eap->iEAPSettings->iCipherSuites.Append( cipherSuites );
|
|
|
1162 |
eap->iEAPSettings->iCipherSuitesPresent = ETrue;
|
|
|
1163 |
|
|
|
1164 |
}// else if
|
|
|
1165 |
else if( ( aParameter.Name().Compare( EAPPEAPV0 ) ) == 0 )
|
|
|
1166 |
{
|
|
|
1167 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPPEAPV0" ) );
|
|
|
1168 |
|
|
|
1169 |
TInt peap;
|
|
|
1170 |
TLex lex( value );
|
|
|
1171 |
lex.Val( peap );
|
|
|
1172 |
|
|
|
1173 |
eap->iEAPSettings->iPEAPVersionsPresent = ETrue;
|
|
|
1174 |
if ( peap == 1 )
|
|
|
1175 |
{
|
|
|
1176 |
eap->iEAPSettings->iPEAPv0Allowed = ETrue;
|
|
|
1177 |
}
|
|
|
1178 |
else
|
|
|
1179 |
{
|
|
|
1180 |
eap->iEAPSettings->iPEAPv0Allowed = EFalse;
|
|
|
1181 |
}
|
|
|
1182 |
}// else if
|
|
|
1183 |
else if( ( aParameter.Name().Compare( EAPPEAPV1 ) ) == 0 )
|
|
|
1184 |
{
|
|
|
1185 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPPEAPV1" ) );
|
|
|
1186 |
TInt peap;
|
|
|
1187 |
TLex lex( value );
|
|
|
1188 |
lex.Val( peap );
|
|
|
1189 |
eap->iEAPSettings->iPEAPVersionsPresent = ETrue;
|
|
|
1190 |
if ( peap == 1 )
|
|
|
1191 |
{
|
|
|
1192 |
eap->iEAPSettings->iPEAPv1Allowed = ETrue;
|
|
|
1193 |
}
|
|
|
1194 |
else
|
|
|
1195 |
{
|
|
|
1196 |
eap->iEAPSettings->iPEAPv1Allowed = EFalse;
|
|
|
1197 |
}
|
|
|
1198 |
}// else if
|
|
|
1199 |
else if( ( aParameter.Name().Compare( EAPPEAPV2 ) ) == 0 )
|
|
|
1200 |
{
|
|
|
1201 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPPEAPV2" ) );
|
|
|
1202 |
TInt peap;
|
|
|
1203 |
TLex lex( value );
|
|
|
1204 |
lex.Val( peap );
|
|
|
1205 |
eap->iEAPSettings->iPEAPVersionsPresent = ETrue;
|
|
|
1206 |
if ( peap == 1 )
|
|
|
1207 |
{
|
|
|
1208 |
eap->iEAPSettings->iPEAPv2Allowed = ETrue;
|
|
|
1209 |
}
|
|
|
1210 |
else
|
|
|
1211 |
{
|
|
|
1212 |
eap->iEAPSettings->iPEAPv2Allowed = EFalse;
|
|
|
1213 |
}
|
|
|
1214 |
}// else if
|
|
|
1215 |
|
|
|
1216 |
else if( ( aParameter.Name().Compare( EAPISSNAME ) ) == 0 )
|
|
|
1217 |
{
|
|
|
1218 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPISSNAME" ) );
|
|
|
1219 |
|
|
|
1220 |
eap->iCertificate->SetSubjectName(value);
|
|
|
1221 |
eap->iCertificate->SetSubjectNamePresent();
|
|
|
1222 |
}// else if
|
|
|
1223 |
|
|
|
1224 |
else if( ( aParameter.Name().Compare( EAPSUBNAME ) ) == 0 )
|
|
|
1225 |
{
|
|
|
1226 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSUBNAME" ) );
|
|
|
1227 |
|
|
|
1228 |
eap->iCertificate->SetIssuerName(value);
|
|
|
1229 |
eap->iCertificate->SetIssuerNamePresent();
|
|
|
1230 |
}// else if
|
|
|
1231 |
|
|
|
1232 |
else if( ( aParameter.Name().Compare( EAPCERTTYPE ) ) == 0 )
|
|
|
1233 |
{
|
|
|
1234 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPCERTTYPE" ) );
|
|
|
1235 |
if ( value == EAPCERTCA )
|
|
|
1236 |
{
|
|
|
1237 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EEapSim" ) );
|
|
|
1238 |
|
|
|
1239 |
eap->iCertificate->SetCertType(EapCertificateEntry::ECA);
|
|
|
1240 |
eap->iEAPSettings-> iUseAutomaticCACertificatePresent = ETrue;
|
|
|
1241 |
eap->iEAPSettings-> iUseAutomaticCACertificate = EFalse;
|
|
|
1242 |
}
|
|
|
1243 |
else
|
|
|
1244 |
{
|
|
|
1245 |
eap->iCertificate->SetCertType(EapCertificateEntry::EUser);
|
|
|
1246 |
}
|
|
|
1247 |
// Certificates must be present since this field was added
|
|
|
1248 |
eap->iEAPSettings->iCertificatesPresent = ETrue;
|
|
|
1249 |
eap->iCertificate->SetIsEnabledPresent();
|
|
|
1250 |
eap->iCertificate->SetIsEnabled(ETrue) ;
|
|
|
1251 |
|
|
|
1252 |
}// else if
|
|
|
1253 |
else if( ( aParameter.Name().Compare( EAPSERNUM ) ) == 0 )
|
|
|
1254 |
{
|
|
|
1255 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSERNUM" ) );
|
|
|
1256 |
|
|
|
1257 |
eap->iCertificate->SetSerialNumber(value);
|
|
|
1258 |
eap->iCertificate->SetSerialNumberPresent();
|
|
|
1259 |
}// else if
|
|
|
1260 |
|
|
|
1261 |
else if( ( aParameter.Name().Compare( EAPSUBKEYID ) ) == 0 )
|
|
|
1262 |
{
|
|
|
1263 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPSUBKEYID" ) );
|
|
|
1264 |
|
|
|
1265 |
_LIT(KHexIdLC, "0x");
|
|
|
1266 |
_LIT(KHexIdUC, "0X");
|
|
|
1267 |
TBuf<2> HexIdBuf;
|
|
|
1268 |
TInt keyLen = aParameter.Value().Length();
|
|
|
1269 |
|
|
|
1270 |
// setting the given key to the key buffer
|
|
|
1271 |
TBuf<KMaxSubKeyLenght> origKey;
|
|
|
1272 |
origKey.SetLength(keyLen);
|
|
|
1273 |
origKey = aParameter.Value();
|
|
|
1274 |
TBuf<KMaxSubKeyLenght> key;
|
|
|
1275 |
TLex tmpByte;
|
|
|
1276 |
TInt err(KErrNone);
|
|
|
1277 |
TUint16 byte;
|
|
|
1278 |
|
|
|
1279 |
// Remove possible spaces from the beginning
|
|
|
1280 |
origKey.TrimLeft();
|
|
|
1281 |
|
|
|
1282 |
// if the key is over two chars long, then we have to check
|
|
|
1283 |
// whether there is 0x or 0X in the beginning
|
|
|
1284 |
if (origKey.Length() >= 2)
|
|
|
1285 |
{
|
|
|
1286 |
// Copy the two left most characters in to the buffer
|
|
|
1287 |
HexIdBuf.Copy(origKey.Left(2));
|
|
|
1288 |
|
|
|
1289 |
// If the first characters are 0x or 0X, then they should be ignored
|
|
|
1290 |
if (HexIdBuf.Compare(KHexIdLC) == 0
|
|
|
1291 |
|| HexIdBuf.Compare(KHexIdUC) == 0)
|
|
|
1292 |
{
|
|
|
1293 |
// delete two characters
|
|
|
1294 |
origKey.Delete(0, 2);
|
|
|
1295 |
}
|
|
|
1296 |
}
|
|
|
1297 |
|
|
|
1298 |
// looping the subject key through, removing whitespaces
|
|
|
1299 |
for (TInt i = 0; i < keyLen; i++)
|
|
|
1300 |
{
|
|
|
1301 |
// removing white spaces from the left side of the key
|
|
|
1302 |
origKey.TrimLeft();
|
|
|
1303 |
// check that there are characters left
|
|
|
1304 |
if (origKey.Length() >= 2)
|
|
|
1305 |
{
|
|
|
1306 |
// pick the two left most bytes from the key
|
|
|
1307 |
tmpByte = origKey.Left(2);
|
|
|
1308 |
// convert byte into binary format
|
|
|
1309 |
err = tmpByte.Val(byte, EHex);
|
|
|
1310 |
|
|
|
1311 |
// delete two characters from the left side of the character array in the buffer
|
|
|
1312 |
origKey.Delete(0, 2);
|
|
|
1313 |
|
|
|
1314 |
// check whether conversion to decimal went ok
|
|
|
1315 |
if (err != KErrNone)
|
|
|
1316 |
{
|
|
|
1317 |
// if there are problems, then leave the loop
|
|
|
1318 |
break;
|
|
|
1319 |
}
|
|
|
1320 |
|
|
|
1321 |
// store the appended byte into the key variable
|
|
|
1322 |
key.Append(byte);
|
|
|
1323 |
}
|
|
|
1324 |
|
|
|
1325 |
else if (origKey.Length() == 1)
|
|
|
1326 |
{
|
|
|
1327 |
// pick the left most bytes from the key
|
|
|
1328 |
tmpByte = origKey.Left(1);
|
|
|
1329 |
// convert byte into binary format
|
|
|
1330 |
err = tmpByte.Val(byte, EHex);
|
|
|
1331 |
|
|
|
1332 |
// delete two characters from the left side of the character array in the buffer
|
|
|
1333 |
origKey.Delete(0, 1);
|
|
|
1334 |
|
|
|
1335 |
// check whether conversion to decimal went ok
|
|
|
1336 |
if (err != KErrNone)
|
|
|
1337 |
{
|
|
|
1338 |
// if there are problems, then leave the loop
|
|
|
1339 |
break;
|
|
|
1340 |
}
|
|
|
1341 |
|
|
|
1342 |
// store the appended byte into the key variable
|
|
|
1343 |
key.Append(byte);
|
|
|
1344 |
}
|
|
|
1345 |
else
|
|
|
1346 |
{
|
|
|
1347 |
break;
|
|
|
1348 |
}
|
|
|
1349 |
}
|
|
|
1350 |
TBuf8<KMaxSubKeyLenght> keyIdentifier;
|
|
|
1351 |
keyIdentifier.Copy(key);
|
|
|
1352 |
// store key value only if no errors occurred
|
|
|
1353 |
if (err == KErrNone)
|
|
|
1354 |
{
|
|
|
1355 |
eap->iCertificate->SetSubjectKeyId(keyIdentifier);
|
|
|
1356 |
eap->iCertificate->SetSubjectKeyIdPresent();
|
|
|
1357 |
eap->iEAPSettings->iCertificatesPresent = ETrue;
|
|
|
1358 |
}
|
|
|
1359 |
}
|
|
|
1360 |
|
|
|
1361 |
|
|
|
1362 |
else if( ( aParameter.Name().Compare( EAPTHUMBPRINT ) ) == 0 )
|
|
|
1363 |
{
|
|
|
1364 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::HandleEAPParametersL EAPTHUMBPRINT" ) );
|
|
|
1365 |
eap->iCertificate->SetThumbprintPresent();
|
|
|
1366 |
eap->iCertificate->SetThumbprint(value);
|
|
|
1367 |
}// else if
|
|
|
1368 |
}
|
|
|
1369 |
|
|
|
1370 |
|
|
|
1371 |
// -----------------------------------------------------------------------------
|
|
|
1372 |
// CWPAPNapdef::CWPAPNapdef
|
|
|
1373 |
// C++ default constructor can NOT contain any code, that
|
|
|
1374 |
// might leave.
|
|
|
1375 |
// -----------------------------------------------------------------------------
|
|
|
1376 |
//
|
|
|
1377 |
CWPAPNapdef::CWPAPNapdef( TBool aFollowingLink,
|
|
|
1378 |
const TDesC& aDefaultName,
|
|
|
1379 |
CWPCharacteristic& aLogicalCharacteristic )
|
|
|
1380 |
: CWPAPItemBase( aDefaultName ),
|
|
|
1381 |
iCharacteristic( aLogicalCharacteristic ),
|
|
|
1382 |
iFollowingLink( aFollowingLink )
|
|
|
1383 |
{
|
|
|
1384 |
}
|
|
|
1385 |
|
|
|
1386 |
// -----------------------------------------------------------------------------
|
|
|
1387 |
// CWPAPNapdef::ConstructL
|
|
|
1388 |
// Symbian 2nd phase constructor can leave.
|
|
|
1389 |
// -----------------------------------------------------------------------------
|
|
|
1390 |
//
|
|
|
1391 |
void CWPAPNapdef::ConstructL()
|
|
|
1392 |
{
|
|
|
1393 |
iLingerValue = NULL;
|
|
|
1394 |
iLingerFlag = ETrue;
|
|
|
1395 |
iInternetIndicator = -1;
|
|
|
1396 |
//checks if Wlan feature is supported
|
|
|
1397 |
FeatureManager::InitializeLibL();
|
|
|
1398 |
iWlanSupported = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
|
|
|
1399 |
FeatureManager::UnInitializeLib();
|
|
|
1400 |
}
|
|
|
1401 |
|
|
|
1402 |
// -----------------------------------------------------------------------------
|
|
|
1403 |
// CWPAPNapdef::SaveWlanDataL
|
|
|
1404 |
// -----------------------------------------------------------------------------
|
|
|
1405 |
//
|
|
|
1406 |
void CWPAPNapdef::SaveWlanDataL( TUint32 aIapId, CCommsDatabase& aCommsDb )
|
|
|
1407 |
{
|
|
|
1408 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL APid: (%d)"), aIapId) );
|
|
|
1409 |
|
|
|
1410 |
if ( iBearer == KUidWlanBearerType )
|
|
|
1411 |
{
|
|
|
1412 |
CCommsDbTableView* wLanServiceTable;
|
|
|
1413 |
|
|
|
1414 |
// CMManager
|
|
|
1415 |
// Search the Iap Service Id using the received IapId
|
|
|
1416 |
RCmConnectionMethodExt cm = iCm->ConnectionMethodL( aIapId );
|
|
|
1417 |
TUint32 serviceId = cm.GetIntAttributeL( CMManager::ECmIapServiceId );
|
|
|
1418 |
|
|
|
1419 |
// The BeginTransaction might fail if someone else has locked CommsDat
|
|
|
1420 |
TInt dberr = aCommsDb.BeginTransaction();
|
|
|
1421 |
if( dberr == KErrLocked )
|
|
|
1422 |
{
|
|
|
1423 |
// Try BeginTransaction again to get lock
|
|
|
1424 |
TInt retry = KBeginTransRetryCount;
|
|
|
1425 |
while ( retry > 0 && dberr == KErrLocked )
|
|
|
1426 |
{
|
|
|
1427 |
User::After(KBeginTransRetryDelay);
|
|
|
1428 |
dberr = aCommsDb.BeginTransaction();
|
|
|
1429 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL: Database locked. BeginTransaction retry." ) );
|
|
|
1430 |
retry--;
|
|
|
1431 |
}
|
|
|
1432 |
if(dberr != KErrNone)
|
|
|
1433 |
{
|
|
|
1434 |
// Could not get lock to CommsDat at all
|
|
|
1435 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL: BeginTransaction failed completely." ) );
|
|
|
1436 |
User::Leave( dberr );
|
|
|
1437 |
}
|
|
|
1438 |
}
|
|
|
1439 |
|
|
|
1440 |
TInt indexToSec = 0;
|
|
|
1441 |
wLanServiceTable = aCommsDb.OpenViewMatchingUintLC(
|
|
|
1442 |
TPtrC( WLAN_SERVICE ), TPtrC( WLAN_SERVICE_ID ), serviceId );
|
|
|
1443 |
TInt errorCode = wLanServiceTable->GotoFirstRecord();
|
|
|
1444 |
|
|
|
1445 |
if ( errorCode == KErrNone )
|
|
|
1446 |
{
|
|
|
1447 |
indexToSec = serviceId;
|
|
|
1448 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL updaterecord" ) );
|
|
|
1449 |
wLanServiceTable->UpdateRecord();
|
|
|
1450 |
}
|
|
|
1451 |
else
|
|
|
1452 |
{
|
|
|
1453 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL insertrecord" ) );
|
|
|
1454 |
TUint32 dummyUid( 0 );
|
|
|
1455 |
User::LeaveIfError( wLanServiceTable->InsertRecord( dummyUid ) );
|
|
|
1456 |
|
|
|
1457 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL WLAN_SERVICE_ID" ) );
|
|
|
1458 |
// Save link to LAN service
|
|
|
1459 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_SERVICE_ID ), aIapId );
|
|
|
1460 |
indexToSec = aIapId;
|
|
|
1461 |
}
|
|
|
1462 |
|
|
|
1463 |
// Setting the security mode manually, because CMManager does not do that
|
|
|
1464 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_SECURITY_MODE ), iSecMode );
|
|
|
1465 |
|
|
|
1466 |
if( iSecSSID.Count() )
|
|
|
1467 |
{
|
|
|
1468 |
CCommsDbTableView* wLanSecserviceTable;
|
|
|
1469 |
wLanSecserviceTable = aCommsDb.OpenTableLC( TPtrC( WLAN_SECONDARY_SSID ) );
|
|
|
1470 |
//CleanupStack::Pop(wLanSecserviceTable); // wLanSecserviceTable
|
|
|
1471 |
TBuf<4> blank;
|
|
|
1472 |
blank.Append(KNullDesC);
|
|
|
1473 |
|
|
|
1474 |
TBool sssid = EFalse;
|
|
|
1475 |
TBool sussid = EFalse;
|
|
|
1476 |
|
|
|
1477 |
for(TInt i = 0; i < iSecSSID.Count(); i++ )
|
|
|
1478 |
{
|
|
|
1479 |
TUint32 id ;
|
|
|
1480 |
|
|
|
1481 |
|
|
|
1482 |
TInt retval = wLanSecserviceTable->InsertRecord(id);
|
|
|
1483 |
wLanSecserviceTable->WriteUintL(TPtrC(WLAN_SEC_SSID_SERVICE_ID), indexToSec );
|
|
|
1484 |
wLanSecserviceTable->WriteUintL(TPtrC(WLAN_SEC_SSID_ID), id );
|
|
|
1485 |
|
|
|
1486 |
if( iSecSSID[i]->iSSSID != NULL)
|
|
|
1487 |
sssid = ETrue;
|
|
|
1488 |
if(iSecSSID[i]->iSUSSID != NULL)
|
|
|
1489 |
sussid = ETrue;
|
|
|
1490 |
|
|
|
1491 |
if((sssid && iSecSSID[i]->iSSSID->Value() != blank) || (sussid && iSecSSID[i]->iSUSSID->Value() != blank ))
|
|
|
1492 |
{
|
|
|
1493 |
if( sssid )
|
|
|
1494 |
wLanSecserviceTable->WriteTextL(TPtrC(WLAN_SEC_SSID_SCANNED_SSID), iSecSSID[i]->iSSSID->Value());
|
|
|
1495 |
|
|
|
1496 |
if(sussid)
|
|
|
1497 |
wLanSecserviceTable->WriteTextL(TPtrC(WLAN_SEC_SSID_USED_SSID), iSecSSID[i]->iSUSSID->Value());
|
|
|
1498 |
|
|
|
1499 |
}
|
|
|
1500 |
wLanSecserviceTable->PutRecordChanges();
|
|
|
1501 |
sssid = EFalse;
|
|
|
1502 |
sussid = EFalse;
|
|
|
1503 |
}
|
|
|
1504 |
CleanupStack::PopAndDestroy( wLanSecserviceTable );
|
|
|
1505 |
}
|
|
|
1506 |
|
|
|
1507 |
iSecSSID.ResetAndDestroy();
|
|
|
1508 |
iSecSSID.Close();
|
|
|
1509 |
if ( iPriSSID )
|
|
|
1510 |
{
|
|
|
1511 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL NU_WLAN_SSID" ) );
|
|
|
1512 |
// Save NU_WLAN_SSID
|
|
|
1513 |
wLanServiceTable->WriteTextL( TPtrC(NU_WLAN_SSID), iPriSSID->Value() );
|
|
|
1514 |
}
|
|
|
1515 |
if ( iPriUSSID )
|
|
|
1516 |
{
|
|
|
1517 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL WLAN_USED_SSID" ) );
|
|
|
1518 |
// Save WLAN_USED_SSID
|
|
|
1519 |
wLanServiceTable->WriteTextL( TPtrC(WLAN_USED_SSID), iPriUSSID->Value() );
|
|
|
1520 |
}
|
|
|
1521 |
if ( iPriHSSID )
|
|
|
1522 |
{
|
|
|
1523 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL WLAN_SCAN_SSID" ) );
|
|
|
1524 |
// Save WLAN_SCAN_SSID
|
|
|
1525 |
wLanServiceTable->WriteBoolL( TPtrC(WLAN_SCAN_SSID), ETrue );
|
|
|
1526 |
}
|
|
|
1527 |
else
|
|
|
1528 |
{
|
|
|
1529 |
wLanServiceTable->WriteBoolL( TPtrC(WLAN_SCAN_SSID), EFalse );
|
|
|
1530 |
}
|
|
|
1531 |
|
|
|
1532 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL WLAN_WEP_INDEX" ) );
|
|
|
1533 |
// Save index of key in use
|
|
|
1534 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_INDEX ),
|
|
|
1535 |
(TUint32&) iDefaultWepKeyIndex );
|
|
|
1536 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL WLAN_WEP_INDEX: (%d)"), iDefaultWepKeyIndex) );
|
|
|
1537 |
|
|
|
1538 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL NU_WLAN_AUTHENTICATION_MODE" ) );
|
|
|
1539 |
// Open / Shared (0/1)
|
|
|
1540 |
// Save index of key in use
|
|
|
1541 |
wLanServiceTable->WriteUintL( TPtrC( NU_WLAN_AUTHENTICATION_MODE ),
|
|
|
1542 |
( TUint32& ) iAuthentication );
|
|
|
1543 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL NU_WLAN_AUTHENTICATION_MODE: (%d)"), iAuthentication) );
|
|
|
1544 |
|
|
|
1545 |
|
|
|
1546 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL NU_WLAN_WEP_KEY1" ) );
|
|
|
1547 |
// Save first WEP key
|
|
|
1548 |
wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY1 ), iKeyData[0] );
|
|
|
1549 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY1_FORMAT ),
|
|
|
1550 |
( TUint32& ) iKeyFormat[0] );
|
|
|
1551 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL (%S)"), &iKeyData[0] ) );
|
|
|
1552 |
|
|
|
1553 |
|
|
|
1554 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL NU_WLAN_WEP_KEY2" ) );
|
|
|
1555 |
// Save second WEP key
|
|
|
1556 |
wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY2 ), iKeyData[1] );
|
|
|
1557 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY2_FORMAT ),
|
|
|
1558 |
( TUint32& ) iKeyFormat[1] );
|
|
|
1559 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL (%S)"), &iKeyData[1] ) );
|
|
|
1560 |
|
|
|
1561 |
|
|
|
1562 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL NU_WLAN_WEP_KEY3" ) );
|
|
|
1563 |
// Save third WEP key
|
|
|
1564 |
wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY3 ), iKeyData[2] );
|
|
|
1565 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY3_FORMAT ),
|
|
|
1566 |
( TUint32& ) iKeyFormat[2] );
|
|
|
1567 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL (%S)"), &iKeyData[2] ) );
|
|
|
1568 |
|
|
|
1569 |
|
|
|
1570 |
|
|
|
1571 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL NU_WLAN_WEP_KEY4" ) );
|
|
|
1572 |
// Save fourth WEP key
|
|
|
1573 |
wLanServiceTable->WriteTextL( TPtrC( NU_WLAN_WEP_KEY4 ), iKeyData[3] );
|
|
|
1574 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WEP_KEY4_FORMAT ),
|
|
|
1575 |
( TUint32& ) iKeyFormat[3] );
|
|
|
1576 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL (%S)"), &iKeyData[3] ) );
|
|
|
1577 |
|
|
|
1578 |
|
|
|
1579 |
if ( iWpaPresKeyAsc )
|
|
|
1580 |
{
|
|
|
1581 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL convert WPAKEY to ascii" ) );
|
|
|
1582 |
// convert unicode to 8-bit ascii
|
|
|
1583 |
TBuf8<KMaxWpaPskLength> wpaKey;
|
|
|
1584 |
StrCopy( wpaKey, iWpaPresKeyAsc->Value() );
|
|
|
1585 |
|
|
|
1586 |
// Enable WPA Pre Shared key mode
|
|
|
1587 |
wLanServiceTable->WriteBoolL( TPtrC( WLAN_ENABLE_WPA_PSK ), ETrue );
|
|
|
1588 |
|
|
|
1589 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL WLAN_WPA_PRE_SHARED_KEY" ) );
|
|
|
1590 |
// Save PreShared Key
|
|
|
1591 |
wLanServiceTable->WriteTextL( TPtrC( WLAN_WPA_PRE_SHARED_KEY ),
|
|
|
1592 |
wpaKey );
|
|
|
1593 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteUintL WLAN_WPA_KEY_LENGTH" ) );
|
|
|
1594 |
// Save PreShared Key Length
|
|
|
1595 |
wLanServiceTable->WriteUintL( TPtrC( WLAN_WPA_KEY_LENGTH ),
|
|
|
1596 |
wpaKey.Length() );
|
|
|
1597 |
}
|
|
|
1598 |
|
|
|
1599 |
TBuf<KMaxLengthOfEapList> eapList;
|
|
|
1600 |
eapList.Copy(KEapAll);
|
|
|
1601 |
|
|
|
1602 |
for (TInt i=0;i<iEapTypeArray.Count();i++)
|
|
|
1603 |
{
|
|
|
1604 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings" ) );
|
|
|
1605 |
CEapTypeElement* eap = iEapTypeArray[i];
|
|
|
1606 |
|
|
|
1607 |
if ( eap->iEAPSettings->iCertificatesPresent )
|
|
|
1608 |
{
|
|
|
1609 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL Certificate was present." ) );
|
|
62
|
1610 |
eap->iEAPSettings->iCertificates.AppendL( eap->iCertificate );
|
|
47
|
1611 |
}
|
|
|
1612 |
|
|
|
1613 |
// Save EAP list
|
|
|
1614 |
if ( eap->iEapTypeString.Length() > 0
|
|
|
1615 |
&& eap->iEncapsulatingExpandedEapId.Length() == 0) // AND method is not encapsulated
|
|
|
1616 |
{
|
|
|
1617 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL WriteTextL WLAN_EAPS" ) );
|
|
|
1618 |
|
|
|
1619 |
TBuf8<3> buf;
|
|
|
1620 |
_LIT8(KFormat, "%d");
|
|
|
1621 |
// pick the last byte from the array
|
|
|
1622 |
buf.Format(KFormat, eap->iEapTypeString[KExpandedEapIdLength - 1]);
|
|
|
1623 |
// search for the correct offset for the eap type from the KEapAll literal
|
|
|
1624 |
TInt index = KEapAll().Find(buf);
|
|
|
1625 |
|
|
|
1626 |
const TUint8 offset = 2; //length = f "-0" string
|
|
|
1627 |
// Add '+' to the correct offset, so that the eap is repsesented activated in the list
|
|
|
1628 |
if(index >= offset)
|
|
|
1629 |
{
|
|
|
1630 |
eapList[index-offset] = KEapPlus;
|
|
|
1631 |
}
|
|
|
1632 |
|
|
|
1633 |
}
|
|
|
1634 |
// Set iEncapsulatingEapTypes
|
|
|
1635 |
for ( TInt j = 0; j < iEapTypeArray.Count(); j++ )
|
|
|
1636 |
{
|
|
|
1637 |
// Check if any method has this method as the encapsulating method
|
|
|
1638 |
if ( eap->iEapTypeString == iEapTypeArray[j]->iEncapsulatingExpandedEapId )
|
|
|
1639 |
{
|
|
|
1640 |
// Append this method to iEncapsulatedEAPType
|
|
|
1641 |
eap->iEAPSettings->iEnabledEncapsulatedEAPExpandedTypes.Append( iEapTypeArray[j]->iEAPSettings->iEAPExpandedType );
|
|
|
1642 |
eap->iEAPSettings->iEnabledEncapsulatedEAPExpandedTypesPresent = ETrue;
|
|
|
1643 |
}
|
|
|
1644 |
}
|
|
|
1645 |
|
|
|
1646 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings CEapType::NewL" ) );
|
|
|
1647 |
CEapType* eapType = NULL;
|
|
|
1648 |
|
|
|
1649 |
|
|
|
1650 |
TRAPD( error, ( eapType = CEapType::NewL( ELan, serviceId, eap->iEAPSettings->iEAPExpandedType ) ) );
|
|
|
1651 |
|
|
|
1652 |
if ( ( error == KErrNone ) && eapType )
|
|
|
1653 |
{
|
|
|
1654 |
CleanupStack::PushL( eapType );
|
|
|
1655 |
|
|
|
1656 |
// Check if this type is tunneled
|
|
|
1657 |
if ( eap->iEncapsulatingExpandedEapId.Length() > 0 )
|
|
|
1658 |
{
|
|
|
1659 |
// It is tunneled.
|
|
|
1660 |
eapType->SetTunnelingType( eap->iEncapsulatingExpandedEapId);
|
|
|
1661 |
|
|
|
1662 |
}
|
|
|
1663 |
|
|
|
1664 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings SetConfigurationL" ) );
|
|
|
1665 |
TRAP_IGNORE( eapType->SetConfigurationL( *eap->iEAPSettings ) );
|
|
|
1666 |
|
|
|
1667 |
CleanupStack::PopAndDestroy( eapType );
|
|
|
1668 |
|
|
|
1669 |
}
|
|
|
1670 |
else
|
|
|
1671 |
{
|
|
|
1672 |
FTRACE(RDebug::Print(_L("[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL CEapType::NewL err: %d"), error ) );
|
|
|
1673 |
}
|
|
|
1674 |
|
|
|
1675 |
|
|
|
1676 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL save EAP settings done" ) );
|
|
|
1677 |
}
|
|
|
1678 |
|
|
|
1679 |
|
|
|
1680 |
|
|
|
1681 |
// Expanded EAP types in use. Write the eap list to the new columns.
|
|
|
1682 |
|
|
|
1683 |
// generate appropriate entries in the new enabled and disabled list,
|
|
|
1684 |
// overwriting those values
|
|
|
1685 |
|
|
|
1686 |
// count the + and - signs to determine the size of enabled and
|
|
|
1687 |
// disabled descriptors
|
|
|
1688 |
|
|
|
1689 |
TLex lex( eapList );
|
|
|
1690 |
TInt numPlus = 0;
|
|
|
1691 |
TInt numMinus = 0;
|
|
|
1692 |
TChar ch;
|
|
|
1693 |
while ( !lex.Eos() )
|
|
|
1694 |
{
|
|
|
1695 |
ch = lex.Get();
|
|
|
1696 |
if ( ch == '+' ) ++numPlus;
|
|
|
1697 |
else if ( ch == '-' ) ++numMinus;
|
|
|
1698 |
}
|
|
|
1699 |
// load general EAP settings If
|
|
|
1700 |
CEapGeneralSettings* genSettings;
|
|
|
1701 |
genSettings = CEapGeneralSettings::NewL(ELan, serviceId);
|
|
|
1702 |
CleanupStack::PushL( genSettings );
|
|
|
1703 |
|
|
|
1704 |
// get lists of enabled/disabled EAPs for the IAP
|
|
|
1705 |
|
|
|
1706 |
RArray<TEapExpandedType> enabledEapMethods;
|
|
|
1707 |
RArray<TEapExpandedType> disabledEapMethods;
|
|
|
1708 |
|
|
|
1709 |
enabledEapMethods.Reset();
|
|
|
1710 |
disabledEapMethods.Reset();
|
|
|
1711 |
|
|
|
1712 |
|
|
|
1713 |
// each entry consumes 8 bytes in binary format
|
|
|
1714 |
HBufC8* enabledEAPPlugin = HBufC8::NewL( 8 * numPlus );
|
|
|
1715 |
CleanupStack::PushL( enabledEAPPlugin );
|
|
|
1716 |
|
|
|
1717 |
HBufC8* disabledEAPPlugin = HBufC8::NewL( 8 * numMinus );
|
|
|
1718 |
CleanupStack::PushL( disabledEAPPlugin );
|
|
|
1719 |
|
|
|
1720 |
lex.Assign( eapList );
|
|
|
1721 |
|
|
|
1722 |
while ( !lex.Eos() )
|
|
|
1723 |
{
|
|
|
1724 |
// beginning of implementation UID
|
|
|
1725 |
TInt16 implUid = 0;
|
|
|
1726 |
|
|
|
1727 |
if ( lex.Val( implUid ) != KErrNone || !implUid )
|
|
|
1728 |
{
|
|
|
1729 |
// if the old string is corrupted, null out both lists
|
|
|
1730 |
enabledEAPPlugin->Des().Zero();
|
|
|
1731 |
disabledEAPPlugin->Des().Zero();
|
|
|
1732 |
break;
|
|
|
1733 |
}
|
|
|
1734 |
|
|
|
1735 |
// append it to the appropriate list ('+' enabled, '-' disabled)
|
|
|
1736 |
_LIT8( KPadding, "\xFE\0\0\0\0\0\0" );
|
|
|
1737 |
_LIT8( KMsChapV2Padding, "\xFE\xFF\xFF\xFF\0\0\0");
|
|
|
1738 |
const TInt KPlainMsChapV2ImplUid = 99;
|
|
|
1739 |
|
|
|
1740 |
if ( implUid > 0 )
|
|
|
1741 |
{
|
|
|
1742 |
enabledEAPPlugin->Des().Append(
|
|
|
1743 |
Abs( implUid ) == KPlainMsChapV2ImplUid?
|
|
|
1744 |
KMsChapV2Padding: KPadding );
|
|
|
1745 |
enabledEAPPlugin->Des().Append( Abs( implUid ) );
|
|
|
1746 |
TPtrC8 data(reinterpret_cast<TUint8*>(&implUid), KExpandedEapIdLength);
|
|
|
1747 |
TEapExpandedType expandedType;
|
|
|
1748 |
expandedType.SetValue(enabledEAPPlugin,KEapExpandedTypeLength);
|
|
|
1749 |
enabledEapMethods.Append(expandedType);
|
|
|
1750 |
}
|
|
|
1751 |
|
|
|
1752 |
// swallow the delimiter (',')
|
|
|
1753 |
lex.Get();
|
|
|
1754 |
}
|
|
|
1755 |
|
|
|
1756 |
genSettings->SetEapMethods(enabledEapMethods, disabledEapMethods);
|
|
|
1757 |
|
|
|
1758 |
|
|
|
1759 |
|
|
|
1760 |
CleanupStack::PopAndDestroy( disabledEAPPlugin );
|
|
|
1761 |
CleanupStack::PopAndDestroy( enabledEAPPlugin );
|
|
|
1762 |
CleanupStack::PopAndDestroy( genSettings );
|
|
|
1763 |
|
|
|
1764 |
|
|
|
1765 |
|
|
|
1766 |
|
|
|
1767 |
iEapTypeArray.ResetAndDestroy();
|
|
|
1768 |
wLanServiceTable->PutRecordChanges();
|
|
|
1769 |
|
|
|
1770 |
|
|
|
1771 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL PutRecordChanges" ) );
|
|
|
1772 |
CleanupStack::PopAndDestroy( wLanServiceTable );
|
|
|
1773 |
|
|
|
1774 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL done" ) );
|
|
|
1775 |
aCommsDb.CommitTransaction();
|
|
|
1776 |
}
|
|
|
1777 |
else
|
|
|
1778 |
{
|
|
|
1779 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::SaveWlanDataL ignored not a WLAN AP" ) );
|
|
|
1780 |
}
|
|
|
1781 |
|
|
|
1782 |
}
|
|
|
1783 |
|
|
|
1784 |
//------------------------------------------------------------------------------
|
|
|
1785 |
// CWPAPNapdef::ConvertAsciiToHex
|
|
|
1786 |
//------------------------------------------------------------------------------
|
|
|
1787 |
//
|
|
|
1788 |
void CWPAPNapdef::ConvertAsciiToHex( const TDesC8& aSource, HBufC8*& aDest )
|
|
|
1789 |
{
|
|
|
1790 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertAsciiToHex" ) );
|
|
|
1791 |
|
|
|
1792 |
_LIT( hex, "0123456789ABCDEF" );
|
|
|
1793 |
TInt size = aSource.Size();
|
|
|
1794 |
TPtr8 ptr = aDest->Des();
|
|
|
1795 |
for ( TInt ii = 0; ii < size; ii++ )
|
|
|
1796 |
{
|
|
|
1797 |
TText8 ch = aSource[ii];
|
|
|
1798 |
ptr.Append( hex()[(ch/16)&0x0f] );
|
|
|
1799 |
ptr.Append( hex()[ch&0x0f] );
|
|
|
1800 |
}
|
|
|
1801 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertAsciiToHex Done" ) );
|
|
|
1802 |
}
|
|
|
1803 |
|
|
|
1804 |
// -----------------------------------------------------------------------------
|
|
|
1805 |
// CWPAPNapdef::StrCopy
|
|
|
1806 |
// String copy with lenght check.
|
|
|
1807 |
// -----------------------------------------------------------------------------
|
|
|
1808 |
//
|
|
|
1809 |
void CWPAPNapdef::StrCopy( TDes8& aTarget, const TDesC& aSource )
|
|
|
1810 |
{
|
|
|
1811 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::StrCopy" ) );
|
|
|
1812 |
|
|
|
1813 |
TInt len = aTarget.MaxLength();
|
|
|
1814 |
if( len < aSource.Length() )
|
|
|
1815 |
{
|
|
|
1816 |
aTarget.Copy( aSource.Left( len ) );
|
|
|
1817 |
return;
|
|
|
1818 |
}
|
|
|
1819 |
aTarget.Copy( aSource );
|
|
|
1820 |
|
|
|
1821 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::StrCopy Done" ) );
|
|
|
1822 |
}
|
|
|
1823 |
|
|
|
1824 |
CEapTypeElement::~CEapTypeElement()
|
|
|
1825 |
{
|
|
|
1826 |
delete iEAPSettings;
|
|
|
1827 |
delete iCertificate;
|
|
|
1828 |
}
|
|
|
1829 |
|
|
|
1830 |
// -----------------------------------------------------------------------------
|
|
|
1831 |
// CWPAPNapdef::UpdateLingerL
|
|
|
1832 |
//
|
|
|
1833 |
// -----------------------------------------------------------------------------
|
|
|
1834 |
//
|
|
|
1835 |
void CWPAPNapdef::UpdateLingerL(const TUint32 aIapId)
|
|
|
1836 |
{
|
|
|
1837 |
if ( iLinger && ( !iLingerFlag ) )
|
|
|
1838 |
{
|
|
|
1839 |
AddLingerL( aIapId , iLingerValue );
|
|
|
1840 |
}
|
|
|
1841 |
|
|
|
1842 |
}
|
|
|
1843 |
|
|
|
1844 |
// -----------------------------------------------------------------------------
|
|
|
1845 |
// CWPAPNapdef::UdateligerValueL
|
|
|
1846 |
//
|
|
|
1847 |
// -----------------------------------------------------------------------------
|
|
|
1848 |
//
|
|
|
1849 |
void CWPAPNapdef::UdateligerValueL(CWPParameter* aLinger)
|
|
|
1850 |
{
|
|
|
1851 |
TInt err(KErrNone);
|
|
|
1852 |
const TDesC& value = aLinger->Value();
|
|
|
1853 |
if( !Notalpha(value))
|
|
|
1854 |
{
|
|
|
1855 |
TLex lex( value );
|
|
|
1856 |
TUint Linger = 0;
|
|
|
1857 |
TInt lingerint;
|
|
|
1858 |
err = lex.Val( Linger, EDecimal );
|
|
|
1859 |
if( err == KErrNone )
|
|
|
1860 |
{
|
|
|
1861 |
lingerint = Linger;
|
|
|
1862 |
if( lingerint >= 0 )
|
|
|
1863 |
{
|
|
|
1864 |
iLingerValue = lingerint;
|
|
|
1865 |
iLingerFlag = EFalse;
|
|
|
1866 |
}
|
|
|
1867 |
}
|
|
|
1868 |
}
|
|
|
1869 |
}
|
|
|
1870 |
|
|
|
1871 |
// -----------------------------------------------------------------------------
|
|
|
1872 |
// CWPAPNapdef::UdateligerValueL
|
|
|
1873 |
//
|
|
|
1874 |
// -----------------------------------------------------------------------------
|
|
|
1875 |
//
|
|
|
1876 |
TBool CWPAPNapdef::Notalpha(const TDesC& aValue)
|
|
|
1877 |
{
|
|
|
1878 |
TBool NotAlpha = EFalse;
|
|
|
1879 |
TChar character;
|
|
|
1880 |
for(TInt i = 0 ; i < aValue.Length(); i++)
|
|
|
1881 |
{
|
|
|
1882 |
character = aValue[i];
|
|
|
1883 |
NotAlpha = character.IsAlpha();
|
|
|
1884 |
if(NotAlpha)
|
|
|
1885 |
break;
|
|
|
1886 |
}
|
|
|
1887 |
|
|
|
1888 |
return NotAlpha;
|
|
|
1889 |
}
|
|
|
1890 |
|
|
|
1891 |
|
|
|
1892 |
// ---------------------------------------------------------------------------
|
|
|
1893 |
// Adds iapID and linger interval to CentralRepository
|
|
|
1894 |
// ---------------------------------------------------------------------------
|
|
|
1895 |
//
|
|
|
1896 |
void CWPAPNapdef::AddLingerL( const TInt aIapId, const TInt aLingerInterval )
|
|
|
1897 |
{
|
|
|
1898 |
TInt err( KErrNone );
|
|
|
1899 |
|
|
|
1900 |
// Open repository
|
|
|
1901 |
CRepository* repository = CRepository::NewLC( KCRUidPDPContextManager );
|
|
|
1902 |
|
|
|
1903 |
// Find if an entry for "iapId" already exists in CentRep
|
|
|
1904 |
RArray< TUint32 > foundKeys;
|
|
|
1905 |
foundKeys.Reset();
|
|
|
1906 |
|
|
|
1907 |
err = repository->FindEqL( KIapColumn, // partial key
|
|
|
1908 |
KColumnMask, // key mask
|
|
|
1909 |
aIapId, // value
|
|
|
1910 |
foundKeys ); // found keys
|
|
|
1911 |
|
|
|
1912 |
if ( err == KErrNone || err == KErrNotFound )
|
|
|
1913 |
{
|
|
|
1914 |
if ( foundKeys.Count() == 0 )
|
|
|
1915 |
{
|
|
|
1916 |
// Add a new entry
|
|
|
1917 |
TInt arrayCount( 0 );
|
|
|
1918 |
|
|
|
1919 |
// Get number of iapId&linger entries in Centrep
|
|
|
1920 |
err = repository->Get( KPdpContextManagerLingerArrayCount,
|
|
|
1921 |
arrayCount );
|
|
|
1922 |
|
|
|
1923 |
if ( err == KErrNone )
|
|
|
1924 |
{
|
|
|
1925 |
arrayCount++;
|
|
|
1926 |
|
|
|
1927 |
err = repository->Create( ( KIapColumn | arrayCount ), aIapId );
|
|
|
1928 |
|
|
|
1929 |
if ( err == KErrNone )
|
|
|
1930 |
{
|
|
|
1931 |
err = repository->Create( ( KLingerColumn | arrayCount ),
|
|
|
1932 |
aLingerInterval );
|
|
|
1933 |
}
|
|
|
1934 |
|
|
|
1935 |
if ( err == KErrNone )
|
|
|
1936 |
{
|
|
|
1937 |
// Update number of iapId&linger entries in Centrep
|
|
|
1938 |
err = repository->Set( KPdpContextManagerLingerArrayCount,
|
|
|
1939 |
arrayCount );
|
|
|
1940 |
}
|
|
|
1941 |
}
|
|
|
1942 |
}
|
|
|
1943 |
else
|
|
|
1944 |
{
|
|
|
1945 |
// Update existing entry on current row
|
|
|
1946 |
TInt32 row = foundKeys[ 0 ] & KRowMask;
|
|
|
1947 |
|
|
|
1948 |
err = repository->Set( ( KLingerColumn | row ), aLingerInterval );
|
|
|
1949 |
}
|
|
|
1950 |
}
|
|
|
1951 |
|
|
|
1952 |
foundKeys.Close();
|
|
|
1953 |
CleanupStack::PopAndDestroy( repository );
|
|
|
1954 |
|
|
|
1955 |
User::LeaveIfError( err );
|
|
|
1956 |
|
|
|
1957 |
}
|
|
|
1958 |
|
|
|
1959 |
void CWPAPNapdef::ConvertEAPStringToIds( const TDesC& aEAPString, TDes8& aExpandedId, TEapExpandedType& aID)
|
|
|
1960 |
{
|
|
|
1961 |
if ( aEAPString == KEAPSIM )
|
|
|
1962 |
{
|
|
|
1963 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapSim" ) );
|
|
|
1964 |
aExpandedId.Copy( KEapSimTypeId, KExpandedEapIdLength );
|
|
|
1965 |
aID = *EapExpandedTypeSim.GetType();
|
|
|
1966 |
}
|
|
|
1967 |
else if( aEAPString == KEAPAKA )
|
|
|
1968 |
{
|
|
|
1969 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapAka" ) );
|
|
|
1970 |
aExpandedId.Copy( KEapAkaTypeId, KExpandedEapIdLength );
|
|
|
1971 |
aID = *EapExpandedTypeAka.GetType();
|
|
|
1972 |
}
|
|
|
1973 |
else if( aEAPString == KEAPTLS )
|
|
|
1974 |
{
|
|
|
1975 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapTls" ) );
|
|
|
1976 |
aExpandedId.Copy( KEapTlsTypeId, KExpandedEapIdLength );
|
|
|
1977 |
aID = *EapExpandedTypeTls.GetType();
|
|
|
1978 |
}
|
|
|
1979 |
else if( aEAPString == KEAPPEAP )
|
|
|
1980 |
{
|
|
|
1981 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapPeap" ) );
|
|
|
1982 |
aExpandedId.Copy( KEapPeapTypeId, KExpandedEapIdLength );
|
|
|
1983 |
aID = *EapExpandedTypePeap.GetType();
|
|
|
1984 |
}
|
|
|
1985 |
else if( aEAPString == KEAPTTLS )
|
|
|
1986 |
{
|
|
|
1987 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapTtls" ) );
|
|
|
1988 |
aExpandedId.Copy( KEapTtlsTypeId, KExpandedEapIdLength );
|
|
|
1989 |
aID = *EapExpandedTypeTtls.GetType();
|
|
|
1990 |
}
|
|
|
1991 |
else if( aEAPString == KEAPLEAP )
|
|
|
1992 |
{
|
|
|
1993 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapLeap" ) );
|
|
|
1994 |
aExpandedId.Copy( KEapLeapTypeId, KExpandedEapIdLength );
|
|
|
1995 |
aID = *EapExpandedTypeLeap.GetType();
|
|
|
1996 |
}
|
|
|
1997 |
else if( aEAPString == KEAPMSCHAPV2 )
|
|
|
1998 |
{
|
|
|
1999 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapMschapv2" ) );
|
|
|
2000 |
aExpandedId.Copy( KEapMschapv2TypeId, KExpandedEapIdLength );
|
|
|
2001 |
aID = *EapExpandedTypeMsChapv2.GetType();
|
|
|
2002 |
}
|
|
|
2003 |
else if( aEAPString == KEAPGTC )
|
|
|
2004 |
{
|
|
|
2005 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapGtc" ) );
|
|
|
2006 |
aExpandedId.Copy( KEapGtcTypeId, KExpandedEapIdLength );
|
|
|
2007 |
aID = *EapExpandedTypeGtc.GetType();
|
|
|
2008 |
}
|
|
|
2009 |
else if( aEAPString == KEAPFAST )
|
|
|
2010 |
{
|
|
|
2011 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapFast" ) );
|
|
|
2012 |
aExpandedId.Copy( KEapFastTypeId, KExpandedEapIdLength );
|
|
|
2013 |
aID = *EapExpandedTypeFast.GetType();
|
|
|
2014 |
}
|
|
|
2015 |
|
|
|
2016 |
else
|
|
|
2017 |
{
|
|
|
2018 |
FLOG( _L( "[AccesspointAdapter] CWPAPNapdef::ConvertEAPStringToIds EEapNone" ) );
|
|
|
2019 |
aExpandedId.Copy( KEapNoneId, KExpandedEapIdLength );
|
|
|
2020 |
aID = *EapExpandedTypeNone.GetType();
|
|
|
2021 |
}
|
|
|
2022 |
|
|
|
2023 |
}
|
|
|
2024 |
|
|
|
2025 |
// ---------------------------------------------------------------------------
|
|
|
2026 |
// Returns the NAP-ID
|
|
|
2027 |
// ---------------------------------------------------------------------------
|
|
|
2028 |
//
|
|
|
2029 |
const TDesC& CWPAPNapdef::NapId()
|
|
|
2030 |
{
|
|
|
2031 |
return iNapID->Value();
|
|
|
2032 |
}
|
|
|
2033 |
|
|
|
2034 |
// ---------------------------------------------------------------------------
|
|
|
2035 |
// Returns the bearer value
|
|
|
2036 |
// ---------------------------------------------------------------------------
|
|
|
2037 |
//
|
|
|
2038 |
TUint CWPAPNapdef::Bearer()
|
|
|
2039 |
{
|
|
|
2040 |
return iBearer;
|
|
|
2041 |
}
|
|
|
2042 |
|
|
|
2043 |
// ---------------------------------------------------------------------------
|
|
|
2044 |
// Returns the bearer value
|
|
|
2045 |
// ---------------------------------------------------------------------------
|
|
|
2046 |
//
|
|
|
2047 |
void CWPAPNapdef::SetCMManager( RCmManagerExt* aCm )
|
|
|
2048 |
{
|
|
|
2049 |
iCm = aCm;
|
|
|
2050 |
}
|
|
|
2051 |
|
|
|
2052 |
|
|
|
2053 |
|
|
|
2054 |
// End of File
|