author | hgs |
Fri, 03 Sep 2010 09:37:37 +0300 | |
changeset 60 | 822a45792fdd |
parent 53 | bdc64aa9b954 |
permissions | -rw-r--r-- |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
1 |
/* |
31 | 2 |
* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
3 |
* All rights reserved. |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
4 |
* This component and the accompanying materials are made available |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
5 |
* under the terms of "Eclipse Public License v1.0" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
6 |
* which accompanies this distribution, and is available |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
7 |
* at the URL "http://www.eclipse.org/legal/epl-v10.html". |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
8 |
* |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
9 |
* Initial Contributors: |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
10 |
* Nokia Corporation - initial contribution. |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
11 |
* |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
12 |
* Contributors: |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
13 |
* |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
14 |
* Description: |
31 | 15 |
* WLAN Qt Utilities private implementation. |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
16 |
*/ |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
17 |
|
31 | 18 |
// System includes |
19 |
||
20 |
#include <QSharedPointer> |
|
21 |
||
22 |
// User includes |
|
23 |
||
24 |
#include "wlanqtutilsap.h" |
|
25 |
#include "wlanqtutilsconnection.h" |
|
26 |
#include "wlanqtutilsiapsettings.h" |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
27 |
#include "wlanqtutilsconmonwrapper.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
28 |
#include "wlanqtutilsesockwrapper.h" |
39 | 29 |
#include "wlanqtutilsscan.h" |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
30 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
31 |
#include "wlanqtutils.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
32 |
#include "wlanqtutils_p.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
33 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
34 |
#include "OstTraceDefinitions.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
35 |
#ifdef OST_TRACE_COMPILER_IN_USE |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
36 |
#include "wlanqtutils_pTraces.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
37 |
#endif |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
38 |
|
31 | 39 |
/*! |
40 |
\class WlanQtUtilsPrivate |
|
41 |
\brief Private implementation class for WLAN Qt Utilities. |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
42 |
|
31 | 43 |
The private interface functions are identical to those in WlanQtUtils |
44 |
class, so refer to that for descriptions. Other functions contain |
|
45 |
implementation documentation. |
|
46 |
*/ |
|
47 |
||
48 |
||
49 |
// External function prototypes |
|
50 |
||
51 |
// Local constants |
|
52 |
||
53 |
// ======== LOCAL FUNCTIONS ======== |
|
54 |
||
55 |
// ======== MEMBER FUNCTIONS ======== |
|
56 |
||
57 |
/*! |
|
58 |
Constructor. |
|
59 |
*/ |
|
60 |
||
61 |
WlanQtUtilsPrivate::WlanQtUtilsPrivate(WlanQtUtils *q_ptr) : |
|
62 |
q_ptr(q_ptr), |
|
63 |
mSettings(new WlanQtUtilsIapSettings(this)), |
|
64 |
mConMonWrapper(new WlanQtUtilsConMonWrapper(this)), |
|
39 | 65 |
mScanWrapper(new WlanQtUtilsScan(this)), |
31 | 66 |
mEsockWrapper(new WlanQtUtilsEsockWrapper(this)), |
39 | 67 |
mIctService(), |
68 |
mScanMode(ScanModeNone), |
|
53 | 69 |
mIapScanList(), |
31 | 70 |
mWlanScanList(), |
71 |
mToBeTestedIapId(WlanQtUtils::IapIdNone), |
|
72 |
mConnectingIapId(WlanQtUtils::IapIdNone), |
|
73 |
mConnection() |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
74 |
{ |
31 | 75 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATE_ENTRY, this); |
76 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
77 |
// Make all connections. |
31 | 78 |
bool connectStatus = connect( |
53 | 79 |
mScanWrapper, |
60 | 80 |
SIGNAL(availableWlanIaps(QList< QSharedPointer<WlanQtUtilsAp> > &)), |
53 | 81 |
this, |
60 | 82 |
SLOT(updateAvailableWlanIaps(QList< QSharedPointer<WlanQtUtilsAp> > &))); |
53 | 83 |
Q_ASSERT(connectStatus); |
84 |
||
85 |
connectStatus = connect( |
|
39 | 86 |
mScanWrapper, |
87 |
SIGNAL(availableWlanAps(QList< QSharedPointer<WlanQtUtilsAp> >&)), |
|
31 | 88 |
this, |
39 | 89 |
SLOT(updateAvailableWlanAps(QList< QSharedPointer<WlanQtUtilsAp> >&))); |
90 |
Q_ASSERT(connectStatus); |
|
91 |
||
92 |
connectStatus = connect( |
|
93 |
mScanWrapper, |
|
94 |
SIGNAL(scanFailed(int)), |
|
95 |
this, |
|
60 | 96 |
SLOT(updateScanFailed(int))); |
31 | 97 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
98 |
|
31 | 99 |
connectStatus = connect( |
100 |
mEsockWrapper, |
|
101 |
SIGNAL(connectionStatusFromWrapper(bool)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
102 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
103 |
SLOT(updateConnectionStatus(bool))); |
31 | 104 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
105 |
|
31 | 106 |
connectStatus = connect( |
107 |
mConMonWrapper, |
|
108 |
SIGNAL(connCreatedEventFromWrapper(uint)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
109 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
110 |
SLOT(addActiveConnection(uint))); |
31 | 111 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
112 |
|
31 | 113 |
connectStatus = connect( |
114 |
mConMonWrapper, |
|
115 |
SIGNAL(connDeletedEventFromWrapper(uint)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
116 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
117 |
SLOT(removeActiveConnection(uint))); |
31 | 118 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
119 |
|
31 | 120 |
connectStatus = connect( |
121 |
mConMonWrapper, |
|
122 |
SIGNAL(connStatusEventFromWrapper(uint, WlanQtUtils::ConnStatus)), |
|
123 |
this, |
|
124 |
SLOT(updateActiveConnection(uint, WlanQtUtils::ConnStatus))); |
|
125 |
Q_ASSERT(connectStatus); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
126 |
|
31 | 127 |
// Retrieve initial status of active connections |
128 |
mConnection = QSharedPointer<WlanQtUtilsConnection>( |
|
129 |
mConMonWrapper->activeConnection()); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
130 |
|
31 | 131 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATE_EXIT, this); |
132 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
133 |
|
31 | 134 |
/*! |
135 |
Destructor. |
|
136 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
137 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
138 |
WlanQtUtilsPrivate::~WlanQtUtilsPrivate() |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
139 |
{ |
31 | 140 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATEDESTR_ENTRY, this); |
141 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATEDESTR_EXIT, this); |
|
142 |
} |
|
143 |
||
144 |
/*! |
|
145 |
See WlanQtUtils::scanWlans(). |
|
146 |
*/ |
|
147 |
||
148 |
void WlanQtUtilsPrivate::scanWlans() |
|
149 |
{ |
|
150 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANS_ENTRY, this); |
|
151 |
||
39 | 152 |
// Scanning while there is an ongoing scan is not supported |
153 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
154 |
||
53 | 155 |
// Starting with an IAP scan, and continuing with AP scan |
39 | 156 |
mScanMode = ScanModeAvailableWlans; |
53 | 157 |
mScanWrapper->scanWlanIaps(); |
31 | 158 |
|
159 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANS_EXIT, this); |
|
160 |
} |
|
161 |
||
162 |
/*! |
|
163 |
See WlanQtUtils::scanWlanAps(). |
|
164 |
*/ |
|
165 |
||
166 |
void WlanQtUtilsPrivate::scanWlanAps() |
|
167 |
{ |
|
168 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANAPS_ENTRY, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
169 |
|
39 | 170 |
// Scanning while there is an ongoing scan is not supported |
171 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
172 |
||
173 |
// Just forward the request to wrapper, which triggers a broadcast WLAN scan |
|
174 |
mScanMode = ScanModeAvailableWlanAps; |
|
175 |
mScanWrapper->scanWlanAps(); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
176 |
|
31 | 177 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANAPS_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
178 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
179 |
|
31 | 180 |
/*! |
181 |
See WlanQtUtils::scanWlanDirect(). |
|
182 |
*/ |
|
183 |
||
184 |
void WlanQtUtilsPrivate::scanWlanDirect(const QString &ssid) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
185 |
{ |
31 | 186 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANDIRECT_ENTRY, this); |
39 | 187 |
|
188 |
// Scanning while there is an ongoing scan is not supported |
|
189 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
31 | 190 |
|
39 | 191 |
// Just forward the request to wrapper, which triggers a direct WLAN scan |
192 |
mScanMode = ScanModeDirect; |
|
193 |
mScanWrapper->scanWlanDirect(ssid); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
194 |
|
31 | 195 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANDIRECT_EXIT, this); |
196 |
} |
|
197 |
||
198 |
/*! |
|
199 |
See WlanQtUtils::stopWlanScan(). |
|
200 |
*/ |
|
201 |
||
202 |
void WlanQtUtilsPrivate::stopWlanScan() |
|
203 |
{ |
|
204 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_STOPWLANSCAN_ENTRY, this); |
|
205 |
||
39 | 206 |
if (mScanMode != ScanModeNone) { |
60 | 207 |
int mode = mScanMode; |
39 | 208 |
// Stop the scan |
209 |
mScanMode = ScanModeNone; |
|
210 |
mScanWrapper->stopScan(); |
|
60 | 211 |
|
212 |
// Inform that scan was cancelled |
|
213 |
reportScanResult(WlanQtUtils::ScanStatusCancelled, mode); |
|
39 | 214 |
} |
31 | 215 |
|
216 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_STOPWLANSCAN_EXIT, this); |
|
217 |
} |
|
218 |
||
219 |
/*! |
|
220 |
See WlanQtUtils::availableWlans(). |
|
221 |
*/ |
|
222 |
||
223 |
void WlanQtUtilsPrivate::availableWlans( |
|
60 | 224 |
QList< QSharedPointer<WlanQtUtilsAp> > &wlanIapList, |
31 | 225 |
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const |
226 |
{ |
|
227 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_AVAILABLEWLAN_ENTRY, this); |
|
228 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
229 |
wlanIapList.clear(); |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
230 |
wlanApList.clear(); |
31 | 231 |
|
232 |
// Read the list of configured IAPs |
|
60 | 233 |
QList< QSharedPointer<WlanQtUtilsAp> > configuredIapList; |
31 | 234 |
mSettings->fetchIaps(configuredIapList); |
235 |
||
53 | 236 |
// Update the list of available IAPs |
60 | 237 |
foreach (QSharedPointer<WlanQtUtilsAp> iapIter, mIapScanList) { |
238 |
int iapId = iapIter->value(WlanQtUtilsAp::ConfIdIapId).toInt(); |
|
239 |
QSharedPointer<WlanQtUtilsAp> iap(mSettings->fetchIap(iapId)); |
|
53 | 240 |
if (iap) { |
241 |
// Only add the IAP if we (still) have the settings for it |
|
242 |
iap->setValue( |
|
243 |
WlanQtUtilsAp::ConfIdSignalStrength, |
|
244 |
iapIter->value(WlanQtUtilsAp::ConfIdSignalStrength)); |
|
245 |
wlanIapList.append(iap); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
246 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
247 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
248 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
249 |
// Go through the scan results to find unknown APs |
31 | 250 |
for (int i = 0; i < mWlanScanList.count(); i++) { |
251 |
// Check whether an IAP with these parameters exists (in which |
|
252 |
// case this network is already added as an IAP in the loop above) |
|
253 |
if (!wlanIapExists(configuredIapList, mWlanScanList[i].data())) { |
|
254 |
// No IAP found in, copy the AP to caller's list of |
|
255 |
// unknown APs |
|
256 |
wlanApList.append(mWlanScanList[i]); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
257 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
258 |
} |
31 | 259 |
|
260 |
traceIapsAndAps(wlanIapList, wlanApList); |
|
261 |
||
262 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_AVAILABLEWLAN_EXIT, this); |
|
263 |
} |
|
264 |
||
265 |
/*! |
|
266 |
See WlanQtUtils::availableWlanAps(). |
|
267 |
*/ |
|
268 |
||
269 |
void WlanQtUtilsPrivate::availableWlanAps( |
|
270 |
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const |
|
271 |
{ |
|
272 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_AVAILABLEWLANAPS_ENTRY, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
273 |
|
39 | 274 |
// Just copy the results |
275 |
wlanApList = mWlanScanList; |
|
31 | 276 |
|
277 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_AVAILABLEWLANAPS_EXIT, this); |
|
278 |
} |
|
279 |
||
280 |
/*! |
|
281 |
See WlanQtUtils::createIap(). |
|
282 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
283 |
|
31 | 284 |
int WlanQtUtilsPrivate::createIap(const WlanQtUtilsAp *wlanAp) |
285 |
{ |
|
286 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_CREATEIAP_ENTRY, this); |
|
287 |
||
288 |
// Create the new IAP and return its ID |
|
289 |
int newIapId = mSettings->createIap(wlanAp); |
|
290 |
||
291 |
OstTrace1( |
|
292 |
TRACE_BORDER, |
|
293 |
WLANQTUTILSPRIVATE_CREATEIAP, |
|
294 |
"WlanQtUtilsPrivate::createIap;New IAP ID=%d", |
|
295 |
newIapId); |
|
296 |
||
297 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_CREATEIAP_EXIT, this); |
|
298 |
return newIapId; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
299 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
300 |
|
31 | 301 |
/*! |
302 |
See WlanQtUtils::updateIap(). |
|
303 |
*/ |
|
304 |
||
305 |
bool WlanQtUtilsPrivate::updateIap(int iapId, const WlanQtUtilsAp *wlanAp) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
306 |
{ |
31 | 307 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEIAP_ENTRY, this); |
308 |
||
309 |
bool success = mSettings->updateIap(iapId, wlanAp); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
310 |
|
31 | 311 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEIAP_EXIT, this); |
312 |
return success; |
|
313 |
} |
|
314 |
||
315 |
/*! |
|
316 |
See WlanQtUtils::deleteIap(). |
|
317 |
*/ |
|
318 |
||
319 |
void WlanQtUtilsPrivate::deleteIap(int iapId) |
|
320 |
{ |
|
321 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_DELETEIAP_ENTRY, this); |
|
322 |
||
323 |
mSettings->deleteIap(iapId); |
|
324 |
||
325 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_DELETEIAP_EXIT, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
326 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
327 |
|
31 | 328 |
/*! |
329 |
See WlanQtUtils::connectIap(). |
|
330 |
*/ |
|
331 |
||
332 |
void WlanQtUtilsPrivate::connectIap(int iapId, bool runIct) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
333 |
{ |
31 | 334 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_CONNECTIAP_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
335 |
|
31 | 336 |
OstTraceExt2( |
337 |
TRACE_BORDER, |
|
338 |
WLANQTUTILSPRIVATE_CONNECTIAP, |
|
339 |
"WlanQtUtilsPrivate::connectIap;IAP ID=%d;runIct=%hhu", |
|
340 |
iapId, |
|
341 |
runIct); |
|
342 |
||
343 |
Q_ASSERT(iapId != WlanQtUtils::IapIdNone); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
344 |
|
31 | 345 |
if (runIct) { |
346 |
// Mark this IAP for ICT testing after it has been opened |
|
347 |
mToBeTestedIapId = iapId; |
|
348 |
} |
|
349 |
mConnectingIapId = iapId; |
|
350 |
mEsockWrapper->connectIap(iapId); |
|
351 |
||
352 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_CONNECTIAP_EXIT, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
353 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
354 |
|
31 | 355 |
/*! |
356 |
See WlanQtUtils::disconnectIap(). |
|
357 |
*/ |
|
358 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
359 |
void WlanQtUtilsPrivate::disconnectIap(int iapId) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
360 |
{ |
31 | 361 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_DISCONNECTIAP_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
362 |
|
31 | 363 |
OstTrace1( |
364 |
TRACE_BORDER, |
|
365 |
WLANQTUTILSPRIVATE_DISCONNECTIAP, |
|
39 | 366 |
"WlanQtUtilsPrivate::disconnectIap;IAP ID=%d", |
367 |
iapId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
368 |
|
31 | 369 |
if (iapId != WlanQtUtils::IapIdNone) { |
370 |
// Close our RConnection handle, if needed. Wrapper ignores call, if |
|
371 |
// no handle exists. |
|
372 |
mEsockWrapper->disconnectIap(); |
|
373 |
||
374 |
// In order to close connection even if there are other users for the |
|
375 |
// IAP, close also via ConMon |
|
376 |
mConMonWrapper->disconnectIap(iapId); |
|
377 |
} // else: just ignore call |
|
378 |
||
379 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_DISCONNECTIAP_EXIT, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
380 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
381 |
|
60 | 382 |
/* |
383 |
See WlanQtUtils::moveIapToInternetSnap(). |
|
384 |
*/ |
|
385 |
||
386 |
void WlanQtUtilsPrivate::moveIapToInternetSnap(int iapId) |
|
387 |
{ |
|
388 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_MOVEIAPTOINTERNETSNAP_ENTRY); |
|
389 |
||
390 |
mSettings->moveIapToInternetSnap(iapId); |
|
391 |
||
392 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_MOVEIAPTOINTERNETSNAP_EXIT); |
|
393 |
} |
|
394 |
||
31 | 395 |
/*! |
396 |
See WlanQtUtils::connectionStatus(). |
|
397 |
*/ |
|
398 |
||
399 |
WlanQtUtils::ConnStatus WlanQtUtilsPrivate::connectionStatus() const |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
400 |
{ |
31 | 401 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_CONNECTIONSTATUS_ENTRY); |
402 |
||
403 |
WlanQtUtils::ConnStatus status = WlanQtUtils::ConnStatusDisconnected; |
|
404 |
||
405 |
if (mConnection) { |
|
406 |
status = mConnection->connectionStatus(); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
407 |
} |
31 | 408 |
OstTrace1( |
409 |
TRACE_BORDER, |
|
410 |
WLANQTUTILSPRIVATE_CONNECTIONSTATUS, |
|
411 |
"WlanQtUtilsPrivate::connectionStatus;status=%{ConnStatus};", |
|
412 |
(TUint)status); |
|
413 |
||
414 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_CONNECTIONSTATUS_EXIT); |
|
415 |
return status; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
416 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
417 |
|
31 | 418 |
/*! |
419 |
See WlanQtUtils::activeIap(). |
|
420 |
*/ |
|
421 |
||
422 |
int WlanQtUtilsPrivate::activeIap() const |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
423 |
{ |
31 | 424 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_ACTIVEIAP_ENTRY); |
425 |
||
426 |
int iapId = WlanQtUtils::IapIdNone; |
|
427 |
||
428 |
if (mConnection) { |
|
429 |
iapId = mConnection->iapId(); |
|
430 |
} |
|
431 |
OstTrace1( |
|
432 |
TRACE_BORDER, |
|
433 |
WLANQTUTILSPRIVATE_ACTIVEIAP, |
|
434 |
"WlanQtUtilsPrivate::activeIap;iapId=%d", |
|
435 |
iapId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
436 |
|
31 | 437 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_ACTIVEIAP_EXIT); |
438 |
return iapId; |
|
439 |
} |
|
440 |
||
441 |
/*! |
|
442 |
See WlanQtUtils::iapName(). |
|
443 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
444 |
|
31 | 445 |
QString WlanQtUtilsPrivate::iapName(int iapId) const |
446 |
{ |
|
447 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_IAPNAME_ENTRY, this); |
|
448 |
||
449 |
QString name; |
|
450 |
// Read the IAP from settings and return its name |
|
60 | 451 |
QSharedPointer<WlanQtUtilsAp> iap = mSettings->fetchIap(iapId); |
31 | 452 |
if (iap) { |
60 | 453 |
name = iap->value(WlanQtUtilsAp::ConfIdName).toString(); |
31 | 454 |
} |
455 |
||
456 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_IAPNAME_EXIT, this); |
|
457 |
return name; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
458 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
459 |
|
31 | 460 |
/*! |
461 |
This function searches for a WLAN IAP matching the given WLAN AP. |
|
462 |
||
463 |
@param [in] list List to search from. |
|
464 |
@param [in] ap Access point to search for. |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
465 |
|
31 | 466 |
@return True, if suitable WLAN IAP found, false otherwise. |
467 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
468 |
|
31 | 469 |
bool WlanQtUtilsPrivate::wlanIapExists( |
60 | 470 |
const QList< QSharedPointer<WlanQtUtilsAp> > list, |
31 | 471 |
const WlanQtUtilsAp *ap) const |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
472 |
{ |
31 | 473 |
bool match = false; // Return value |
474 |
||
60 | 475 |
foreach (QSharedPointer<WlanQtUtilsAp> iap, list) { |
39 | 476 |
if (WlanQtUtilsAp::compare(iap.data(), ap) == 0) { |
31 | 477 |
// Match found |
478 |
match = true; |
|
479 |
break; |
|
480 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
481 |
} |
31 | 482 |
|
483 |
return match; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
484 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
485 |
|
31 | 486 |
/*! |
60 | 487 |
Reports the scanning result to the client. |
488 |
||
489 |
@param [in] status Scan status code (WlanQtUtils::ScanStatus). |
|
490 |
@param [in] mode Mode of the scan whose status is reported. |
|
491 |
*/ |
|
492 |
||
493 |
void WlanQtUtilsPrivate::reportScanResult(int status, int mode) |
|
494 |
{ |
|
495 |
switch (mode) { |
|
496 |
case ScanModeAvailableWlans: |
|
497 |
OstTrace1( |
|
498 |
TRACE_BORDER, |
|
499 |
WLANQTUTILSPRIVATE_WLANSCANREADY, |
|
500 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanReady;status=%{ScanStatus};", |
|
501 |
status); |
|
502 |
emit q_ptr->wlanScanReady(status); |
|
503 |
break; |
|
504 |
||
505 |
case ScanModeAvailableWlanAps: |
|
506 |
OstTrace1( |
|
507 |
TRACE_BORDER, |
|
508 |
WLANQTUTILSPRIVATE_WLANSCANAPREADY, |
|
509 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanApReady;status=%{ScanStatus};", |
|
510 |
status); |
|
511 |
emit q_ptr->wlanScanApReady(status); |
|
512 |
break; |
|
513 |
||
514 |
case ScanModeDirect: |
|
515 |
OstTrace1( |
|
516 |
TRACE_BORDER, |
|
517 |
WLANQTUTILSPRIVATE_WLANSCANDIRECTREADY, |
|
518 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanDirectReady;status=%{ScanStatus};", |
|
519 |
status); |
|
520 |
emit q_ptr->wlanScanDirectReady(status); |
|
521 |
break; |
|
522 |
||
523 |
#ifndef QT_NO_DEBUG |
|
524 |
default: |
|
525 |
// Invalid scan mode detected |
|
526 |
Q_ASSERT(0); |
|
527 |
break; |
|
528 |
#endif |
|
529 |
} |
|
530 |
} |
|
531 |
||
532 |
/*! |
|
31 | 533 |
This function traces the given IAPs and APs. |
534 |
||
535 |
@param [in] iaps IAPs to trace. |
|
536 |
@param [in] aps APs to trace. |
|
537 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
538 |
|
31 | 539 |
void WlanQtUtilsPrivate::traceIapsAndAps( |
60 | 540 |
const QList< QSharedPointer<WlanQtUtilsAp> > &iaps, |
541 |
const QList< QSharedPointer<WlanQtUtilsAp> > &aps) const |
|
31 | 542 |
{ |
543 |
#ifndef OST_TRACE_COMPILER_IN_USE |
|
544 |
Q_UNUSED(iaps); |
|
545 |
Q_UNUSED(aps); |
|
546 |
#else |
|
60 | 547 |
foreach (QSharedPointer<WlanQtUtilsAp> iap, iaps) { |
548 |
QString tmp(iap->value(WlanQtUtilsAp::ConfIdSsid).toString()); |
|
31 | 549 |
TPtrC16 name(tmp.utf16(), tmp.length()); |
550 |
OstTraceExt3( |
|
551 |
TRACE_NORMAL, |
|
552 |
WLANQTUTILSPRIVATE_TRACEAVAILABLEWLANAPS_IAP, |
|
39 | 553 |
"WlanQtUtilsPrivate::traceAvailableWlanAps IAP;name=%S;secMode=%{WlanSecMode};signalStrength=%d", |
31 | 554 |
name, |
555 |
iap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(), |
|
556 |
iap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()); |
|
557 |
} |
|
558 |
foreach (QSharedPointer<WlanQtUtilsAp> ap, aps) { |
|
559 |
QString tmp(ap->value(WlanQtUtilsAp::ConfIdSsid).toString()); |
|
560 |
TPtrC16 ssid(tmp.utf16(), tmp.length()); |
|
561 |
OstTraceExt3( |
|
562 |
TRACE_NORMAL, |
|
563 |
WLANQTUTILSPRIVATE_TRACEAVAILABLEWLANAPS_AP, |
|
39 | 564 |
"WlanQtUtilsPrivate::traceAvailableWlanAps AP;ssid=%S;secMode=%{WlanSecMode};signalStrength=%d", |
31 | 565 |
ssid, |
566 |
ap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(), |
|
39 | 567 |
ap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()); |
31 | 568 |
} |
569 |
#endif |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
570 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
571 |
|
31 | 572 |
/*! |
53 | 573 |
Slot for handling WLAN IAP scan result event from wrapper. Results are |
574 |
stored in a member variable. |
|
575 |
||
576 |
@param [in] availableIaps Available WLAN IAP's found in scan. |
|
577 |
*/ |
|
578 |
||
579 |
void WlanQtUtilsPrivate::updateAvailableWlanIaps( |
|
60 | 580 |
QList< QSharedPointer<WlanQtUtilsAp> > &availableIaps) |
53 | 581 |
{ |
582 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANIAPS_ENTRY); |
|
583 |
||
584 |
// Store the new IAP list |
|
585 |
mIapScanList = availableIaps; |
|
586 |
||
587 |
// Continue with AP scan (which should come immediately from WLAN's scan cache) |
|
588 |
mScanWrapper->scanWlanAps(); |
|
589 |
||
590 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANIAPS_EXIT); |
|
591 |
} |
|
592 |
||
593 |
/*! |
|
594 |
Slot for handling WLAN AP scan result event from wrapper. Results are |
|
31 | 595 |
stored in member variable (possible duplicates are removed). |
596 |
||
597 |
@param [in] availableWlanList WLAN networks found in scan. |
|
598 |
*/ |
|
599 |
||
600 |
void WlanQtUtilsPrivate::updateAvailableWlanAps( |
|
39 | 601 |
QList< QSharedPointer<WlanQtUtilsAp> > &availableWlanList) |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
602 |
{ |
31 | 603 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANAPS_ENTRY, this); |
604 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
605 |
// Old results are removed |
31 | 606 |
mWlanScanList.clear(); |
53 | 607 |
|
31 | 608 |
// Copy available WLANs to scan result list (duplicates are removed) |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
609 |
for (int i = 0; i < availableWlanList.count(); i++) { |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
610 |
bool duplicate = false; |
31 | 611 |
for (int j = 0; j < mWlanScanList.count(); j++) { |
612 |
if (WlanQtUtilsAp::compare( |
|
613 |
availableWlanList[i].data(), |
|
39 | 614 |
mWlanScanList[j].data()) == 0) { |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
615 |
duplicate = true; |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
616 |
break; |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
617 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
618 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
619 |
if (duplicate == false) { |
31 | 620 |
mWlanScanList.append(availableWlanList[i]); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
621 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
622 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
623 |
|
60 | 624 |
int mode = mScanMode; |
39 | 625 |
// Scan is complete |
626 |
mScanMode = ScanModeNone; |
|
53 | 627 |
|
60 | 628 |
// The information is forwarded to the client |
629 |
reportScanResult(WlanQtUtils::ScanStatusOk, mode); |
|
630 |
||
31 | 631 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANAPS_EXIT, this); |
632 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
633 |
|
31 | 634 |
/*! |
60 | 635 |
Slot for handling WLAN scan failure event from wrapper. Result is |
636 |
reported to client. |
|
637 |
||
39 | 638 |
@param [in] status Scan status code (WlanQtUtils::ScanStatus). |
639 |
*/ |
|
640 |
||
60 | 641 |
void WlanQtUtilsPrivate::updateScanFailed(int status) |
39 | 642 |
{ |
60 | 643 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATESCANFAILED_ENTRY, this); |
39 | 644 |
|
60 | 645 |
int mode = mScanMode; |
646 |
// Scan is now done |
|
647 |
mScanMode = ScanModeNone; |
|
648 |
reportScanResult(status, mode); |
|
649 |
||
650 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATESCANFAILED_EXIT, this); |
|
39 | 651 |
} |
652 |
||
653 |
/*! |
|
31 | 654 |
Slot for handling connection setup status event from wrapper. |
655 |
||
656 |
@param [in] isOpened Was connection setup successful? |
|
657 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
658 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
659 |
void WlanQtUtilsPrivate::updateConnectionStatus(bool isOpened) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
660 |
{ |
31 | 661 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATECONNECTIONSTATUS_ENTRY, this); |
662 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
663 |
if (isOpened == false) { |
31 | 664 |
// Opening failed, update connection status and inform UI |
665 |
if (mConnection) { |
|
666 |
mConnection->setConnectionStatus( |
|
667 |
WlanQtUtils::ConnStatusDisconnected); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
668 |
} |
31 | 669 |
|
670 |
// Include the status code from connection wrapper |
|
671 |
int status = mEsockWrapper->lastStatusCode(); |
|
672 |
OstTraceExt2( |
|
673 |
TRACE_BORDER, |
|
674 |
WLANQTUTILSPRIVATE_WLANNETWORKCLOSED, |
|
675 |
"WlanQtUtilsPrivate::emit wlanNetworkClosed;IAP ID=%d;status=%d", |
|
676 |
mConnectingIapId, |
|
677 |
status); |
|
678 |
emit q_ptr->wlanNetworkClosed(mConnectingIapId, status); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
679 |
} else { |
31 | 680 |
// Opening succeeded, update connection status and inform UI |
681 |
if (mConnection) { |
|
39 | 682 |
mConnection->setConnectionStatus(WlanQtUtils::ConnStatusConnected); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
683 |
} |
31 | 684 |
|
685 |
OstTrace1( |
|
686 |
TRACE_BORDER, |
|
687 |
WLANQTUTILSPRIVATE_WLANNETWORKOPENED, |
|
688 |
"WlanQtUtilsPrivate::emit wlanNetworkOpened;IAP ID=%d", |
|
689 |
mConnectingIapId); |
|
690 |
emit q_ptr->wlanNetworkOpened(mConnectingIapId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
691 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
692 |
// Start ICT, if needed |
31 | 693 |
if (mConnectingIapId == mToBeTestedIapId) { |
60 | 694 |
QSharedPointer<WlanQtUtilsAp> iap(mSettings->fetchIap(mConnectingIapId)); |
39 | 695 |
|
696 |
mIctService = QSharedPointer<IctsWlanLoginInterface>( |
|
697 |
new IctsWlanLoginInterface(this)); |
|
698 |
||
699 |
// IctsWlanLoginInterface instance is created for each connectivity test |
|
700 |
// Note: Queued connection is required since mIctService is deleted |
|
701 |
// when signal comes |
|
702 |
bool connectStatus = connect( |
|
703 |
mIctService.data(), |
|
704 |
SIGNAL(ictsResult(int)), |
|
705 |
this, |
|
706 |
SLOT(updateIctResult(int)), |
|
707 |
Qt::QueuedConnection); |
|
708 |
Q_ASSERT(connectStatus); |
|
709 |
connectStatus = connect( |
|
710 |
mIctService.data(), |
|
711 |
SIGNAL(hotspotCase()), |
|
712 |
this, |
|
713 |
SLOT(updateIctHotspotCase()), |
|
714 |
Qt::QueuedConnection); |
|
715 |
Q_ASSERT(connectStatus); |
|
716 |
||
717 |
mIctService->start( |
|
31 | 718 |
mToBeTestedIapId, |
60 | 719 |
iap->value(WlanQtUtilsAp::ConfIdNetworkId).toInt()); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
720 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
721 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
722 |
// IAP is no more in connecting state |
31 | 723 |
mConnectingIapId = WlanQtUtils::IapIdNone; |
724 |
||
725 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATECONNECTIONSTATUS_EXIT, this); |
|
726 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
727 |
|
31 | 728 |
/*! |
39 | 729 |
Slot for handling internet connectivity test result event from wrapper. |
730 |
Tested IAP is stored to Internet SNAP, if test was successful. If the |
|
731 |
IAP needs Hotspot authentication, it remains ungategorized. |
|
31 | 732 |
|
39 | 733 |
@param [in] result Result of internet connectivity test and hotspot |
734 |
authentication (IctsWlanLoginInterface::ictsResultType). |
|
31 | 735 |
*/ |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
736 |
|
39 | 737 |
void WlanQtUtilsPrivate::updateIctResult(int ictsResult) |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
738 |
{ |
39 | 739 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEICTRESULT_ENTRY, this); |
31 | 740 |
|
39 | 741 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
742 |
WlanQtUtils::IctStatus result = WlanQtUtils::IctFailed; |
|
743 |
||
744 |
if (ictsResult == IctsWlanLoginInterface::IctsPassed) { |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
745 |
// Move the tested IAP to Internet SNAP since the test passed |
31 | 746 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
747 |
mSettings->moveIapToInternetSnap(mToBeTestedIapId); |
|
39 | 748 |
result = WlanQtUtils::IctPassed; |
749 |
} else if (ictsResult == IctsWlanLoginInterface::IctsHotspotPassed) { |
|
750 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
751 |
result = WlanQtUtils::IctHotspotPassed; |
|
752 |
} else if (ictsResult == IctsWlanLoginInterface::IctsCanceled) { |
|
753 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
754 |
result = WlanQtUtils::IctCancelled; |
|
755 |
} else { |
|
756 |
// ICTS failed - IAP remains to be uncategorized and mIctService is deleted. |
|
757 |
mIctService.clear(); |
|
758 |
} |
|
759 |
||
31 | 760 |
// Inform UI |
761 |
OstTraceExt2( |
|
762 |
TRACE_NORMAL, |
|
763 |
WLANQTUTILSPRIVATE_ICTRESULT, |
|
39 | 764 |
"WlanQtUtilsPrivate::emit ictResult;iapId=%d;result=%{IctStatus}", |
765 |
mToBeTestedIapId, |
|
766 |
result); |
|
31 | 767 |
|
768 |
emit q_ptr->ictResult(mToBeTestedIapId, result); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
769 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
770 |
// This IAP is now tested |
31 | 771 |
mToBeTestedIapId = WlanQtUtils::IapIdNone; |
772 |
||
39 | 773 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEICTRESULT_EXIT, this); |
774 |
} |
|
775 |
||
776 |
/*! |
|
777 |
Slot for setting IAP to be tested as hotspot IAP. |
|
778 |
*/ |
|
779 |
||
780 |
void WlanQtUtilsPrivate::updateIctHotspotCase() |
|
781 |
{ |
|
782 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE_ENTRY, this); |
|
783 |
||
784 |
mSettings->setAsHotspotIap(mToBeTestedIapId); |
|
785 |
||
786 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
787 |
OstTrace1( |
|
788 |
TRACE_BORDER, |
|
789 |
WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE, |
|
790 |
"WlanQtUtilsPrivate::updateIctHotspotCase set as hotspot IAP;iapId=%d", |
|
791 |
mToBeTestedIapId); |
|
792 |
||
793 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE_EXIT, this); |
|
31 | 794 |
} |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
795 |
|
31 | 796 |
/*! |
797 |
Slot for updating active connection status from wrapper. |
|
798 |
||
799 |
@param [in] connectionId ID of the new connection. |
|
800 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
801 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
802 |
void WlanQtUtilsPrivate::addActiveConnection(uint connectionId) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
803 |
{ |
31 | 804 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_ADDACTIVECONNECTION_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
805 |
OstTrace1( |
31 | 806 |
TRACE_BORDER, |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
807 |
WLANQTUTILSPRIVATE_ADDACTIVECONNECTION, |
31 | 808 |
"WlanQtUtilsPrivate::addActiveConnection;connectionId=%u", |
809 |
connectionId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
810 |
|
31 | 811 |
Q_ASSERT(mConnection == NULL); |
812 |
mConnection = QSharedPointer<WlanQtUtilsConnection>( |
|
813 |
mConMonWrapper->connectionInfo(connectionId)); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
814 |
|
31 | 815 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_ADDACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
816 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
817 |
|
31 | 818 |
/*! |
819 |
Slot for updating active connection status from wrapper. |
|
820 |
||
821 |
@param [in] connectionId ID of the deleted connection. |
|
822 |
*/ |
|
823 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
824 |
void WlanQtUtilsPrivate::removeActiveConnection(uint connectionId) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
825 |
{ |
31 | 826 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
827 |
OstTrace1( |
31 | 828 |
TRACE_BORDER, |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
829 |
WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION, |
31 | 830 |
"WlanQtUtilsPrivate::removeActiveConnection;connectionId=%u", |
831 |
connectionId); |
|
832 |
||
833 |
Q_ASSERT(mConnection); |
|
834 |
if (mConnection->connectionId() == connectionId) { |
|
835 |
int closedIapId = mConnection->iapId(); |
|
836 |
mConnection.clear(); |
|
837 |
||
838 |
if (mConnectingIapId != closedIapId) { |
|
839 |
// Connection is closed, inform UI. wlanNetworkClosed is sent |
|
840 |
// from here instead of updateActiveConnection(closed), |
|
841 |
// because, in some cases, connection may be removed without |
|
842 |
// any connection status updates. |
|
843 |
// Note: reason parameter is not accurate here, because it is |
|
844 |
// only relevant for connections opened by this dll |
|
845 |
// (updateConnectionStatus) |
|
846 |
OstTraceExt2( |
|
847 |
TRACE_BORDER, |
|
848 |
DUP1_WLANQTUTILSPRIVATE_WLANNETWORKCLOSED, |
|
39 | 849 |
"WlanQtUtilsPrivate::emit wlanNetworkClosed;iapID=%d;status=%d", |
31 | 850 |
closedIapId, |
851 |
KErrNone); |
|
852 |
emit q_ptr->wlanNetworkClosed(closedIapId, KErrNone); |
|
853 |
} |
|
854 |
// else: connection creation started by thid dll, but creation failed |
|
855 |
// -> wlanNetworkClosed is sent from updateConnectionStatus |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
856 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
857 |
|
31 | 858 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
859 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
860 |
|
31 | 861 |
/*! |
862 |
Slot for updating active connection status from wrapper. |
|
863 |
||
864 |
@param [in] connectionId ID of the updated connection. |
|
865 |
@param [in] connectionStatus New status of the connection. |
|
866 |
*/ |
|
867 |
||
868 |
void WlanQtUtilsPrivate::updateActiveConnection( |
|
869 |
uint connectionId, |
|
870 |
WlanQtUtils::ConnStatus connectionStatus) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
871 |
{ |
31 | 872 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION_ENTRY, this); |
873 |
OstTraceExt2( |
|
874 |
TRACE_BORDER, |
|
875 |
WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION, |
|
39 | 876 |
"WlanQtUtilsPrivate::updateActiveConnection;connectionId=%u;connectionStatus=%{ConnStatus}", |
31 | 877 |
connectionId, |
878 |
(uint)connectionStatus); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
879 |
|
31 | 880 |
Q_ASSERT(mConnection); |
881 |
if (mConnection->connectionId() == connectionId |
|
882 |
&& mConnection->connectionStatus() != connectionStatus) { |
|
883 |
// Update connection status and inform UI, if necessary |
|
884 |
mConnection->setConnectionStatus(connectionStatus); |
|
885 |
if (connectionStatus == WlanQtUtils::ConnStatusConnected) { |
|
886 |
OstTrace1( |
|
887 |
TRACE_BORDER, |
|
888 |
DUP1_WLANQTUTILSPRIVATE_WLANNETWORKOPENED, |
|
39 | 889 |
"WlanQtUtilsPrivate::emit wlanNetworkOpened;iapId=%d", |
31 | 890 |
mConnection->iapId()); |
891 |
emit q_ptr->wlanNetworkOpened(mConnection->iapId()); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
892 |
} |
31 | 893 |
// Do not inform UI about connection closing here. It is done in |
894 |
// removeActiveConnection(), because that may occur without any |
|
895 |
// connection status updates. |
|
896 |
} // else: connection status did not change |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
897 |
|
31 | 898 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
899 |
} |