author | hgs |
Fri, 06 Aug 2010 19:34:22 +0530 | |
changeset 39 | 3efc7a0e8755 |
parent 32 | b12ea03c50a3 |
permissions | -rw-r--r-- |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1 |
/* |
39 | 2 |
* Copyright (c) 2002-2005 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: SUPL Connection provides the Connection End point |
|
15 |
* for SUPL Session to send/receive packets from the |
|
16 |
* network |
|
17 |
* |
|
18 |
*/ |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
19 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
20 |
// INCLUDE FILES |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
21 |
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
22 |
#include <ssl_internal.h> |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
23 |
#endif |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
24 |
#include <commdbconnpref.h> |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
25 |
#include <centralrepository.h> |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
26 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
27 |
#include "epos_csuplserverprivatecrkeys.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
28 |
#include "epos_csuplconnection.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
29 |
#include "epos_csuplsocketreader.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
30 |
#include "epos_csuplsockettimer.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
31 |
#include "epos_csuplconntrace.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
32 |
#include "epos_csuplpacketinfo.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
33 |
#include "epos_psktlsusageprivatecrkeys.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
34 |
#include "epos_suplpskloger.h" |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
35 |
|
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
36 |
#include <extendedconnpref.h> //For OCC |
39 | 37 |
const TInt KMaxGBAUsageLength = 4; |
38 |
const TInt KMaxVerLength = 4; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
39 |
//const TInt KMaxNewPasswordLength = 8; |
39 | 40 |
const TInt KMaxNewPasswordLength = 16; |
41 |
const TInt KMaxPskKeyLength = 256; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
42 |
|
39 | 43 |
const TInt KMaxRootKeyLength = 32; |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
44 |
const TInt KMaxRootKeyXORLength = 16; |
39 | 45 |
//const TInt KMaxRootKeyLength = 16; |
46 |
const TInt KMaxPassKeyLength = 8; |
|
47 |
//const TInt KMaxPassKeyLength = 8; |
|
48 |
const TInt KMaxSaltLength = 128; |
|
49 |
//const TInt KMaxSaltLength = 64; |
|
50 |
||
51 |
const TInt KMaxPskIdentityHintLength = KMaxGBAUsageLength + KMaxVerLength |
|
52 |
+ KMaxPassKeyLength; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
53 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
54 |
// Constant definition |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
55 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
56 |
_LIT8(KWGBA,"WGBA"); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
57 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
58 |
_LIT(KTraceFileName,"SUPL_PH_API::epos_csuplconnection.cpp"); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
59 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
60 |
_LIT8(KSaltValue,"0x19,0x31,0x45,0x69,0x69,0x45,0x31,0x19"); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
61 |
|
39 | 62 |
void DoSelfXOR(TDes8& aDestination, const TDesC8& aSource) |
63 |
{ |
|
64 |
aDestination.Zero(); |
|
65 |
TInt half = aSource.Length() / 2; |
|
66 |
for (TInt i = 0; i < half; i++) |
|
67 |
{ |
|
68 |
aDestination.Append(aSource[i] ^ aSource[half + i]); |
|
69 |
} |
|
70 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
71 |
|
39 | 72 |
void DoXOR(TDes8& aDestination, const TDesC8& aSource1, |
73 |
const TDesC8& aSource2) |
|
74 |
{ |
|
75 |
aDestination.Zero(); |
|
76 |
TInt srcLen1 = aSource1.Length(); |
|
77 |
TInt srcLen2 = aSource2.Length(); |
|
78 |
TInt j = 0; |
|
79 |
for (TInt i = 0; i < srcLen1; i++) |
|
80 |
{ |
|
81 |
if (j >= srcLen2) |
|
82 |
{ |
|
83 |
j = 0; |
|
84 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
85 |
|
39 | 86 |
aDestination.Append(aSource1[i] ^ aSource2[j++]); |
87 |
} |
|
88 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
89 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
90 |
//0x18,0x32,0x34,0x55,0x55,0x34,0x32,0x18 |
39 | 91 |
void FormSaltKey(TDes8& aDestination, const TDesC8& aSource) |
92 |
{ |
|
93 |
TBuf8<2> seachText(_L8("0x")); |
|
94 |
aDestination.Zero(); |
|
95 |
TBuf8<KMaxSaltLength> tempSaltBuffer(aSource); |
|
96 |
TUint32 hexNumber; |
|
97 |
TBuf<2> decNumber; |
|
98 |
TInt offSet = tempSaltBuffer.Find(seachText); |
|
99 |
||
100 |
while (offSet != KErrNotFound) |
|
101 |
{ |
|
102 |
offSet += 2; |
|
103 |
decNumber.Copy(tempSaltBuffer.Mid(offSet, 2)); |
|
104 |
tempSaltBuffer.Copy(tempSaltBuffer.Mid(offSet + 2)); |
|
105 |
TLex lex(decNumber); |
|
106 |
lex.Val(hexNumber, EHex); |
|
107 |
aDestination.Append(hexNumber); |
|
108 |
offSet = tempSaltBuffer.Find(seachText); |
|
109 |
} |
|
110 |
} |
|
111 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
112 |
//void get_key(unsigned char key[],unsigned int keylength); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
113 |
|
39 | 114 |
void derive_key(const unsigned char pwd[], /* the PASSWORD */ |
115 |
unsigned int pwd_len, /* and its length */ |
|
116 |
const unsigned char salt[], /* the SALT and its */ |
|
117 |
unsigned int salt_len, /* length */ |
|
118 |
unsigned int iter, /* the number of iterations */ |
|
119 |
unsigned char key[], /* space for the output key */ |
|
120 |
unsigned int key_len);/* and its required length */ |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
121 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
122 |
// ============================ MEMBER FUNCTIONS =============================== |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
123 |
|
39 | 124 |
CSuplConnection::CSuplConnection(RSocketServ &aSocketServ) : |
125 |
CActive(EPriorityStandard), iSocketServ(aSocketServ), iRefCount(0), |
|
126 |
iState(ENotConnected), iPacket(0, 0), iVariantEnabled(ETrue), |
|
127 |
iPskTLSUsage(EFalse), iStartedListen(EFalse), iConnectStarted( |
|
128 |
EFalse), iSendInProgress(EFalse), iFirstPkt(EFalse), |
|
129 |
iListenCount(0), iPrompt(EFalse), iWlanOnly(EFalse) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
130 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
131 |
iHostAddress.Zero(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
132 |
CActiveScheduler::Add(this); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
133 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
134 |
|
39 | 135 |
void CSuplConnection::ConstructL(const TDesC &aHostAddress, |
136 |
const TUint aPort, const TInt aIAPId, MSuplPacketNotifier *aNotifier) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
137 |
{ |
39 | 138 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
139 |
iTrace = CSuplConnTrace::NewL(); |
39 | 140 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
141 |
iTrace->Trace(_L("CSuplConnection::ConstructL"), KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
142 |
SetVariation(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
143 |
iHostAddress.Append(aHostAddress); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
144 |
iPort = aPort; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
145 |
iIAPId = aIAPId; |
39 | 146 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
147 |
// Create the Secure Socket |
39 | 148 |
if (iVariantEnabled) |
149 |
{ |
|
150 |
iTrace->Trace(_L("Using CSuplConnection::Secure Construction"), |
|
151 |
KTraceFileName, __LINE__); |
|
152 |
_LIT(KTLS1, "TLS1.0"); |
|
153 |
iTlsSocket = CSecureSocket::NewL(iSocket, KTLS1); |
|
154 |
||
155 |
TBuf8<KMaxHostAddressLen> dNSName; |
|
156 |
dNSName.Copy(aHostAddress); |
|
157 |
iTlsSocket->SetOpt(KSoSSLDomainName, KSolInetSSL, dNSName); |
|
158 |
||
159 |
if (iPskTLSUsage) |
|
160 |
{ |
|
161 |
iTrace->Trace(_L("Considering PSK Ciphersuites for Usage..."), |
|
162 |
KTraceFileName, __LINE__); |
|
163 |
||
164 |
// PSK TLS Start |
|
165 |
TPckgBuf<MSoPskKeyHandler *> pskConfigPkg; |
|
166 |
pskConfigPkg() = this; |
|
167 |
User::LeaveIfError(iTlsSocket->SetOpt(KSoPskConfig, KSolInetSSL, |
|
168 |
pskConfigPkg)); |
|
169 |
// PSK TLS End |
|
170 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
171 |
|
39 | 172 |
iTlsSocket->SetDialogMode(EDialogModeUnattended); |
173 |
||
174 |
iSocketReader = CSuplSocketReader::NewL(iTlsSocket, aNotifier, |
|
175 |
iVariantEnabled); |
|
176 |
} |
|
177 |
else |
|
178 |
{ |
|
179 |
iTrace->Trace(_L("Using CSuplConnection::NonSecure Construction"), |
|
180 |
KTraceFileName, __LINE__); |
|
181 |
iSocketReader = CSuplSocketReader::NewL(iSocket, aNotifier, |
|
182 |
iVariantEnabled); |
|
183 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
184 |
iTimer = CSuplSocketTimer::NewL(this); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
185 |
|
39 | 186 |
if (iPskTLSUsage) |
187 |
{ |
|
188 |
// PSK TLS Start |
|
189 |
#if WITH_GBA_OFFF |
|
190 |
iGbaClient = CGbaClientRequestHandler::NewL(); |
|
191 |
#endif /* WITH_GBA */ |
|
192 |
// PSK TLS End |
|
193 |
} |
|
194 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
195 |
iConnArray.Reset(); |
39 | 196 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
197 |
iPktArray.Reset(); |
39 | 198 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
199 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
200 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
201 |
// CSuplConnection::ConstructL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
202 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
203 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
204 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
205 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
206 |
//------------------------------------------------------------------------------------------------------------- |
39 | 207 |
void CSuplConnection::ConstructL(const TDesC &aHostAddress, |
208 |
const TUint aPort, const TInt aIAPId, TBool aTls, TBool aPskTls, |
|
209 |
MSuplPacketNotifier *aNotifier) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
210 |
{ |
39 | 211 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
212 |
iTrace = CSuplConnTrace::NewL(); |
39 | 213 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
214 |
iTrace->Trace(_L("CSuplConnection::ConstructL"), KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
215 |
//SetVariation(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
216 |
iVariantEnabled = aTls; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
217 |
iPskTLSUsage = aPskTls; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
218 |
iHostAddress.Append(aHostAddress); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
219 |
iPort = aPort; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
220 |
iIAPId = aIAPId; |
39 | 221 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
222 |
// Create the Secure Socket |
39 | 223 |
if (iVariantEnabled) |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
224 |
{ |
39 | 225 |
iTrace->Trace(_L("Using CSuplConnection::Secure Construction"), |
226 |
KTraceFileName, __LINE__); |
|
227 |
_LIT(KTLS1, "TLS1.0"); |
|
228 |
iTlsSocket = CSecureSocket::NewL(iSocket, KTLS1); |
|
229 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
230 |
TBuf8<KMaxHostAddressLen> dNSName; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
231 |
dNSName.Copy(aHostAddress); |
39 | 232 |
iTlsSocket->SetOpt(KSoSSLDomainName, KSolInetSSL, dNSName); |
233 |
||
234 |
if (iPskTLSUsage) |
|
235 |
{ |
|
236 |
iTrace->Trace(_L("Considering PSK Ciphersuites for Usage..."), |
|
237 |
KTraceFileName, __LINE__); |
|
238 |
// PSK TLS Start |
|
239 |
TPckgBuf<MSoPskKeyHandler *> pskConfigPkg; |
|
240 |
pskConfigPkg() = this; |
|
241 |
User::LeaveIfError(iTlsSocket->SetOpt(KSoPskConfig, KSolInetSSL, |
|
242 |
pskConfigPkg)); |
|
243 |
// PSK TLS End |
|
244 |
} |
|
245 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
246 |
iTlsSocket->SetDialogMode(EDialogModeUnattended); |
39 | 247 |
|
248 |
iSocketReader = CSuplSocketReader::NewL(iTlsSocket, aNotifier, |
|
249 |
iVariantEnabled); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
250 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
251 |
else |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
252 |
{ |
39 | 253 |
iTrace->Trace(_L("Using CSuplConnection::NonSecure Construction"), |
254 |
KTraceFileName, __LINE__); |
|
255 |
iSocketReader = CSuplSocketReader::NewL(iSocket, aNotifier, |
|
256 |
iVariantEnabled); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
257 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
258 |
iTimer = CSuplSocketTimer::NewL(this); |
39 | 259 |
|
260 |
if (iPskTLSUsage) |
|
261 |
{ |
|
262 |
// PSK TLS Start |
|
263 |
#if WITH_GBA_OFFF |
|
264 |
iGbaClient = CGbaClientRequestHandler::NewL(); |
|
265 |
#endif /* WITH_GBA */ |
|
266 |
// PSK TLS End |
|
267 |
} |
|
268 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
269 |
iConnArray.Reset(); |
39 | 270 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
271 |
iPktArray.Reset(); |
39 | 272 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
273 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
274 |
|
39 | 275 |
CSuplConnection* CSuplConnection::NewL(RSocketServ &aSocketServ, |
276 |
const TDesC &aHostAddress, const TUint aPort, const TInt aIAPId, |
|
277 |
MSuplPacketNotifier *aNotifier) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
278 |
{ |
39 | 279 |
CSuplConnection* self = new (ELeave) CSuplConnection(aSocketServ); |
280 |
||
281 |
CleanupStack::PushL(self); |
|
282 |
self->ConstructL(aHostAddress, aPort, aIAPId, aNotifier); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
283 |
CleanupStack::Pop(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
284 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
285 |
return self; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
286 |
} |
39 | 287 |
|
288 |
// --------------------------------------------ADDED NEWL TAKING TLS ALSO------------------------------------- |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
289 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
290 |
// CSuplConnection::NewL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
291 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
292 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
293 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
294 |
// |
39 | 295 |
CSuplConnection* CSuplConnection::NewL(RSocketServ &aSocketServ, |
296 |
const TDesC &aHostAddress, const TUint aPort, const TInt aIAPId, |
|
297 |
TBool aTls, TBool aPskTls, MSuplPacketNotifier *aNotifier) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
298 |
{ |
39 | 299 |
CSuplConnection* self = new (ELeave) CSuplConnection(aSocketServ); |
300 |
||
301 |
CleanupStack::PushL(self); |
|
302 |
self->ConstructL(aHostAddress, aPort, aIAPId, aTls, aPskTls, aNotifier); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
303 |
CleanupStack::Pop(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
304 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
305 |
return self; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
306 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
307 |
//------------------------------------------------------------------------------------------------------------ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
308 |
CSuplConnection::~CSuplConnection() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
309 |
{ |
39 | 310 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
311 |
// Log |
39 | 312 |
if (iTrace) |
313 |
{ |
|
314 |
iTrace->Trace(_L("CSuplConnection::Destructor"), KTraceFileName, |
|
315 |
__LINE__); |
|
316 |
||
317 |
iTrace->Trace(_L("CSuplConnection::Destructor...Cancelling "), |
|
318 |
KTraceFileName, __LINE__); |
|
319 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
320 |
// Cancel Any outstanding request |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
321 |
Cancel(); |
39 | 322 |
|
323 |
if (iTrace) |
|
324 |
iTrace->Trace(_L( |
|
325 |
"CSuplConnection::Destructor...Deleting Socket Reader"), |
|
326 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
327 |
//Delete the Socket Reader |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
328 |
delete iSocketReader; |
39 | 329 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
330 |
// Close the resolver if required |
39 | 331 |
if (iState == ELookingUp) |
332 |
{ |
|
333 |
if (iTrace) |
|
334 |
iTrace->Trace( |
|
335 |
_L("CSuplConnection::Destructor...Closing Resolver"), |
|
336 |
KTraceFileName, __LINE__); |
|
337 |
iResolver.Close(); |
|
338 |
} |
|
339 |
if (iTrace) |
|
340 |
iTrace->Trace(_L( |
|
341 |
"CSuplConnection::Destructor...Deleting Secure Socket"), |
|
342 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
343 |
// Delete the TLS Socket |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
344 |
delete iTlsSocket; |
39 | 345 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
346 |
// Close the Socket if required |
39 | 347 |
if (iState == EConnected || iState == EConnecting) |
348 |
{ |
|
349 |
iTrace->Trace(_L("CSuplConnection::Destructor...Closing Socket"), |
|
350 |
KTraceFileName, __LINE__); |
|
351 |
iSocket.Close(); |
|
352 |
} |
|
353 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
354 |
#ifndef __WINS__ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
355 |
// Close the RConnection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
356 |
if(iTrace) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
357 |
iTrace->Trace(_L("CSuplConnection::Destructor...Closing RConnection"), KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
358 |
iConnection.Close(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
359 |
#endif |
39 | 360 |
if (iTrace) |
361 |
iTrace->Trace(_L("CSuplConnection::Destructor...Deleting Timer"), |
|
362 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
363 |
// Delete timer |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
364 |
delete iTimer; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
365 |
|
39 | 366 |
// PSK TLS Start |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
367 |
#if WITH_GBA_OFFF |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
368 |
delete iGbaClient; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
369 |
#endif /* WITH_GBA */ |
39 | 370 |
// PSK TLS End |
371 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
372 |
iConnArray.Close(); |
39 | 373 |
// Delete Trace |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
374 |
delete iTrace; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
375 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
376 |
iPktArray.Close(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
377 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
378 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
379 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
380 |
// CSuplConnection::RunL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
381 |
// This is the method to handle request completion for |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
382 |
// asynchronous requests made by CSuplConnection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
383 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
384 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
385 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
386 |
void CSuplConnection::RunL() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
387 |
{ |
39 | 388 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
389 |
// Log |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
390 |
TBuf<64> msg(_L("CSuplConnection::RunL: State is ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
391 |
msg.AppendNum(iState); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
392 |
msg.Append(_L(" iStatus is ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
393 |
msg.AppendNum(iStatus.Int()); |
39 | 394 |
iTrace->Trace(msg, KTraceFileName, __LINE__); |
395 |
||
396 |
switch (iState) |
|
397 |
{ |
|
398 |
case ERetriveIAP: |
|
399 |
{ |
|
400 |
iTrace->Trace(_L("CSuplConnection::ERetriveIAP"), KTraceFileName, |
|
401 |
__LINE__); |
|
402 |
if (iStatus.Int() == KErrNone) |
|
403 |
{ |
|
404 |
ConnectIAP(); |
|
405 |
} |
|
406 |
else |
|
407 |
{ |
|
408 |
iTrace->Trace(_L("Error in Retriving IAP Id... "), |
|
409 |
KTraceFileName, __LINE__); |
|
410 |
iConnection.Close(); |
|
411 |
iTrace->Trace(_L("iConnection.Close();... "), KTraceFileName, |
|
412 |
__LINE__); |
|
413 |
//User::RequestComplete(iReqStatus, iStatus.Int()); |
|
414 |
CompleteConnectRequests(iStatus.Int()); |
|
415 |
} |
|
416 |
break; |
|
417 |
} |
|
418 |
// Socket Connect has completed |
|
419 |
case EConnecting: |
|
420 |
iTimer->Cancel(); // Valid SUPL server, Cancel timer started for this purpose |
|
421 |
if (iStatus == KErrNone) |
|
422 |
{ |
|
423 |
if (iVariantEnabled) |
|
424 |
{ |
|
425 |
iTrace->Trace( |
|
426 |
_L( |
|
427 |
"CSuplConnection::RunL Making Secure Connection"), |
|
428 |
KTraceFileName, __LINE__); |
|
429 |
iState = EMakingSecureConn; |
|
430 |
||
431 |
MakeSecureConnection(); |
|
432 |
} |
|
433 |
else |
|
434 |
{ |
|
435 |
// Log |
|
436 |
iTrace->Trace( |
|
437 |
_L( |
|
438 |
"CSuplConnection::RunL Non Secure Socket Connection Established"), |
|
439 |
KTraceFileName, __LINE__); |
|
440 |
// Change State |
|
441 |
iState = EConnected; |
|
442 |
//User::RequestComplete(iReqStatus, iStatus.Int()); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
443 |
CompleteConnectRequests(iStatus.Int()); |
39 | 444 |
} |
445 |
} |
|
446 |
else |
|
447 |
{ |
|
448 |
// Log |
|
449 |
iTrace->Trace(_L( |
|
450 |
"CSuplConnection::RunL Socket Connection Failed"), |
|
451 |
KTraceFileName, __LINE__); |
|
452 |
||
453 |
iState = EFailure; |
|
454 |
iSocket.Close(); |
|
455 |
#ifndef __WINS__ // Bug Fix for close connection |
|
456 |
// Close the RConnection |
|
457 |
iConnection.Close(); |
|
458 |
#endif |
|
459 |
//User::RequestComplete(iReqStatus, iStatus.Int()); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
460 |
CompleteConnectRequests(iStatus.Int()); |
39 | 461 |
iTrace->Trace(_L("CSuplConnection::SocketConn Failed Exit"), |
462 |
KTraceFileName, __LINE__); |
|
463 |
} |
|
464 |
break; |
|
465 |
||
466 |
// Secure Connection |
|
467 |
case ESecureHandShake: |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
468 |
// Stop timer |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
469 |
iTimer->Cancel(); |
39 | 470 |
if (iStatus != KErrNone) |
471 |
{ |
|
472 |
// Log |
|
473 |
iTrace->Trace(_L( |
|
474 |
"CSuplConnection::RunL Secure Connection Failed"), |
|
475 |
KTraceFileName, __LINE__); |
|
476 |
||
477 |
// Connection was not successful |
|
478 |
iState = EFailure; |
|
479 |
iSocket.Close(); |
|
480 |
#ifndef __WINS__ // Bug Fix for close connection |
|
481 |
// Close the RConnection |
|
482 |
iConnection.Close(); |
|
483 |
#endif |
|
484 |
} |
|
485 |
else |
|
486 |
{ |
|
487 |
// Log |
|
488 |
iTrace->Trace( |
|
489 |
_L( |
|
490 |
"CSuplConnection::RunL Secure Connection Established"), |
|
491 |
KTraceFileName, __LINE__); |
|
492 |
// Change State |
|
493 |
iState = EConnected; |
|
494 |
} |
|
495 |
||
496 |
//User::RequestComplete(iReqStatus, iStatus.Int()); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
497 |
CompleteConnectRequests(iStatus.Int()); |
39 | 498 |
break; |
499 |
||
500 |
// DNS Lookup has completed |
|
501 |
case ELookingUp: |
|
502 |
{ |
|
503 |
// Log |
|
504 |
iTrace->Trace(_L("CSuplConnection::RunL DNS Lookup Complete"), |
|
505 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
506 |
iTimer->Cancel(); |
39 | 507 |
|
508 |
// Close the Resolver |
|
509 |
iResolver.Close(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
510 |
|
39 | 511 |
if (iStatus != KErrNone) |
512 |
{ |
|
513 |
// Log |
|
514 |
iTrace->Trace(_L("CSuplConnection::RunL DNS Lookup Failed"), |
|
515 |
KTraceFileName, __LINE__); |
|
516 |
||
517 |
iState = EFailure; |
|
518 |
iSocket.Close(); |
|
519 |
#ifndef __WINS__ // Bug Fix for close connection |
|
520 |
// Close the RConnection |
|
521 |
iConnection.Close(); |
|
522 |
#endif |
|
523 |
||
524 |
//User::RequestComplete(iReqStatus, iStatus.Int()); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
525 |
CompleteConnectRequests(iStatus.Int()); |
39 | 526 |
break; |
527 |
} |
|
528 |
||
529 |
// Log |
|
530 |
iTrace->Trace(_L("CSuplConnection::RunL DNS Lookup Successful"), |
|
531 |
KTraceFileName, __LINE__); |
|
532 |
||
533 |
// Retrieve Address |
|
534 |
TInt addrFamily = iNameEntry().iAddr.Family(); |
|
535 |
if (addrFamily == KAfInet) |
|
536 |
{ |
|
537 |
//IPv4 Address |
|
538 |
iAddress.SetAddress( |
|
539 |
TInetAddr::Cast(iNameEntry().iAddr).Address()); |
|
540 |
||
541 |
} |
|
542 |
if (addrFamily == KAfInet6) |
|
543 |
{ |
|
544 |
//IPv6 Address |
|
545 |
iAddress.SetAddress( |
|
546 |
TInetAddr::Cast(iNameEntry().iAddr).Ip6Address()); |
|
547 |
} |
|
548 |
||
549 |
// Set Port |
|
550 |
iAddress.SetPort(Port()); |
|
551 |
||
552 |
// Connect to Remote Host |
|
553 |
Connect(); |
|
554 |
||
555 |
break; |
|
556 |
} |
|
557 |
default: |
|
558 |
{ |
|
559 |
if (iSendInProgress) |
|
560 |
{ |
|
561 |
if (iPkt) |
|
562 |
iPkt->CompleteRequest(iStatus.Int()); |
|
563 |
CheckForOutstandingPackets(); |
|
564 |
} |
|
565 |
else |
|
566 |
{ |
|
567 |
iState = EFailure; |
|
568 |
//User::RequestComplete(iReqStatus, KErrGeneral); |
|
569 |
CompleteConnectRequests( KErrGeneral); |
|
570 |
} |
|
571 |
break; |
|
572 |
} |
|
573 |
||
574 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
575 |
} |
39 | 576 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
577 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
578 |
// CSuplConnection::CheckForOutstandingPackets |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
579 |
// Checks for outstanding packets in the send queue |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
580 |
// and sends packets based on FIFO |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
581 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
582 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
583 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
584 |
void CSuplConnection::CheckForOutstandingPackets() |
39 | 585 |
{ |
586 |
if (iFirstPkt) |
|
587 |
{ |
|
588 |
iFirstPkt = EFalse; |
|
589 |
} |
|
590 |
TInt index = iPktArray.Find(iPkt); |
|
591 |
if (index != KErrNotFound) |
|
592 |
iPktArray.Remove(index); |
|
593 |
delete iPkt; |
|
594 |
||
595 |
TInt count = iPktArray.Count(); |
|
596 |
if (count == 0) |
|
597 |
{ |
|
598 |
iSendInProgress = EFalse; |
|
599 |
} |
|
600 |
else |
|
601 |
{ |
|
602 |
iPkt = REINTERPRET_CAST(CSuplPacketInfo*, iPktArray[0]); |
|
603 |
iPkt->GetPacketData(iPacket); |
|
604 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
605 |
TBuf<64> msg(_L("Sending data on port ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
606 |
msg.AppendNum(iSocket.LocalPort()); |
39 | 607 |
iTrace->Trace(msg, KTraceFileName, __LINE__); |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
608 |
|
39 | 609 |
// Log |
610 |
if (iVariantEnabled) |
|
611 |
{ |
|
612 |
iTrace->Trace( |
|
613 |
_L( |
|
614 |
"CSuplConnection::CheckForOutstandingPackets sending packet over Secure Connection"), |
|
615 |
KTraceFileName, __LINE__); |
|
616 |
iTlsSocket->Send(iPacket, iStatus); |
|
617 |
iSendInProgress = ETrue; |
|
618 |
SetActive(); |
|
619 |
} |
|
620 |
else |
|
621 |
{ |
|
622 |
iTrace->Trace( |
|
623 |
_L( |
|
624 |
"CSuplConnection::CheckForOutstandingPackets sending packet over NonSecure Connection"), |
|
625 |
KTraceFileName, __LINE__); |
|
626 |
iSocket.Send(iPacket, 0, iStatus); |
|
627 |
iSendInProgress = ETrue; |
|
628 |
SetActive(); |
|
629 |
} |
|
630 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
631 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
632 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
633 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
634 |
// CSuplConnection::CancelConnect |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
635 |
// Cancels connect request. |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
636 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
637 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
638 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
639 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
640 |
EXPORT_C void CSuplConnection::CancelConnect(TRequestStatus &aStatus) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
641 |
{ |
39 | 642 |
// Log |
643 |
iTrace->Trace(_L("CSuplConnection::CancelConnect"), KTraceFileName, |
|
644 |
__LINE__); |
|
645 |
iTimer->Cancel(); // Cancel all timers |
|
646 |
if (iConnArray.Count() > 1) |
|
647 |
{ |
|
648 |
CompleteConnectCancel(aStatus); |
|
649 |
return; |
|
650 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
651 |
|
39 | 652 |
TBuf<64> buff; |
653 |
//buff.Copy(_L("iState = ")); |
|
654 |
buff.AppendNum(iState); |
|
655 |
iTrace->Trace(buff, KTraceFileName, __LINE__); |
|
656 |
||
657 |
switch (iState) |
|
658 |
{ |
|
659 |
case ERetriveIAP: |
|
660 |
{ |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
661 |
#ifndef __WINS__ |
39 | 662 |
//iConnection.Stop(); |
663 |
//Earlier it was Stop()... but somehow functionality was not working after week 26..phone was restarting...Manish |
|
664 |
// Close is working fine at this place.. |
|
665 |
iConnection.Close(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
666 |
#endif |
39 | 667 |
break; |
668 |
} |
|
669 |
case ESecureHandShake: |
|
670 |
{ |
|
671 |
iTlsSocket->CancelHandshake(); |
|
672 |
break; |
|
673 |
} |
|
674 |
case ELookingUp: |
|
675 |
{ |
|
676 |
iResolver.Cancel(); |
|
677 |
break; |
|
678 |
} |
|
679 |
default: |
|
680 |
{ |
|
681 |
if (iVariantEnabled) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
682 |
{ |
39 | 683 |
iTrace->Trace(_L("CSuplConnection::Secure DoCancel"), |
684 |
KTraceFileName, __LINE__); |
|
685 |
iTlsSocket->CancelAll(); |
|
686 |
} |
|
687 |
else |
|
688 |
{ |
|
689 |
iTrace->Trace(_L("CSuplConnection::NonSecure DoCancel"), |
|
690 |
KTraceFileName, __LINE__); |
|
691 |
iSocket.CancelAll(); |
|
692 |
} |
|
693 |
break; |
|
694 |
} |
|
695 |
} |
|
696 |
if (!(iState == ENotConnected || iState == ERetriveIAP)) |
|
697 |
{ |
|
698 |
iSocket.CancelAll(); |
|
699 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
700 |
|
39 | 701 |
CompleteConnectCancel(aStatus); |
702 |
//TRequestStatus *reqStatus = &aStatus; |
|
703 |
//User::RequestComplete(reqStatus, KErrNone); |
|
704 |
||
705 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
706 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
707 |
// CSuplConnection::DoCancel |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
708 |
// This is the method to cancel any request |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
709 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
710 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
711 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
712 |
void CSuplConnection::DoCancel() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
713 |
{ |
39 | 714 |
// Log |
715 |
iTrace->Trace(_L("CSuplConnection::DoCancel"), KTraceFileName, __LINE__); |
|
716 |
||
717 |
TBuf<64> buff; |
|
718 |
buff.Copy(_L("iState = ")); |
|
719 |
buff.AppendNum(iState); |
|
720 |
iTrace->Trace(buff, KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
721 |
|
39 | 722 |
if (!(iState == ENotConnected || iState == ERetriveIAP)) |
723 |
{ |
|
724 |
iSocket.CancelAll(); |
|
725 |
} |
|
726 |
||
727 |
switch (iState) |
|
728 |
{ |
|
729 |
case ERetriveIAP: |
|
730 |
{ |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
731 |
#ifndef __WINS__ |
39 | 732 |
//iConnection.Stop(); |
733 |
//Earlier it was Stop()... but somehow functionality was not working after week 26..phone was restarting...Manish |
|
734 |
// Close is working fine at this place.. |
|
735 |
iConnection.Close(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
736 |
#endif |
39 | 737 |
break; |
738 |
} |
|
739 |
case ESecureHandShake: |
|
740 |
{ |
|
741 |
iTlsSocket->CancelHandshake(); |
|
742 |
break; |
|
743 |
} |
|
744 |
case ELookingUp: |
|
745 |
{ |
|
746 |
iResolver.Cancel(); |
|
747 |
break; |
|
748 |
} |
|
749 |
default: |
|
750 |
{ |
|
751 |
if (iVariantEnabled) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
752 |
{ |
39 | 753 |
iTrace->Trace(_L("CSuplConnection::Secure DoCancel"), |
754 |
KTraceFileName, __LINE__); |
|
755 |
iTlsSocket->CancelAll(); |
|
756 |
} |
|
757 |
else |
|
758 |
{ |
|
759 |
iTrace->Trace(_L("CSuplConnection::NonSecure DoCancel"), |
|
760 |
KTraceFileName, __LINE__); |
|
761 |
iSocket.CancelAll(); |
|
762 |
} |
|
763 |
break; |
|
764 |
} |
|
765 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
766 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
767 |
#if 0 |
39 | 768 |
if(iReqStatus) |
769 |
{ |
|
770 |
User::RequestComplete(iReqStatus, KErrCancel); |
|
771 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
772 |
#endif |
39 | 773 |
CompleteConnectRequests( KErrCancel); |
774 |
return; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
775 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
776 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
777 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
778 |
// CSuplConnection::TimerExpired() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
779 |
// This is the method to cancel any request |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
780 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
781 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
782 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
783 |
void CSuplConnection::TimerExpired() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
784 |
{ |
39 | 785 |
// Log |
786 |
iTrace->Trace(_L("CSuplConnection::TimerExpired"), KTraceFileName, |
|
787 |
__LINE__); |
|
788 |
||
789 |
TBuf<64> buff; |
|
790 |
buff.Copy(_L("iState = ")); |
|
791 |
buff.AppendNum(iState); |
|
792 |
iTrace->Trace(buff, KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
793 |
|
39 | 794 |
if (!(iState == ENotConnected || iState == ERetriveIAP)) |
795 |
{ |
|
796 |
iSocket.CancelAll(); |
|
797 |
} |
|
798 |
||
799 |
switch (iState) |
|
800 |
{ |
|
801 |
case ERetriveIAP: |
|
802 |
{ |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
803 |
#ifndef __WINS__ |
39 | 804 |
//iConnection.Stop(); |
805 |
//Earlier it was Stop()... but somehow functionality was not working after week 26..phone was restarting...Manish |
|
806 |
// Close is working fine at this place.. |
|
807 |
iConnection.Close(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
808 |
#endif |
39 | 809 |
break; |
810 |
} |
|
811 |
case ESecureHandShake: |
|
812 |
{ |
|
813 |
iTlsSocket->CancelHandshake(); |
|
814 |
break; |
|
815 |
} |
|
816 |
case ELookingUp: |
|
817 |
{ |
|
818 |
iResolver.Cancel(); |
|
819 |
break; |
|
820 |
} |
|
821 |
case EConnecting: |
|
822 |
{ |
|
823 |
iState = EFailure; |
|
824 |
iSocket.Close(); |
|
825 |
#ifndef __WINS__ // Bug Fix for close connection |
|
826 |
// Close the RConnection |
|
827 |
iConnection.Close(); |
|
828 |
#endif |
|
829 |
break; |
|
830 |
} |
|
831 |
default: |
|
832 |
{ |
|
833 |
if (iVariantEnabled) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
834 |
{ |
39 | 835 |
iTrace->Trace(_L("CSuplConnection::Secure DoCancel"), |
836 |
KTraceFileName, __LINE__); |
|
837 |
iTlsSocket->CancelAll(); |
|
838 |
} |
|
839 |
else |
|
840 |
{ |
|
841 |
iTrace->Trace(_L("CSuplConnection::NonSecure DoCancel"), |
|
842 |
KTraceFileName, __LINE__); |
|
843 |
iSocket.CancelAll(); |
|
844 |
} |
|
845 |
break; |
|
846 |
} |
|
847 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
848 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
849 |
#if 0 |
39 | 850 |
if(iReqStatus) |
851 |
{ |
|
852 |
User::RequestComplete(iReqStatus, KErrCancel); |
|
853 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
854 |
#endif |
39 | 855 |
CompleteConnectRequests( KErrSuplTimeout); |
856 |
return; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
857 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
858 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
859 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
860 |
// CSuplConnection::Destroy |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
861 |
// This is the method through which the SUPL Connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
862 |
// can be destroyed. This is not Exported because no class |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
863 |
// other than CSuplCommunicationManager should destroy |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
864 |
// SUPL Connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
865 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
866 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
867 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
868 |
void CSuplConnection::Destroy() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
869 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
870 |
// Log |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
871 |
iTrace->Trace(_L("CSuplConnection::Destroy"), KTraceFileName, __LINE__); |
39 | 872 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
873 |
delete this; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
874 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
875 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
876 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
877 |
// CSuplConnection::RefCount |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
878 |
// Returns the reference count |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
879 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
880 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
881 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
882 |
TInt CSuplConnection::RefCount() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
883 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
884 |
// Log |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
885 |
iTrace->Trace(_L("CSuplConnection::RefCount"), KTraceFileName, __LINE__); |
39 | 886 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
887 |
return iRefCount; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
888 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
889 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
890 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
891 |
// CSuplConnection::IncRefCount |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
892 |
// Increments the reference count |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
893 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
894 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
895 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
896 |
void CSuplConnection::IncRefCount() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
897 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
898 |
// Log |
39 | 899 |
iTrace->Trace(_L("CSuplConnection::IncRefCount"), KTraceFileName, |
900 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
901 |
|
39 | 902 |
iRefCount++; |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
903 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
904 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
905 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
906 |
// CSuplConnection::DecrRefCount |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
907 |
// Decrements the reference count |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
908 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
909 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
910 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
911 |
void CSuplConnection::DecrRefCount() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
912 |
{ |
39 | 913 |
// Log |
914 |
iTrace->Trace(_L("CSuplConnection::DecrRefCount"), KTraceFileName, |
|
915 |
__LINE__); |
|
916 |
||
917 |
if (iRefCount > 0) |
|
918 |
iRefCount--; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
919 |
} |
39 | 920 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
921 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
922 |
// CSuplConnection::HosrAddress |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
923 |
// Returns the IPAdress associated with this connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
924 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
925 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
926 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
927 |
const TDesC& CSuplConnection::HostAddress() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
928 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
929 |
// Log |
39 | 930 |
iTrace->Trace(_L("CSuplConnection::HostAddress"), KTraceFileName, |
931 |
__LINE__); |
|
932 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
933 |
return iHostAddress; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
934 |
} |
39 | 935 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
936 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
937 |
// CSuplConnection::Port |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
938 |
// Returns the Port associated with this connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
939 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
940 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
941 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
942 |
TUint CSuplConnection::Port() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
943 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
944 |
return iPort; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
945 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
946 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
947 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
948 |
// CSuplConnection::Connect |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
949 |
// Makes a secure connection to Network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
950 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
951 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
952 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
953 |
EXPORT_C void CSuplConnection::Connect(TRequestStatus &aStatus) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
954 |
{ |
39 | 955 |
|
956 |
// Log |
|
957 |
iTrace->Trace(_L("CSuplConnection::Connect"), KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
958 |
|
39 | 959 |
if (iState == EConnected) |
960 |
{ |
|
961 |
aStatus = KRequestPending; |
|
962 |
TRequestStatus *reqStatus = &aStatus; |
|
963 |
User::RequestComplete(reqStatus, KErrNone); |
|
964 |
iConnectClients++; |
|
965 |
return; |
|
966 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
967 |
|
39 | 968 |
// Check if Connect() is started. If started, add status to Q |
969 |
//if (iConnectStarted) |
|
970 |
{ |
|
971 |
aStatus = KRequestPending; |
|
972 |
TRequestStatus *reqStatus = &aStatus; |
|
973 |
TInt error = iConnArray.Append(reqStatus); |
|
974 |
if (error != KErrNone) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
975 |
{ |
39 | 976 |
User::RequestComplete(reqStatus, error); |
977 |
return; |
|
978 |
} |
|
979 |
} |
|
980 |
||
981 |
if (!iConnectStarted) |
|
982 |
{ |
|
983 |
iTrace->Trace( |
|
984 |
_L("CSuplConnection::Connect : Connection not started"), |
|
985 |
KTraceFileName, __LINE__); |
|
986 |
// Connect only if not already connected |
|
987 |
if (iState == ENotConnected || iState == EFailure) |
|
988 |
{ |
|
989 |
iTrace->Trace(_L("CSuplConnection::Connect : ENotConnected"), |
|
990 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
991 |
iConnectStarted = ETrue; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
992 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
993 |
#ifndef __WINS__ |
39 | 994 |
TExtendedConnPref OCCPrefs; |
995 |
TConnPrefList prefList; |
|
996 |
||
997 |
OCCPrefs.SetForcedRoaming(EFalse); //do not switch networks during an ongoing connection |
|
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
998 |
OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault); |
39 | 999 |
|
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1000 |
if(iIAPId != -1) //if a IAP was configured |
39 | 1001 |
|
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1002 |
{ |
39 | 1003 |
iTrace->Trace(_L("CSuplConnection::Connect : IAP configured"), KTraceFileName, __LINE__); |
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1004 |
OCCPrefs.SetIapId(iIAPId); |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1005 |
// since IAP Id is set SNAP purpose should not be set - set to unknown |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1006 |
OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeUnknown); |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1007 |
OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerUnknown); |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1008 |
} |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1009 |
else |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1010 |
{ |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1011 |
OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet); |
39 | 1012 |
//WLAN and Cellular Networks allowed for connection |
1013 |
OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN | TExtendedConnPref::EExtendedConnBearerCellular); |
|
1014 |
||
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1015 |
//if SNAP purpose is set IAP Id should be zero - zero by default not explicitly set |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1016 |
iTrace->Trace(_L("CSuplConnection::Connect : IAP not configured"), KTraceFileName, __LINE__); |
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1017 |
} |
39 | 1018 |
|
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1019 |
TRAP_IGNORE(prefList.AppendL(&OCCPrefs)); |
39 | 1020 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1021 |
TInt ret = iConnection.Open(iSocketServ); |
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1022 |
if(ret != KErrNone) |
39 | 1023 |
iTrace->Trace(_L("RConnection Open returned error"), KTraceFileName, __LINE__); |
1024 |
||
22
4c4ed41530db
Revision: 201017
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
18
diff
changeset
|
1025 |
iTrace->Trace(_L("RConnection Start Called, State is ERetriveIAP"), KTraceFileName, __LINE__); |
39 | 1026 |
// Start an Outgoing Connection with overrides |
1027 |
iConnection.Start(prefList,iStatus); |
|
1028 |
// Set state to ERetriveIAP |
|
1029 |
iState = ERetriveIAP; |
|
1030 |
SetActive(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1031 |
#else |
39 | 1032 |
ConnectIAP(); |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1033 |
#endif |
39 | 1034 |
} |
1035 |
} |
|
1036 |
else |
|
1037 |
iTrace->Trace( |
|
1038 |
_L( |
|
1039 |
"CSuplConnection::Connect : Conn in progress, request queued"), |
|
1040 |
KTraceFileName, __LINE__); |
|
1041 |
// Log |
|
1042 |
iTrace->Trace(_L("CSuplConnection::Connect:Exit"), KTraceFileName, |
|
1043 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1044 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1045 |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1046 |
// ----------------------------------------------------------------------------- |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1047 |
// CSuplConnection::Connect |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1048 |
// Makes a secure connection to Network |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1049 |
// (other items were commented in a header). |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1050 |
// ----------------------------------------------------------------------------- |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1051 |
// |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1052 |
|
39 | 1053 |
EXPORT_C void CSuplConnection::Connect(TRequestStatus &aStatus, |
1054 |
TBool aPrompt, TBool aWlanOnly) |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1055 |
{ |
39 | 1056 |
|
1057 |
// Log |
|
1058 |
iTrace->Trace(_L("CSuplConnection::Connect"), KTraceFileName, __LINE__); |
|
1059 |
iPrompt = aPrompt; |
|
1060 |
iWlanOnly = aWlanOnly; |
|
1061 |
||
1062 |
aStatus = KRequestPending; |
|
1063 |
TRequestStatus *reqStatus = &aStatus; |
|
1064 |
||
1065 |
if (iState == EConnected) |
|
1066 |
{ |
|
1067 |
User::RequestComplete(reqStatus, KErrNone); |
|
1068 |
iConnectClients++; |
|
1069 |
return; |
|
1070 |
} |
|
1071 |
||
1072 |
TInt error = iConnArray.Append(reqStatus); |
|
1073 |
if (error != KErrNone) |
|
1074 |
{ |
|
1075 |
User::RequestComplete(reqStatus, error); |
|
1076 |
return; |
|
1077 |
} |
|
1078 |
||
1079 |
if (!iConnectStarted) |
|
1080 |
{ |
|
1081 |
iTrace->Trace( |
|
1082 |
_L("CSuplConnection::Connect : Connection not started"), |
|
1083 |
KTraceFileName, __LINE__); |
|
1084 |
// Connect only if not already connected |
|
1085 |
if (iState == ENotConnected || iState == EFailure) |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1086 |
{ |
39 | 1087 |
iTrace->Trace(_L("CSuplConnection::Connect : ENotConnected"), |
1088 |
KTraceFileName, __LINE__); |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1089 |
iConnectStarted = ETrue; |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1090 |
|
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1091 |
#ifndef __WINS__ |
39 | 1092 |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1093 |
iTrace->Trace(_L("CSuplConnection::Connect ExtendedConnPref"), KTraceFileName, __LINE__); |
39 | 1094 |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1095 |
TExtendedConnPref OCCPrefs; |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1096 |
TConnPrefList prefList; |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1097 |
|
39 | 1098 |
if(iWlanOnly) |
1099 |
{ |
|
1100 |
iTrace->Trace(_L("CSuplConnection::Connect : iWLANOnly used"), KTraceFileName, __LINE__); |
|
1101 |
OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN); |
|
1102 |
} |
|
1103 |
else |
|
1104 |
{ |
|
1105 |
iTrace->Trace(_L("CSuplConnection::Connect OCC GPRS Connection.."), KTraceFileName, __LINE__); |
|
1106 |
OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerCellular); |
|
1107 |
} |
|
1108 |
OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet); |
|
1109 |
||
1110 |
if(!iPrompt) |
|
1111 |
{ |
|
1112 |
iTrace->Trace(_L("CSuplConnection::Connect : silent connection"), KTraceFileName, __LINE__); |
|
1113 |
OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent); |
|
1114 |
} |
|
1115 |
else |
|
1116 |
{ |
|
1117 |
iTrace->Trace(_L("CSuplConnection::Connect : Dialog prompt"), KTraceFileName, __LINE__); |
|
1118 |
OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault); |
|
1119 |
} |
|
1120 |
||
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1121 |
TRAP_IGNORE(prefList.AppendL(&OCCPrefs)); |
39 | 1122 |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1123 |
TInt ret = iConnection.Open(iSocketServ); |
39 | 1124 |
if( ret != KErrNone ) |
1125 |
{ |
|
1126 |
TRequestStatus* statusPtr = &aStatus; |
|
1127 |
User::RequestComplete( statusPtr,ret ); |
|
1128 |
return; |
|
1129 |
} |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1130 |
// Start an Outgoing Connection with overrides |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1131 |
iConnection.Start(prefList,iStatus); |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1132 |
// Set state to ERetriveIAP |
39 | 1133 |
iState = ERetriveIAP; |
1134 |
SetActive(); |
|
1135 |
||
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1136 |
#else |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1137 |
ConnectIAP(); |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1138 |
#endif |
39 | 1139 |
} |
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1140 |
} |
39 | 1141 |
else |
1142 |
iTrace->Trace( |
|
1143 |
_L( |
|
1144 |
"CSuplConnection::Connect : Conn in progress, request queued"), |
|
1145 |
KTraceFileName, __LINE__); |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1146 |
// Log |
39 | 1147 |
iTrace->Trace(_L("CSuplConnection::Connect:Exit"), KTraceFileName, |
1148 |
__LINE__); |
|
32
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1149 |
} |
b12ea03c50a3
Revision: 201023
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
22
diff
changeset
|
1150 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1151 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1152 |
// CSuplConnection::CompleteConnectStatus |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1153 |
// Completes the request to cancel connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1154 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1155 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1156 |
void CSuplConnection::CompleteConnectRequests(TInt aErr) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1157 |
{ |
39 | 1158 |
iTrace->Trace(_L("CSuplConnection::CompleteConnectRequests"), |
1159 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1160 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1161 |
TInt statusCount = iConnArray.Count(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1162 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1163 |
TBuf<32> msg(_L("Number of conns :")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1164 |
msg.AppendNum(statusCount); |
39 | 1165 |
iTrace->Trace(msg, KTraceFileName, __LINE__); |
1166 |
||
1167 |
for (TInt loop = 0; loop < statusCount; loop++) |
|
1168 |
{ |
|
1169 |
TRequestStatus* newStatus = REINTERPRET_CAST(TRequestStatus*, iConnArray[loop]); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1170 |
User::RequestComplete(newStatus, aErr); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1171 |
if (aErr == KErrNone) |
39 | 1172 |
iConnectClients++; |
1173 |
iTrace->Trace( |
|
1174 |
_L( |
|
1175 |
"CSuplConnection::CompleteConnectRequests, request completed"), |
|
1176 |
KTraceFileName, __LINE__); |
|
1177 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1178 |
iConnArray.Reset(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1179 |
iConnectStarted = EFalse; |
39 | 1180 |
} |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1181 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1182 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1183 |
// CSuplConnection::CompleteConnectStatus |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1184 |
// Completes the request to cancel connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1185 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1186 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1187 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1188 |
void CSuplConnection::CompleteConnectCancel(TRequestStatus &aStatus) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1189 |
{ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1190 |
TInt index = iConnArray.Find(&aStatus); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1191 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1192 |
if (index != KErrNotFound) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1193 |
{ |
39 | 1194 |
TRequestStatus *reqStatus = &aStatus; |
1195 |
User::RequestComplete(reqStatus, KErrCancel); |
|
1196 |
iConnArray.Remove(index); |
|
1197 |
} |
|
1198 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1199 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1200 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1201 |
// CSuplConnection::Send |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1202 |
// Sends a Packet out of the Secure Connection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1203 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1204 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1205 |
// |
39 | 1206 |
EXPORT_C void CSuplConnection::Send(const TDesC8 &aPacket, |
1207 |
TRequestStatus &aStatus) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1208 |
{ |
39 | 1209 |
// Log |
1210 |
iTrace->Trace(_L("CSuplConnection::Send"), KTraceFileName, __LINE__); |
|
1211 |
||
1212 |
if (iState != EConnected || iState == EFailure) |
|
1213 |
{ |
|
1214 |
// Log |
|
1215 |
iTrace->Trace(_L("CSuplConnection::Send...Disconnected"), |
|
1216 |
KTraceFileName, __LINE__); |
|
1217 |
aStatus = KRequestPending; |
|
1218 |
TRequestStatus *reqStatus = &aStatus; |
|
1219 |
User::RequestComplete(reqStatus, KErrDisconnected); |
|
1220 |
return; |
|
1221 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1222 |
|
39 | 1223 |
// if send in progress Q it |
1224 |
if (iSendInProgress) |
|
1225 |
{ |
|
1226 |
TInt err = KErrNone; |
|
1227 |
aStatus = KRequestPending; |
|
1228 |
CSuplPacketInfo *packetInfo = NULL; |
|
1229 |
||
1230 |
TRAP(err, packetInfo = CSuplPacketInfo::NewL(aPacket, aStatus); |
|
1231 |
iPktArray.AppendL(packetInfo)); |
|
1232 |
if (err != KErrNone) |
|
1233 |
{ |
|
1234 |
TRequestStatus *reqStatus = &aStatus; |
|
1235 |
User::RequestComplete(reqStatus, err); |
|
1236 |
return; |
|
1237 |
} |
|
1238 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1239 |
|
39 | 1240 |
else |
1241 |
{ |
|
1242 |
TInt err = KErrNone; |
|
1243 |
aStatus = KRequestPending; |
|
1244 |
TRAP(err, iPkt = CSuplPacketInfo::NewL(aPacket, aStatus)); |
|
1245 |
//iPkt->GetPacketData(iPacket, status); |
|
1246 |
if (err != KErrNone) |
|
1247 |
{ |
|
1248 |
TRequestStatus *reqStatus = &aStatus; |
|
1249 |
User::RequestComplete(reqStatus, err); |
|
1250 |
return; |
|
1251 |
} |
|
1252 |
iFirstPkt = ETrue; |
|
1253 |
TBuf<64> msg(_L("Sending data on port ")); |
|
1254 |
msg.AppendNum(iSocket.LocalPort()); |
|
1255 |
iTrace->Trace(msg, KTraceFileName, __LINE__); |
|
1256 |
// Log |
|
1257 |
if (iVariantEnabled) |
|
1258 |
{ |
|
1259 |
iTrace->Trace( |
|
1260 |
_L( |
|
1261 |
"CSuplConnection::Send sending packet over Secure Connection"), |
|
1262 |
KTraceFileName, __LINE__); |
|
1263 |
iTlsSocket->Send(aPacket, iStatus); |
|
1264 |
iSendInProgress = ETrue; |
|
1265 |
SetActive(); |
|
1266 |
} |
|
1267 |
else |
|
1268 |
{ |
|
1269 |
iTrace->Trace( |
|
1270 |
_L( |
|
1271 |
"CSuplConnection::Send sending packet over NonSecure Connection"), |
|
1272 |
KTraceFileName, __LINE__); |
|
1273 |
iSocket.Send(aPacket, 0, iStatus); |
|
1274 |
iSendInProgress = ETrue; |
|
1275 |
SetActive(); |
|
1276 |
} |
|
1277 |
} |
|
1278 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1279 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1280 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1281 |
// CSuplConnection::CancelSend |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1282 |
// Method to cancel the Socket Send operation |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1283 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1284 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1285 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1286 |
EXPORT_C void CSuplConnection::CancelSend(TRequestStatus &aStatus) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1287 |
{ |
39 | 1288 |
if (iFirstPkt) |
1289 |
{ |
|
1290 |
if (iVariantEnabled) |
|
1291 |
{ |
|
1292 |
iTrace->Trace(_L("CSuplConnection::Secure Send Cancel"), |
|
1293 |
KTraceFileName, __LINE__); |
|
1294 |
iTlsSocket->CancelSend(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1295 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1296 |
else |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1297 |
{ |
39 | 1298 |
iTrace->Trace(_L("CSuplConnection::Non Secure Send Cancel"), |
1299 |
KTraceFileName, __LINE__); |
|
1300 |
iSocket.CancelSend(); |
|
1301 |
} |
|
1302 |
delete iPkt; |
|
1303 |
iPkt = NULL; |
|
1304 |
TRequestStatus *reqStatus = &aStatus; |
|
1305 |
User::RequestComplete(reqStatus, KErrCancel); |
|
1306 |
} |
|
1307 |
else |
|
1308 |
{ |
|
1309 |
TInt count = iPktArray.Count(); |
|
1310 |
if (count == 1) |
|
1311 |
{ |
|
1312 |
TInt index = iPktArray.Find(iPkt); |
|
1313 |
if (index != KErrNotFound) |
|
1314 |
iPktArray.Remove(index); |
|
1315 |
delete iPkt; |
|
1316 |
iPkt = NULL; |
|
1317 |
TRequestStatus *reqStatus = &aStatus; |
|
1318 |
User::RequestComplete(reqStatus, KErrCancel); |
|
1319 |
} |
|
1320 |
else |
|
1321 |
{ |
|
1322 |
for (TInt loop = 0; loop < count; loop++) |
|
1323 |
{ |
|
1324 |
iPkt = REINTERPRET_CAST(CSuplPacketInfo*, iPktArray[0]); |
|
1325 |
if (iPkt->IsStatusMatches(aStatus)) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1326 |
{ |
39 | 1327 |
iTrace->Trace(_L("Found packet, deleting"), |
1328 |
KTraceFileName, __LINE__); |
|
1329 |
TInt index = iPktArray.Find(iPkt); |
|
1330 |
if (index != KErrNotFound) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1331 |
{ |
39 | 1332 |
iTrace->Trace(_L("Found packet, deleted"), |
1333 |
KTraceFileName, __LINE__); |
|
1334 |
iPktArray.Remove(index); |
|
1335 |
TRequestStatus *reqStatus = &aStatus; |
|
1336 |
User::RequestComplete(reqStatus, KErrCancel); |
|
1337 |
} |
|
1338 |
delete iPkt; |
|
1339 |
iPkt = NULL; |
|
1340 |
break; |
|
1341 |
} |
|
1342 |
} |
|
1343 |
} |
|
1344 |
} |
|
1345 |
||
1346 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1347 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1348 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1349 |
// CSuplConnection::Connect |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1350 |
// Makes a socket connection to Network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1351 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1352 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1353 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1354 |
void CSuplConnection::Connect() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1355 |
{ |
39 | 1356 |
// Log |
1357 |
iTrace->Trace(_L("CSuplConnection::Connect(void)"), KTraceFileName, |
|
1358 |
__LINE__); |
|
1359 |
||
1360 |
iState = EConnecting; |
|
1361 |
iTimer->Start(4000000); // For DNS pass case , but not a valid SUPL server |
|
1362 |
iSocket.Connect(iAddress, iStatus); |
|
1363 |
if (!IsActive()) |
|
1364 |
{ |
|
1365 |
SetActive(); |
|
1366 |
} |
|
1367 |
} |
|
1368 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1369 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1370 |
// CSuplConnection::ConnectIAP |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1371 |
// Makes a socket connection to Network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1372 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1373 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1374 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1375 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1376 |
void CSuplConnection::ConnectIAP() |
39 | 1377 |
{ |
1378 |
iTrace->Trace(_L("CSuplConnection::ConnectIAP(void)"), KTraceFileName, |
|
1379 |
__LINE__); |
|
1380 |
// Connect only if not already connected |
|
1381 |
if (iState == ENotConnected || iState == EFailure || iState |
|
1382 |
== ERetriveIAP) |
|
1383 |
{ |
|
1384 |
// Open the Socket |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1385 |
#ifndef __WINS__ |
39 | 1386 |
// Emulator can't handle RConnections |
1387 |
TInt err = iSocket.Open( iSocketServ, |
|
1388 |
KAfInet, |
|
1389 |
KSockStream, |
|
1390 |
KProtocolInetTcp, |
|
1391 |
iConnection ); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1392 |
#else |
39 | 1393 |
TInt err = iSocket.Open(iSocketServ, KAfInet, KSockStream, |
1394 |
KProtocolInetTcp); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1395 |
#endif |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1396 |
|
39 | 1397 |
if (KErrNone != err) |
1398 |
{ |
|
1399 |
// Log |
|
1400 |
iTrace->Trace(_L("CSuplConnection::Socket Open Failure"), |
|
1401 |
KTraceFileName, __LINE__); |
|
1402 |
||
1403 |
//User::RequestComplete(iReqStatus, err); |
|
1404 |
CompleteConnectRequests(err); |
|
1405 |
return; |
|
1406 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1407 |
|
39 | 1408 |
// Set IP Address and Port |
1409 |
if (iAddress.Input(iHostAddress) == KErrNone) |
|
1410 |
{ |
|
1411 |
// Log |
|
1412 |
iTrace->Trace( |
|
1413 |
_L( |
|
1414 |
"CSuplConnection::Connect Host Address is an IP Address"), |
|
1415 |
KTraceFileName, __LINE__); |
|
1416 |
||
1417 |
iAddress.SetPort(Port()); |
|
1418 |
Connect(); |
|
1419 |
} |
|
1420 |
||
1421 |
else |
|
1422 |
{ |
|
1423 |
// DNS Lookup |
|
1424 |
// Log |
|
1425 |
iTrace->Trace(_L("CSuplConnection::Connect Perform DNS lookup"), |
|
1426 |
KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1427 |
#ifndef __WINS__ |
39 | 1428 |
err = iResolver.Open(iSocketServ, KAfInet, KProtocolInetUdp, iConnection); |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1429 |
#else |
39 | 1430 |
err = iResolver.Open(iSocketServ, KAfInet, KProtocolInetUdp); |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1431 |
#endif |
39 | 1432 |
if (KErrNone != err) |
1433 |
{ |
|
1434 |
//User::RequestComplete(iReqStatus, err); |
|
1435 |
CompleteConnectRequests(err); |
|
1436 |
return; |
|
1437 |
} |
|
1438 |
||
1439 |
iState = ELookingUp; |
|
1440 |
iResolver.GetByName(iHostAddress, iNameEntry, iStatus); |
|
1441 |
iTimer->Start(10000000); |
|
1442 |
if (!IsActive()) |
|
1443 |
{ |
|
1444 |
SetActive(); |
|
1445 |
} |
|
1446 |
} |
|
1447 |
||
1448 |
} |
|
1449 |
||
1450 |
else |
|
1451 |
{ |
|
1452 |
// Already Connected. Just return KErrNone |
|
1453 |
//User::RequestComplete(iReqStatus, KErrNone); |
|
1454 |
CompleteConnectRequests( KErrNone); |
|
1455 |
} |
|
1456 |
||
1457 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1458 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1459 |
// CSuplConnection::MakeSecureConnection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1460 |
// Makes a secure connection to Network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1461 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1462 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1463 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1464 |
void CSuplConnection::MakeSecureConnection() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1465 |
{ |
39 | 1466 |
// Log |
1467 |
iTrace->Trace(_L("CSuplConnection::MakeSecureConnection"), |
|
1468 |
KTraceFileName, __LINE__); |
|
1469 |
||
1470 |
// Clear any pervious options |
|
1471 |
//iTlsSocket->FlushSessionCache(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1472 |
|
39 | 1473 |
iTlsSocket->StartClientHandshake(iStatus); |
1474 |
iTimer->Start(10000000); |
|
1475 |
iState = ESecureHandShake; |
|
1476 |
if (!IsActive()) |
|
1477 |
{ |
|
1478 |
SetActive(); |
|
1479 |
} |
|
1480 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1481 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1482 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1483 |
// CSuplConnection::ListenToMessages |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1484 |
// Start reading from the socket for packets from the network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1485 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1486 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1487 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1488 |
EXPORT_C TInt CSuplConnection::ListenToMessages() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1489 |
{ |
39 | 1490 |
// Log |
1491 |
iTrace->Trace(_L("CSuplConnection::ListenToMessages"), KTraceFileName, |
|
1492 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1493 |
|
39 | 1494 |
iListenCount++; |
1495 |
||
1496 |
if (iStartedListen) |
|
1497 |
return KErrNone; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1498 |
|
39 | 1499 |
if (iState != EConnected) |
1500 |
{ |
|
1501 |
return KErrDisconnected; |
|
1502 |
} |
|
1503 |
||
1504 |
if (iSocketReader && (!IsActive())) |
|
1505 |
{ |
|
1506 |
iSocketReader->SetPortNum(GetPortNumberUsed()); |
|
1507 |
iSocketReader->IssueRead(); |
|
1508 |
iStartedListen = ETrue; |
|
1509 |
return KErrNone; |
|
1510 |
} |
|
1511 |
||
1512 |
return KErrGeneral; |
|
1513 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1514 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1515 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1516 |
// CSuplConnection::GetLocalIPAddress |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1517 |
// Start reading from the socket for packets from the network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1518 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1519 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1520 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1521 |
|
39 | 1522 |
EXPORT_C TInt CSuplConnection::GetLocalIPAddress(TInetAddr & aTInetAddress) |
1523 |
{ |
|
1524 |
if (iState != EConnected) |
|
1525 |
return KErrDisconnected; |
|
1526 |
||
1527 |
TSockAddr sockAddr; |
|
1528 |
iSocket.LocalName(sockAddr); |
|
1529 |
||
1530 |
TInetAddr inetAddress(sockAddr); |
|
1531 |
||
1532 |
aTInetAddress = inetAddress; |
|
1533 |
return KErrNone; |
|
1534 |
} |
|
1535 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1536 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1537 |
// CSuplConnection::CancelListenToMessages |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1538 |
// Start reading from the socket for packets from the network |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1539 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1540 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1541 |
// |
39 | 1542 |
EXPORT_C void CSuplConnection::CancelListenToMessages() |
1543 |
{ |
|
1544 |
if (iListenCount > 1) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1545 |
{ |
39 | 1546 |
iListenCount--; |
1547 |
return; |
|
1548 |
} |
|
1549 |
if (iSocketReader) |
|
1550 |
{ |
|
1551 |
iSocketReader->Cancel(); |
|
1552 |
} |
|
1553 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1554 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1555 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1556 |
// COMASuplProvHandler::SetVariation |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1557 |
// Initializes the local variation flag |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1558 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1559 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1560 |
void CSuplConnection::SetVariation() |
39 | 1561 |
{ |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1562 |
#if 0 |
39 | 1563 |
CRepository *repository = NULL; |
1564 |
TRAPD( err, repository = CRepository::NewL( KCRUidSuplConfiguration)); |
|
1565 |
if ( KErrNone != err ) |
|
1566 |
{ |
|
1567 |
return; |
|
1568 |
} |
|
1569 |
||
1570 |
TInt val; |
|
1571 |
TInt rc = repository->Get( KSuplTLSAuthenticationVariant,val ); |
|
1572 |
if ( KErrNone == rc && val == 0 ) |
|
1573 |
{ |
|
1574 |
iVariantEnabled = EFalse; |
|
1575 |
} |
|
1576 |
||
1577 |
if ( KErrNone == rc && (val == 1 || val == 2 )) |
|
1578 |
{ |
|
1579 |
iVariantEnabled = ETrue; |
|
1580 |
if(val == 2 ) |
|
1581 |
{ |
|
1582 |
iPskTLSUsage = ETrue; |
|
1583 |
} |
|
1584 |
} |
|
1585 |
||
1586 |
delete repository; |
|
1587 |
#endif |
|
1588 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1589 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1590 |
EXPORT_C void CSuplConnection::CloseConnection() |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1591 |
{ |
39 | 1592 |
if (iTrace) |
1593 |
iTrace->Trace(_L("CSuplConnection::CloseConnection"), KTraceFileName, |
|
1594 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1595 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1596 |
// if connection request is from multiple clients and it is not yet |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1597 |
// completed, just return. |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1598 |
if (iConnArray.Count() > 1) |
39 | 1599 |
return; |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1600 |
#if 0 |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1601 |
TBuf<128> buf; |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1602 |
buf.Copy(_L("CSuplConnection::CloseConnection, iConnectClients = ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1603 |
buf.AppendNum(iConnectClients); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1604 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1605 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1606 |
buf.Copy(_L("CSuplConnection::CloseConnection, iState = ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1607 |
buf.AppendNum(iState); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1608 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1609 |
#endif |
39 | 1610 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1611 |
if (iConnArray.Count() == 1) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1612 |
iConnArray.Reset(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1613 |
|
39 | 1614 |
iConnectClients--; |
1615 |
||
1616 |
if (iConnectClients > 0) //earlier > 1 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1617 |
return; |
39 | 1618 |
|
1619 |
iResolver.Close(); |
|
1620 |
CancelListenToMessages(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1621 |
// Close the Socket if required |
39 | 1622 |
if (iState == EConnected || iState == EConnecting || iState |
1623 |
== ESecureHandShake) |
|
1624 |
{ |
|
1625 |
if (iTrace) |
|
1626 |
iTrace->Trace(_L("CSuplConnection::...Closing Socket"), |
|
1627 |
KTraceFileName, __LINE__); |
|
1628 |
if (iVariantEnabled) |
|
1629 |
iTlsSocket->Close(); |
|
1630 |
iSocket.Close(); |
|
1631 |
} |
|
1632 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1633 |
#ifndef __WINS__ |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1634 |
// Close the RConnection |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1635 |
if(iTrace) |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1636 |
iTrace->Trace(_L("CSuplConnection::...Closing RConnection"), KTraceFileName, __LINE__); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1637 |
iConnection.Close(); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1638 |
#endif |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1639 |
iState = ENotConnected; |
39 | 1640 |
} |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1641 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1642 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1643 |
// CSuplConnection::GetPskL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1644 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1645 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1646 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1647 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1648 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1649 |
// PSK TLS Start |
39 | 1650 |
void CSuplConnection::GetPskL(const HBufC8 * aPskIdentityHint, |
1651 |
HBufC8 *& aPskIdentity, HBufC8 *& aPskKey) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1652 |
{ |
39 | 1653 |
|
1654 |
iTrace->Trace(_L("CSuplConnection::GetPskL Start"), KTraceFileName, |
|
1655 |
__LINE__); |
|
1656 |
if (aPskIdentityHint != NULL && aPskIdentityHint->Length() |
|
1657 |
>= KMaxPskIdentityHintLength) |
|
1658 |
{ |
|
1659 |
iTrace->Trace(_L("aPskIdentityHint is not null..."), KTraceFileName, |
|
1660 |
__LINE__); |
|
1661 |
TBuf8<KMaxGBAUsageLength> gbaUsage; |
|
1662 |
TBuf8<KMaxVerLength> ver; |
|
1663 |
TBuf8<KMaxNewPasswordLength> newPassword; |
|
1664 |
||
1665 |
gbaUsage.Copy(aPskIdentityHint->Left(KMaxGBAUsageLength)); |
|
1666 |
ver.Copy(aPskIdentityHint->Mid(KMaxGBAUsageLength, KMaxVerLength)); |
|
1667 |
newPassword.Copy(aPskIdentityHint->Mid(KMaxGBAUsageLength |
|
1668 |
+ KMaxVerLength)); |
|
1669 |
||
1670 |
gbaUsage.UpperCase(); |
|
1671 |
ver.UpperCase(); |
|
1672 |
||
1673 |
if (gbaUsage.Compare(KWGBA) == 0) //We will proceed with key generation if its WGBA |
|
1674 |
{ |
|
1675 |
iTrace->Trace(_L("Its WGBA..."), KTraceFileName, __LINE__); |
|
1676 |
GeneratePsk_Identity_KeyL(ver, newPassword, aPskIdentity, aPskKey); |
|
1677 |
} |
|
1678 |
else |
|
1679 |
{ |
|
1680 |
TBuf<32> buf; |
|
1681 |
buf.Copy(gbaUsage); |
|
1682 |
iTrace->Trace(_L("Received GBA field is ..."), KTraceFileName, |
|
1683 |
__LINE__); |
|
1684 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
|
1685 |
iTrace->Trace(_L("Leaving as of now,till GBA supports comes..."), |
|
1686 |
KTraceFileName, __LINE__); |
|
1687 |
User::LeaveIfError( KErrNotSupported); |
|
1688 |
} |
|
1689 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1690 |
else |
39 | 1691 |
{ |
1692 |
iTrace->Trace(_L("Either Hint is Null OR Hint Length is exceeded."), |
|
1693 |
KTraceFileName, __LINE__); |
|
1694 |
User::LeaveIfError( KErrArgument); |
|
1695 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1696 |
|
39 | 1697 |
#ifdef _DEBUG |
1698 |
LogPskKeyInfoL(aPskIdentityHint, aPskIdentity, aPskKey); |
|
1699 |
#endif |
|
1700 |
iTrace->Trace(_L("CSuplConnection::GetPskL End"), KTraceFileName, |
|
1701 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1702 |
|
39 | 1703 |
} |
1704 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1705 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1706 |
// CSuplConnection::GeneratePsk_Identity_KeyL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1707 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1708 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1709 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1710 |
// |
39 | 1711 |
void CSuplConnection::GeneratePsk_Identity_KeyL(const TDesC8& aSLPKeyVer, |
1712 |
const TDesC8& aPassKey, HBufC8 *& aPskIdentity, HBufC8 *& aPskKey) |
|
1713 |
{ |
|
1714 |
||
1715 |
iTrace->Trace(_L("Before CR..."), KTraceFileName, __LINE__); |
|
1716 |
CRepository* repository = CRepository::NewL( |
|
1717 |
KCRUidPskTLSUsageConfiguration); |
|
1718 |
iTrace->Trace(_L("After CR..."), KTraceFileName, __LINE__); |
|
1719 |
CleanupStack::PushL(repository); |
|
1720 |
||
1721 |
TInt keyVersion; |
|
1722 |
||
1723 |
TLex8 verStr(aSLPKeyVer); |
|
1724 |
TInt SLPKeyVer; |
|
1725 |
verStr.Val(SLPKeyVer); |
|
1726 |
||
1727 |
TBuf8<KMaxPskKeyLength> pskKey; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1728 |
|
39 | 1729 |
TInt rc = repository->Get(KSuplPskTLSKeyVersion, keyVersion); |
1730 |
if (rc == KErrNone && keyVersion == SLPKeyVer) |
|
1731 |
{ |
|
1732 |
iTrace->Trace(_L("Version is matching with stored one..."), |
|
1733 |
KTraceFileName, __LINE__); |
|
1734 |
rc = repository->Get(KSuplPskTLSNewPassword, pskKey); |
|
1735 |
if (rc == KErrNone) |
|
1736 |
{ |
|
1737 |
aPskKey = HBufC8::NewL(KMaxPskKeyLength); |
|
1738 |
aPskKey->Des().Copy(pskKey); |
|
1739 |
iTrace->Trace(_L("Copied Psk Key"), KTraceFileName, __LINE__); |
|
1740 |
PrintHex(pskKey, __LINE__); |
|
1741 |
} |
|
1742 |
else |
|
1743 |
{ |
|
1744 |
iTrace->Trace(_L("KSuplPskTLSNewPassword Not Found"), |
|
1745 |
KTraceFileName, __LINE__); |
|
1746 |
User::LeaveIfError(rc); |
|
1747 |
} |
|
1748 |
} |
|
1749 |
else |
|
1750 |
{ |
|
1751 |
iTrace->Trace(_L("Version is NOT matching with stored one..."), |
|
1752 |
KTraceFileName, __LINE__); |
|
1753 |
iTrace->Trace(_L("Generating new Key..."), KTraceFileName, __LINE__); |
|
1754 |
GeneratePskKeyL(repository, aPassKey, aPskKey, SLPKeyVer); |
|
1755 |
PrintHex(*aPskKey, __LINE__); |
|
1756 |
} |
|
1757 |
||
1758 |
GeneratePskIdentityL(repository, SLPKeyVer, aPskIdentity); |
|
1759 |
CleanupStack::PopAndDestroy(repository); |
|
1760 |
||
1761 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1762 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1763 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1764 |
// CSuplConnection::GeneratePskIdentity |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1765 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1766 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1767 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1768 |
// |
39 | 1769 |
void CSuplConnection::GeneratePskIdentityL(CRepository* aRepository, |
1770 |
TInt /*aKeyVer*/, HBufC8 *& aPskIdentity) |
|
1771 |
{ |
|
1772 |
iTrace->Trace(_L("Start of GeneratePskIdentityL"), KTraceFileName, |
|
1773 |
__LINE__); |
|
1774 |
||
1775 |
TInt crKeyId; |
|
1776 |
TInt rc = aRepository->Get(KSuplPskTLSKeyId, crKeyId); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1777 |
|
39 | 1778 |
if (rc == KErrNone) |
1779 |
{ |
|
1780 |
aPskIdentity = HBufC8::NewL(KMaxPskKeyLength); |
|
1781 |
aPskIdentity->Des().Append(crKeyId); |
|
1782 |
aPskIdentity->Des().Append(13);//newline |
|
1783 |
iTrace->Trace(_L("Copied PskIdentityL"), KTraceFileName, __LINE__); |
|
1784 |
TRACESTRING ("PskIdentity : ") |
|
1785 |
PrintHex(aPskIdentity->Des(),__LINE__); |
|
1786 |
} |
|
1787 |
else |
|
1788 |
{ |
|
1789 |
iTrace->Trace(_L("KSuplPskTLSKeyId Not Found"), KTraceFileName, __LINE__); |
|
1790 |
User::LeaveIfError(rc); |
|
1791 |
} |
|
1792 |
iTrace->Trace(_L("End of GeneratePskIdentityL"), KTraceFileName, __LINE__); |
|
1793 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1794 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1795 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1796 |
// CSuplConnection::GeneratePskKeyL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1797 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1798 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1799 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1800 |
// |
39 | 1801 |
void CSuplConnection::GeneratePskKeyL(CRepository* aRepository, |
1802 |
const TDesC8& aPassKey, HBufC8 *& aPskKey, TInt aSLPKeyVersion) |
|
1803 |
{ |
|
1804 |
unsigned char newpassword[32]; |
|
1805 |
TBuf8<KMaxRootKeyLength> rootKey; |
|
1806 |
TBuf8<KMaxRootKeyXORLength> rootXORedPassKey; |
|
1807 |
TBuf8<KMaxSaltLength> finalSalt; |
|
1808 |
||
1809 |
iTrace->Trace(_L("Get rootKey from CR"), KTraceFileName, __LINE__); |
|
1810 |
||
1811 |
TBuf<KMaxRootKeyLength> rootKey16; |
|
1812 |
TInt rc = aRepository->Get(KSuplPskTLSRootPassword, rootKey16); |
|
1813 |
rootKey.Copy(rootKey16); |
|
1814 |
||
1815 |
TBuf<64> buf; |
|
1816 |
TRACESTRING("Root Key from CenRep") |
|
1817 |
TRACETEXT(rootKey) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1818 |
|
39 | 1819 |
buf.Copy(_L("Get(KSuplPskTLSRootPassword,rootKey16) ")); |
1820 |
buf.AppendNum(rc); |
|
1821 |
buf.Append(_L(" Len of rootkey ")); |
|
1822 |
buf.AppendNum(rootKey.Length()); |
|
1823 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
|
1824 |
User::LeaveIfError(rc); |
|
1825 |
||
1826 |
TRACESTRING("Pass Key from SLP") |
|
1827 |
TRACETEXT(aPassKey) |
|
1828 |
||
1829 |
if(rc == KErrNone && rootKey.Length() != 0) |
|
1830 |
{ |
|
1831 |
TBuf8<KMaxRootKeyLength> rootXORedKey; |
|
1832 |
||
1833 |
iTrace->Trace(_L("DoSelfXOR"), KTraceFileName, __LINE__); |
|
1834 |
DoSelfXOR(rootXORedKey,rootKey); |
|
1835 |
TRACESTRING("Self XOR") |
|
1836 |
PrintHex(rootXORedKey,__LINE__); |
|
1837 |
||
1838 |
iTrace->Trace(_L("DoXOR"), KTraceFileName, __LINE__); |
|
1839 |
DoXOR(rootXORedPassKey,aPassKey,rootXORedKey); |
|
1840 |
TRACESTRING("DoXOR") |
|
1841 |
PrintHex(rootXORedPassKey,__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1842 |
|
39 | 1843 |
iTrace->Trace(_L("FormSalt"), KTraceFileName, __LINE__); |
1844 |
TRACETEXT(KSaltValue) |
|
1845 |
FormSaltKey(finalSalt,KSaltValue); |
|
1846 |
TRACESTRING("Salt Value in hex...") |
|
1847 |
PrintHex(finalSalt,__LINE__); |
|
1848 |
||
1849 |
iTrace->Trace(_L("Call derive key"), KTraceFileName, __LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1850 |
|
39 | 1851 |
buf.Copy(_L("Length of RootXORedPassKey ")); |
1852 |
buf.AppendNum(rootXORedPassKey.Length()); |
|
1853 |
TRACETEXT(buf) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1854 |
|
39 | 1855 |
buf.Copy(_L("Length of Salt Key ")); |
1856 |
buf.AppendNum(finalSalt.Length()); |
|
1857 |
TRACETEXT(buf) |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1858 |
|
39 | 1859 |
derive_key(rootXORedPassKey.Ptr(),rootXORedPassKey.Length(),finalSalt.Ptr(), |
1860 |
finalSalt.Length(),8,newpassword,32); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1861 |
|
39 | 1862 |
iTrace->Trace(_L("Copy key into PskKey"), KTraceFileName, __LINE__); |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1863 |
|
39 | 1864 |
aPskKey = HBufC8::NewL(32); |
1865 |
aPskKey->Des().Copy(newpassword,32); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1866 |
|
39 | 1867 |
buf.Copy(_L("Length of Key ")); |
1868 |
buf.AppendNum(aPskKey->Des().Length()); |
|
1869 |
TRACETEXT(buf) |
|
1870 |
||
1871 |
TRACESTRING("Key...") |
|
1872 |
PrintHex(aPskKey->Des(),__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1873 |
|
39 | 1874 |
aRepository->Set(KSuplPskTLSNewPassword,aPskKey->Des()); |
1875 |
aRepository->Set(KSuplPskTLSKeyVersion,aSLPKeyVersion); |
|
1876 |
iTrace->Trace(_L("Copied PskKey"), KTraceFileName, __LINE__); |
|
1877 |
} |
|
1878 |
||
1879 |
else |
|
1880 |
{ |
|
1881 |
iTrace->Trace(_L("KSuplPskTLSRootPassword Not Found"), KTraceFileName, __LINE__); |
|
1882 |
User::LeaveIfError(rc); |
|
1883 |
} |
|
1884 |
||
1885 |
iTrace->Trace(_L("End GeneratePskKeyL"), KTraceFileName, __LINE__); |
|
1886 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1887 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1888 |
// CSuplConnection::LogPskKeyInfoL |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1889 |
// |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1890 |
// (other items were commented in a header). |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1891 |
// ----------------------------------------------------------------------------- |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1892 |
// |
39 | 1893 |
void CSuplConnection::LogPskKeyInfoL(const HBufC8* /*aPskIdentityHint*/, |
1894 |
HBufC8* /*aPskIdentity*/, HBufC8* /*aPskKey*/) |
|
1895 |
{ |
|
1896 |
#if 0 |
|
1897 |
TBuf<128> buf; |
|
1898 |
buf.Copy(_L("PSK Key :")); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1899 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
39 | 1900 |
HBufC* hintbuf = NULL; |
1901 |
TInt err; |
|
1902 |
TRAP(err, hintbuf = HBufC::NewL(aPskKey->Length())); |
|
1903 |
err = 0; |
|
1904 |
hintbuf->Des().Copy(aPskKey->Des()); |
|
1905 |
iTrace->Trace( hintbuf->Des(),KTraceFileName, __LINE__); |
|
1906 |
delete hintbuf; |
|
1907 |
hintbuf = NULL; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1908 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1909 |
buf.Copy(_L("PSK Identity :")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1910 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
39 | 1911 |
TRAP(err, hintbuf = HBufC::NewL(aPskIdentity->Length())); |
1912 |
err = 0; |
|
1913 |
hintbuf->Des().Copy(aPskIdentity->Des()); |
|
1914 |
iTrace->Trace( hintbuf->Des(),KTraceFileName, __LINE__); |
|
1915 |
delete hintbuf; |
|
1916 |
hintbuf = NULL; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1917 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1918 |
if (aPskIdentityHint != NULL) |
39 | 1919 |
{ |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1920 |
buf.Copy(_L("Rcvd Identity Hint :")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1921 |
iTrace->Trace(buf, KTraceFileName, __LINE__); |
39 | 1922 |
TRAP(err, hintbuf = HBufC::NewL(aPskIdentityHint->Length())); |
1923 |
err = 0; |
|
1924 |
hintbuf->Des().Copy(*aPskIdentityHint); |
|
1925 |
iTrace->Trace( hintbuf->Des(),KTraceFileName, __LINE__); |
|
1926 |
delete hintbuf; |
|
1927 |
hintbuf = NULL; |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1928 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1929 |
else |
39 | 1930 |
{ |
1931 |
iTrace->Trace(_L("Rcvd Null Identity Hint"), KTraceFileName, __LINE__); |
|
1932 |
} |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1933 |
#endif |
39 | 1934 |
} |
1935 |
||
1936 |
void CSuplConnection::PrintHex(const TDesC8& |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1937 |
#ifdef _DEBUG |
39 | 1938 |
aBuffer |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1939 |
#endif |
39 | 1940 |
, TInt |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1941 |
#ifdef _DEBUG |
39 | 1942 |
aLine |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1943 |
#endif |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1944 |
|
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1945 |
) |
39 | 1946 |
{ |
1947 |
#ifdef _DEBUG |
|
1948 |
TBuf<128> buffer; |
|
1949 |
TBuf<8> buff; |
|
1950 |
_LIT16(KFormat1, "%02x"); |
|
1951 |
TInt len = aBuffer.Length(); |
|
1952 |
for (TInt i = 0; i < len; i++) |
|
1953 |
{ |
|
1954 |
buff.Zero(); |
|
1955 |
buff.Format(KFormat1, aBuffer[i]); |
|
1956 |
TRACETEXT (buff) |
|
1957 |
iTrace->Trace(buff, KTraceFileName, aLine); |
|
1958 |
} |
|
1959 |
#endif |
|
1960 |
} |
|
1961 |
||
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1962 |
EXPORT_C TInt CSuplConnection::GetPortNumberUsed() |
39 | 1963 |
{ |
1964 |
iTrace->Trace(_L("CSuplConnection::GetPortNumberUsed"), KTraceFileName, |
|
1965 |
__LINE__); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1966 |
if (iState == EConnected) |
39 | 1967 |
{ |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1968 |
TBuf<64> msg(_L("Port Number used is ")); |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1969 |
msg.AppendNum(iSocket.LocalPort()); |
39 | 1970 |
iTrace->Trace(msg, KTraceFileName, __LINE__); |
1971 |
return iSocket.LocalPort(); |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1972 |
} |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1973 |
else |
39 | 1974 |
return KErrGeneral; |
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1975 |
} |
39 | 1976 |
|
0
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1977 |
// PSK TLS End |
667063e416a2
Revision: 201003
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1978 |
// End of File |