author | hgs |
Mon, 23 Aug 2010 13:30:09 +0300 | |
changeset 53 | bdc64aa9b954 |
parent 39 | 7b3e49e4608a |
child 58 | 301aeb18ae47 |
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 "wlanqtutilsiap.h" |
|
26 |
#include "wlanqtutilsconnection.h" |
|
27 |
#include "wlanqtutilsiapsettings.h" |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
28 |
#include "wlanqtutilsconmonwrapper.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
29 |
#include "wlanqtutilsesockwrapper.h" |
39 | 30 |
#include "wlanqtutilsscan.h" |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
31 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
32 |
#include "wlanqtutils.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
33 |
#include "wlanqtutils_p.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
34 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
35 |
#include "OstTraceDefinitions.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
36 |
#ifdef OST_TRACE_COMPILER_IN_USE |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
37 |
#include "wlanqtutils_pTraces.h" |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
38 |
#endif |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
39 |
|
31 | 40 |
/*! |
41 |
\class WlanQtUtilsPrivate |
|
42 |
\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
|
43 |
|
31 | 44 |
The private interface functions are identical to those in WlanQtUtils |
45 |
class, so refer to that for descriptions. Other functions contain |
|
46 |
implementation documentation. |
|
47 |
*/ |
|
48 |
||
49 |
||
50 |
// External function prototypes |
|
51 |
||
52 |
// Local constants |
|
53 |
||
54 |
// ======== LOCAL FUNCTIONS ======== |
|
55 |
||
56 |
// ======== MEMBER FUNCTIONS ======== |
|
57 |
||
58 |
/*! |
|
59 |
Constructor. |
|
60 |
*/ |
|
61 |
||
62 |
WlanQtUtilsPrivate::WlanQtUtilsPrivate(WlanQtUtils *q_ptr) : |
|
63 |
q_ptr(q_ptr), |
|
64 |
mSettings(new WlanQtUtilsIapSettings(this)), |
|
65 |
mConMonWrapper(new WlanQtUtilsConMonWrapper(this)), |
|
39 | 66 |
mScanWrapper(new WlanQtUtilsScan(this)), |
31 | 67 |
mEsockWrapper(new WlanQtUtilsEsockWrapper(this)), |
39 | 68 |
mIctService(), |
69 |
mScanMode(ScanModeNone), |
|
53 | 70 |
mIapScanList(), |
31 | 71 |
mWlanScanList(), |
72 |
mToBeTestedIapId(WlanQtUtils::IapIdNone), |
|
73 |
mConnectingIapId(WlanQtUtils::IapIdNone), |
|
74 |
mConnection() |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
75 |
{ |
31 | 76 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATE_ENTRY, this); |
77 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
78 |
// Make all connections. |
31 | 79 |
bool connectStatus = connect( |
53 | 80 |
mScanWrapper, |
81 |
SIGNAL(availableWlanIaps(QList< QSharedPointer<WlanQtUtilsIap> > &)), |
|
82 |
this, |
|
83 |
SLOT(updateAvailableWlanIaps(QList< QSharedPointer<WlanQtUtilsIap> > &))); |
|
84 |
Q_ASSERT(connectStatus); |
|
85 |
||
86 |
connectStatus = connect( |
|
39 | 87 |
mScanWrapper, |
88 |
SIGNAL(availableWlanAps(QList< QSharedPointer<WlanQtUtilsAp> >&)), |
|
31 | 89 |
this, |
39 | 90 |
SLOT(updateAvailableWlanAps(QList< QSharedPointer<WlanQtUtilsAp> >&))); |
91 |
Q_ASSERT(connectStatus); |
|
92 |
||
93 |
connectStatus = connect( |
|
94 |
mScanWrapper, |
|
95 |
SIGNAL(scanFailed(int)), |
|
96 |
this, |
|
97 |
SLOT(reportScanResult(int))); |
|
31 | 98 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
99 |
|
31 | 100 |
connectStatus = connect( |
101 |
mEsockWrapper, |
|
102 |
SIGNAL(connectionStatusFromWrapper(bool)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
103 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
104 |
SLOT(updateConnectionStatus(bool))); |
31 | 105 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
106 |
|
31 | 107 |
connectStatus = connect( |
108 |
mConMonWrapper, |
|
109 |
SIGNAL(connCreatedEventFromWrapper(uint)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
110 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
111 |
SLOT(addActiveConnection(uint))); |
31 | 112 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
113 |
|
31 | 114 |
connectStatus = connect( |
115 |
mConMonWrapper, |
|
116 |
SIGNAL(connDeletedEventFromWrapper(uint)), |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
117 |
this, |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
118 |
SLOT(removeActiveConnection(uint))); |
31 | 119 |
Q_ASSERT(connectStatus); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
120 |
|
31 | 121 |
connectStatus = connect( |
122 |
mConMonWrapper, |
|
123 |
SIGNAL(connStatusEventFromWrapper(uint, WlanQtUtils::ConnStatus)), |
|
124 |
this, |
|
125 |
SLOT(updateActiveConnection(uint, WlanQtUtils::ConnStatus))); |
|
126 |
Q_ASSERT(connectStatus); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
127 |
|
31 | 128 |
// Retrieve initial status of active connections |
129 |
mConnection = QSharedPointer<WlanQtUtilsConnection>( |
|
130 |
mConMonWrapper->activeConnection()); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
131 |
|
31 | 132 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATE_EXIT, this); |
133 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
134 |
|
31 | 135 |
/*! |
136 |
Destructor. |
|
137 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
138 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
139 |
WlanQtUtilsPrivate::~WlanQtUtilsPrivate() |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
140 |
{ |
31 | 141 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATEDESTR_ENTRY, this); |
142 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_WLANQTUTILSPRIVATEDESTR_EXIT, this); |
|
143 |
} |
|
144 |
||
145 |
/*! |
|
146 |
See WlanQtUtils::scanWlans(). |
|
147 |
*/ |
|
148 |
||
149 |
void WlanQtUtilsPrivate::scanWlans() |
|
150 |
{ |
|
151 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANS_ENTRY, this); |
|
152 |
||
39 | 153 |
// Scanning while there is an ongoing scan is not supported |
154 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
155 |
||
53 | 156 |
// Starting with an IAP scan, and continuing with AP scan |
39 | 157 |
mScanMode = ScanModeAvailableWlans; |
53 | 158 |
mScanWrapper->scanWlanIaps(); |
31 | 159 |
|
160 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANS_EXIT, this); |
|
161 |
} |
|
162 |
||
163 |
/*! |
|
164 |
See WlanQtUtils::scanWlanAps(). |
|
165 |
*/ |
|
166 |
||
167 |
void WlanQtUtilsPrivate::scanWlanAps() |
|
168 |
{ |
|
169 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANAPS_ENTRY, this); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
170 |
|
39 | 171 |
// Scanning while there is an ongoing scan is not supported |
172 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
173 |
||
174 |
// Just forward the request to wrapper, which triggers a broadcast WLAN scan |
|
175 |
mScanMode = ScanModeAvailableWlanAps; |
|
176 |
mScanWrapper->scanWlanAps(); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
177 |
|
31 | 178 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANAPS_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
179 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
180 |
|
31 | 181 |
/*! |
182 |
See WlanQtUtils::scanWlanDirect(). |
|
183 |
*/ |
|
184 |
||
185 |
void WlanQtUtilsPrivate::scanWlanDirect(const QString &ssid) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
186 |
{ |
31 | 187 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_SCANWLANDIRECT_ENTRY, this); |
39 | 188 |
|
189 |
// Scanning while there is an ongoing scan is not supported |
|
190 |
Q_ASSERT(mScanMode == ScanModeNone); |
|
31 | 191 |
|
39 | 192 |
// Just forward the request to wrapper, which triggers a direct WLAN scan |
193 |
mScanMode = ScanModeDirect; |
|
194 |
mScanWrapper->scanWlanDirect(ssid); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
195 |
|
31 | 196 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_SCANWLANDIRECT_EXIT, this); |
197 |
} |
|
198 |
||
199 |
/*! |
|
200 |
See WlanQtUtils::stopWlanScan(). |
|
201 |
*/ |
|
202 |
||
203 |
void WlanQtUtilsPrivate::stopWlanScan() |
|
204 |
{ |
|
205 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_STOPWLANSCAN_ENTRY, this); |
|
206 |
||
39 | 207 |
if (mScanMode != ScanModeNone) { |
208 |
// Inform that scan was cancelled |
|
209 |
reportScanResult(WlanQtUtils::ScanStatusCancelled); |
|
210 |
||
211 |
// Stop the scan |
|
212 |
mScanMode = ScanModeNone; |
|
213 |
mScanWrapper->stopScan(); |
|
214 |
} |
|
31 | 215 |
|
216 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_STOPWLANSCAN_EXIT, this); |
|
217 |
} |
|
218 |
||
219 |
/*! |
|
220 |
See WlanQtUtils::availableWlans(). |
|
221 |
*/ |
|
222 |
||
223 |
void WlanQtUtilsPrivate::availableWlans( |
|
224 |
QList< QSharedPointer<WlanQtUtilsIap> > &wlanIapList, |
|
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 |
|
39 | 233 |
QList< QSharedPointer<WlanQtUtilsIap> > configuredIapList; |
31 | 234 |
mSettings->fetchIaps(configuredIapList); |
235 |
||
53 | 236 |
// Update the list of available IAPs |
237 |
foreach (QSharedPointer<WlanQtUtilsIap> iapIter, mIapScanList) { |
|
238 |
int iapId = iapIter->value(WlanQtUtilsIap::ConfIdIapId).toInt(); |
|
239 |
QSharedPointer<WlanQtUtilsIap> iap(mSettings->fetchIap(iapId)); |
|
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 |
|
31 | 382 |
/*! |
383 |
See WlanQtUtils::connectionStatus(). |
|
384 |
*/ |
|
385 |
||
386 |
WlanQtUtils::ConnStatus WlanQtUtilsPrivate::connectionStatus() const |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
387 |
{ |
31 | 388 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_CONNECTIONSTATUS_ENTRY); |
389 |
||
390 |
WlanQtUtils::ConnStatus status = WlanQtUtils::ConnStatusDisconnected; |
|
391 |
||
392 |
if (mConnection) { |
|
393 |
status = mConnection->connectionStatus(); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
394 |
} |
31 | 395 |
OstTrace1( |
396 |
TRACE_BORDER, |
|
397 |
WLANQTUTILSPRIVATE_CONNECTIONSTATUS, |
|
398 |
"WlanQtUtilsPrivate::connectionStatus;status=%{ConnStatus};", |
|
399 |
(TUint)status); |
|
400 |
||
401 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_CONNECTIONSTATUS_EXIT); |
|
402 |
return status; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
403 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
404 |
|
31 | 405 |
/*! |
406 |
See WlanQtUtils::activeIap(). |
|
407 |
*/ |
|
408 |
||
409 |
int WlanQtUtilsPrivate::activeIap() const |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
410 |
{ |
31 | 411 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_ACTIVEIAP_ENTRY); |
412 |
||
413 |
int iapId = WlanQtUtils::IapIdNone; |
|
414 |
||
415 |
if (mConnection) { |
|
416 |
iapId = mConnection->iapId(); |
|
417 |
} |
|
418 |
OstTrace1( |
|
419 |
TRACE_BORDER, |
|
420 |
WLANQTUTILSPRIVATE_ACTIVEIAP, |
|
421 |
"WlanQtUtilsPrivate::activeIap;iapId=%d", |
|
422 |
iapId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
423 |
|
31 | 424 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_ACTIVEIAP_EXIT); |
425 |
return iapId; |
|
426 |
} |
|
427 |
||
428 |
/*! |
|
429 |
See WlanQtUtils::iapName(). |
|
430 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
431 |
|
31 | 432 |
QString WlanQtUtilsPrivate::iapName(int iapId) const |
433 |
{ |
|
434 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_IAPNAME_ENTRY, this); |
|
435 |
||
436 |
QString name; |
|
437 |
// Read the IAP from settings and return its name |
|
438 |
QSharedPointer<WlanQtUtilsIap> iap = mSettings->fetchIap(iapId); |
|
439 |
if (iap) { |
|
440 |
name = iap->value(WlanQtUtilsIap::ConfIdName).toString(); |
|
441 |
} |
|
442 |
||
443 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_IAPNAME_EXIT, this); |
|
444 |
return name; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
445 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
446 |
|
31 | 447 |
/*! |
448 |
This function searches for a WLAN IAP matching the given WLAN AP. |
|
449 |
||
450 |
@param [in] list List to search from. |
|
451 |
@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
|
452 |
|
31 | 453 |
@return True, if suitable WLAN IAP found, false otherwise. |
454 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
455 |
|
31 | 456 |
bool WlanQtUtilsPrivate::wlanIapExists( |
457 |
const QList< QSharedPointer<WlanQtUtilsIap> > list, |
|
458 |
const WlanQtUtilsAp *ap) const |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
459 |
{ |
31 | 460 |
bool match = false; // Return value |
461 |
||
462 |
foreach (QSharedPointer<WlanQtUtilsIap> iap, list) { |
|
39 | 463 |
if (WlanQtUtilsAp::compare(iap.data(), ap) == 0) { |
31 | 464 |
// Match found |
465 |
match = true; |
|
466 |
break; |
|
467 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
468 |
} |
31 | 469 |
|
470 |
return match; |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
471 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
472 |
|
31 | 473 |
/*! |
474 |
This function traces the given IAPs and APs. |
|
475 |
||
476 |
@param [in] iaps IAPs to trace. |
|
477 |
@param [in] aps APs to trace. |
|
478 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
479 |
|
31 | 480 |
void WlanQtUtilsPrivate::traceIapsAndAps( |
481 |
const QList<QSharedPointer<WlanQtUtilsIap> > &iaps, |
|
482 |
const QList<QSharedPointer<WlanQtUtilsAp> > &aps) const |
|
483 |
{ |
|
484 |
#ifndef OST_TRACE_COMPILER_IN_USE |
|
485 |
Q_UNUSED(iaps); |
|
486 |
Q_UNUSED(aps); |
|
487 |
#else |
|
488 |
foreach (QSharedPointer<WlanQtUtilsIap> iap, iaps) { |
|
489 |
QString tmp(iap->value(WlanQtUtilsIap::ConfIdName).toString()); |
|
490 |
TPtrC16 name(tmp.utf16(), tmp.length()); |
|
491 |
OstTraceExt3( |
|
492 |
TRACE_NORMAL, |
|
493 |
WLANQTUTILSPRIVATE_TRACEAVAILABLEWLANAPS_IAP, |
|
39 | 494 |
"WlanQtUtilsPrivate::traceAvailableWlanAps IAP;name=%S;secMode=%{WlanSecMode};signalStrength=%d", |
31 | 495 |
name, |
496 |
iap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(), |
|
497 |
iap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()); |
|
498 |
} |
|
499 |
foreach (QSharedPointer<WlanQtUtilsAp> ap, aps) { |
|
500 |
QString tmp(ap->value(WlanQtUtilsAp::ConfIdSsid).toString()); |
|
501 |
TPtrC16 ssid(tmp.utf16(), tmp.length()); |
|
502 |
OstTraceExt3( |
|
503 |
TRACE_NORMAL, |
|
504 |
WLANQTUTILSPRIVATE_TRACEAVAILABLEWLANAPS_AP, |
|
39 | 505 |
"WlanQtUtilsPrivate::traceAvailableWlanAps AP;ssid=%S;secMode=%{WlanSecMode};signalStrength=%d", |
31 | 506 |
ssid, |
507 |
ap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(), |
|
39 | 508 |
ap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()); |
31 | 509 |
} |
510 |
#endif |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
511 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
512 |
|
31 | 513 |
/*! |
53 | 514 |
Slot for handling WLAN IAP scan result event from wrapper. Results are |
515 |
stored in a member variable. |
|
516 |
||
517 |
@param [in] availableIaps Available WLAN IAP's found in scan. |
|
518 |
*/ |
|
519 |
||
520 |
void WlanQtUtilsPrivate::updateAvailableWlanIaps( |
|
521 |
QList< QSharedPointer<WlanQtUtilsIap> > &availableIaps) |
|
522 |
{ |
|
523 |
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANIAPS_ENTRY); |
|
524 |
||
525 |
// Store the new IAP list |
|
526 |
mIapScanList = availableIaps; |
|
527 |
||
528 |
// Continue with AP scan (which should come immediately from WLAN's scan cache) |
|
529 |
mScanWrapper->scanWlanAps(); |
|
530 |
||
531 |
OstTraceFunctionExit0(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANIAPS_EXIT); |
|
532 |
} |
|
533 |
||
534 |
/*! |
|
535 |
Slot for handling WLAN AP scan result event from wrapper. Results are |
|
31 | 536 |
stored in member variable (possible duplicates are removed). |
537 |
||
538 |
@param [in] availableWlanList WLAN networks found in scan. |
|
539 |
*/ |
|
540 |
||
541 |
void WlanQtUtilsPrivate::updateAvailableWlanAps( |
|
39 | 542 |
QList< QSharedPointer<WlanQtUtilsAp> > &availableWlanList) |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
543 |
{ |
31 | 544 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANAPS_ENTRY, this); |
545 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
546 |
// Old results are removed |
31 | 547 |
mWlanScanList.clear(); |
53 | 548 |
|
31 | 549 |
// 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
|
550 |
for (int i = 0; i < availableWlanList.count(); i++) { |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
551 |
bool duplicate = false; |
31 | 552 |
for (int j = 0; j < mWlanScanList.count(); j++) { |
553 |
if (WlanQtUtilsAp::compare( |
|
554 |
availableWlanList[i].data(), |
|
39 | 555 |
mWlanScanList[j].data()) == 0) { |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
556 |
duplicate = true; |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
557 |
break; |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
558 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
559 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
560 |
if (duplicate == false) { |
31 | 561 |
mWlanScanList.append(availableWlanList[i]); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
562 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
563 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
564 |
|
39 | 565 |
// The information is forwarded to the client |
566 |
reportScanResult(WlanQtUtils::ScanStatusOk); |
|
53 | 567 |
|
39 | 568 |
// Scan is complete |
569 |
mScanMode = ScanModeNone; |
|
53 | 570 |
|
31 | 571 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANAPS_EXIT, this); |
572 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
573 |
|
31 | 574 |
/*! |
39 | 575 |
Scan result handler. Reports the scanning result to the client. |
576 |
||
577 |
@param [in] status Scan status code (WlanQtUtils::ScanStatus). |
|
578 |
*/ |
|
579 |
||
580 |
void WlanQtUtilsPrivate::reportScanResult(int status) |
|
581 |
{ |
|
582 |
switch (mScanMode) { |
|
583 |
case ScanModeAvailableWlans: |
|
584 |
OstTrace1( |
|
585 |
TRACE_BORDER, |
|
586 |
WLANQTUTILSPRIVATE_WLANSCANREADY, |
|
587 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanReady;status=%{ScanStatus};", |
|
588 |
status); |
|
589 |
emit q_ptr->wlanScanReady(status); |
|
590 |
break; |
|
591 |
||
592 |
case ScanModeAvailableWlanAps: |
|
593 |
OstTrace1( |
|
594 |
TRACE_BORDER, |
|
595 |
WLANQTUTILSPRIVATE_WLANSCANAPREADY, |
|
596 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanApReady;status=%{ScanStatus};", |
|
597 |
status); |
|
598 |
emit q_ptr->wlanScanApReady(status); |
|
599 |
break; |
|
600 |
||
601 |
case ScanModeDirect: |
|
602 |
OstTrace1( |
|
603 |
TRACE_BORDER, |
|
604 |
WLANQTUTILSPRIVATE_WLANSCANDIRECTREADY, |
|
605 |
"WlanQtUtilsPrivate::reportScanResult emit wlanScanDirectReady;status=%{ScanStatus};", |
|
606 |
status); |
|
607 |
emit q_ptr->wlanScanDirectReady(status); |
|
608 |
break; |
|
609 |
||
610 |
#ifndef QT_NO_DEBUG |
|
611 |
default: |
|
612 |
// Invalid scan mode detected |
|
613 |
Q_ASSERT(0); |
|
614 |
break; |
|
615 |
#endif |
|
616 |
} |
|
617 |
} |
|
618 |
||
619 |
/*! |
|
31 | 620 |
Slot for handling connection setup status event from wrapper. |
621 |
||
622 |
@param [in] isOpened Was connection setup successful? |
|
623 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
624 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
625 |
void WlanQtUtilsPrivate::updateConnectionStatus(bool isOpened) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
626 |
{ |
31 | 627 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATECONNECTIONSTATUS_ENTRY, this); |
628 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
629 |
if (isOpened == false) { |
31 | 630 |
// Opening failed, update connection status and inform UI |
631 |
if (mConnection) { |
|
632 |
mConnection->setConnectionStatus( |
|
633 |
WlanQtUtils::ConnStatusDisconnected); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
634 |
} |
31 | 635 |
|
636 |
// Include the status code from connection wrapper |
|
637 |
int status = mEsockWrapper->lastStatusCode(); |
|
638 |
OstTraceExt2( |
|
639 |
TRACE_BORDER, |
|
640 |
WLANQTUTILSPRIVATE_WLANNETWORKCLOSED, |
|
641 |
"WlanQtUtilsPrivate::emit wlanNetworkClosed;IAP ID=%d;status=%d", |
|
642 |
mConnectingIapId, |
|
643 |
status); |
|
644 |
emit q_ptr->wlanNetworkClosed(mConnectingIapId, status); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
645 |
} else { |
31 | 646 |
// Opening succeeded, update connection status and inform UI |
647 |
if (mConnection) { |
|
39 | 648 |
mConnection->setConnectionStatus(WlanQtUtils::ConnStatusConnected); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
649 |
} |
31 | 650 |
|
651 |
OstTrace1( |
|
652 |
TRACE_BORDER, |
|
653 |
WLANQTUTILSPRIVATE_WLANNETWORKOPENED, |
|
654 |
"WlanQtUtilsPrivate::emit wlanNetworkOpened;IAP ID=%d", |
|
655 |
mConnectingIapId); |
|
656 |
emit q_ptr->wlanNetworkOpened(mConnectingIapId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
657 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
658 |
// Start ICT, if needed |
31 | 659 |
if (mConnectingIapId == mToBeTestedIapId) { |
39 | 660 |
QSharedPointer<WlanQtUtilsIap> iap(mSettings->fetchIap(mConnectingIapId)); |
661 |
||
662 |
mIctService = QSharedPointer<IctsWlanLoginInterface>( |
|
663 |
new IctsWlanLoginInterface(this)); |
|
664 |
||
665 |
// IctsWlanLoginInterface instance is created for each connectivity test |
|
666 |
// Note: Queued connection is required since mIctService is deleted |
|
667 |
// when signal comes |
|
668 |
bool connectStatus = connect( |
|
669 |
mIctService.data(), |
|
670 |
SIGNAL(ictsResult(int)), |
|
671 |
this, |
|
672 |
SLOT(updateIctResult(int)), |
|
673 |
Qt::QueuedConnection); |
|
674 |
Q_ASSERT(connectStatus); |
|
675 |
connectStatus = connect( |
|
676 |
mIctService.data(), |
|
677 |
SIGNAL(hotspotCase()), |
|
678 |
this, |
|
679 |
SLOT(updateIctHotspotCase()), |
|
680 |
Qt::QueuedConnection); |
|
681 |
Q_ASSERT(connectStatus); |
|
682 |
||
683 |
mIctService->start( |
|
31 | 684 |
mToBeTestedIapId, |
685 |
iap->value(WlanQtUtilsIap::ConfIdNetworkId).toInt()); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
686 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
687 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
688 |
// IAP is no more in connecting state |
31 | 689 |
mConnectingIapId = WlanQtUtils::IapIdNone; |
690 |
||
691 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATECONNECTIONSTATUS_EXIT, this); |
|
692 |
} |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
693 |
|
31 | 694 |
/*! |
39 | 695 |
Slot for handling internet connectivity test result event from wrapper. |
696 |
Tested IAP is stored to Internet SNAP, if test was successful. If the |
|
697 |
IAP needs Hotspot authentication, it remains ungategorized. |
|
31 | 698 |
|
39 | 699 |
@param [in] result Result of internet connectivity test and hotspot |
700 |
authentication (IctsWlanLoginInterface::ictsResultType). |
|
31 | 701 |
*/ |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
702 |
|
39 | 703 |
void WlanQtUtilsPrivate::updateIctResult(int ictsResult) |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
704 |
{ |
39 | 705 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEICTRESULT_ENTRY, this); |
31 | 706 |
|
39 | 707 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
708 |
WlanQtUtils::IctStatus result = WlanQtUtils::IctFailed; |
|
709 |
||
710 |
if (ictsResult == IctsWlanLoginInterface::IctsPassed) { |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
711 |
// Move the tested IAP to Internet SNAP since the test passed |
31 | 712 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
713 |
mSettings->moveIapToInternetSnap(mToBeTestedIapId); |
|
39 | 714 |
result = WlanQtUtils::IctPassed; |
715 |
} else if (ictsResult == IctsWlanLoginInterface::IctsHotspotPassed) { |
|
716 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
717 |
result = WlanQtUtils::IctHotspotPassed; |
|
718 |
} else if (ictsResult == IctsWlanLoginInterface::IctsCanceled) { |
|
719 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
720 |
result = WlanQtUtils::IctCancelled; |
|
721 |
} else { |
|
722 |
// ICTS failed - IAP remains to be uncategorized and mIctService is deleted. |
|
723 |
mIctService.clear(); |
|
724 |
} |
|
725 |
||
31 | 726 |
// Inform UI |
727 |
OstTraceExt2( |
|
728 |
TRACE_NORMAL, |
|
729 |
WLANQTUTILSPRIVATE_ICTRESULT, |
|
39 | 730 |
"WlanQtUtilsPrivate::emit ictResult;iapId=%d;result=%{IctStatus}", |
731 |
mToBeTestedIapId, |
|
732 |
result); |
|
31 | 733 |
|
734 |
emit q_ptr->ictResult(mToBeTestedIapId, result); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
735 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
736 |
// This IAP is now tested |
31 | 737 |
mToBeTestedIapId = WlanQtUtils::IapIdNone; |
738 |
||
39 | 739 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEICTRESULT_EXIT, this); |
740 |
} |
|
741 |
||
742 |
/*! |
|
743 |
Slot for setting IAP to be tested as hotspot IAP. |
|
744 |
*/ |
|
745 |
||
746 |
void WlanQtUtilsPrivate::updateIctHotspotCase() |
|
747 |
{ |
|
748 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE_ENTRY, this); |
|
749 |
||
750 |
mSettings->setAsHotspotIap(mToBeTestedIapId); |
|
751 |
||
752 |
Q_ASSERT(mToBeTestedIapId != WlanQtUtils::IapIdNone); |
|
753 |
OstTrace1( |
|
754 |
TRACE_BORDER, |
|
755 |
WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE, |
|
756 |
"WlanQtUtilsPrivate::updateIctHotspotCase set as hotspot IAP;iapId=%d", |
|
757 |
mToBeTestedIapId); |
|
758 |
||
759 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEICTHOTSPOTCASE_EXIT, this); |
|
31 | 760 |
} |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
761 |
|
31 | 762 |
/*! |
763 |
Slot for updating active connection status from wrapper. |
|
764 |
||
765 |
@param [in] connectionId ID of the new connection. |
|
766 |
*/ |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
767 |
|
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
768 |
void WlanQtUtilsPrivate::addActiveConnection(uint connectionId) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
769 |
{ |
31 | 770 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_ADDACTIVECONNECTION_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
771 |
OstTrace1( |
31 | 772 |
TRACE_BORDER, |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
773 |
WLANQTUTILSPRIVATE_ADDACTIVECONNECTION, |
31 | 774 |
"WlanQtUtilsPrivate::addActiveConnection;connectionId=%u", |
775 |
connectionId); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
776 |
|
31 | 777 |
Q_ASSERT(mConnection == NULL); |
778 |
mConnection = QSharedPointer<WlanQtUtilsConnection>( |
|
779 |
mConMonWrapper->connectionInfo(connectionId)); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
780 |
|
31 | 781 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_ADDACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
782 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
783 |
|
31 | 784 |
/*! |
785 |
Slot for updating active connection status from wrapper. |
|
786 |
||
787 |
@param [in] connectionId ID of the deleted connection. |
|
788 |
*/ |
|
789 |
||
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
790 |
void WlanQtUtilsPrivate::removeActiveConnection(uint connectionId) |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
791 |
{ |
31 | 792 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION_ENTRY, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
793 |
OstTrace1( |
31 | 794 |
TRACE_BORDER, |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
795 |
WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION, |
31 | 796 |
"WlanQtUtilsPrivate::removeActiveConnection;connectionId=%u", |
797 |
connectionId); |
|
798 |
||
799 |
Q_ASSERT(mConnection); |
|
800 |
if (mConnection->connectionId() == connectionId) { |
|
801 |
int closedIapId = mConnection->iapId(); |
|
802 |
mConnection.clear(); |
|
803 |
||
804 |
if (mConnectingIapId != closedIapId) { |
|
805 |
// Connection is closed, inform UI. wlanNetworkClosed is sent |
|
806 |
// from here instead of updateActiveConnection(closed), |
|
807 |
// because, in some cases, connection may be removed without |
|
808 |
// any connection status updates. |
|
809 |
// Note: reason parameter is not accurate here, because it is |
|
810 |
// only relevant for connections opened by this dll |
|
811 |
// (updateConnectionStatus) |
|
812 |
OstTraceExt2( |
|
813 |
TRACE_BORDER, |
|
814 |
DUP1_WLANQTUTILSPRIVATE_WLANNETWORKCLOSED, |
|
39 | 815 |
"WlanQtUtilsPrivate::emit wlanNetworkClosed;iapID=%d;status=%d", |
31 | 816 |
closedIapId, |
817 |
KErrNone); |
|
818 |
emit q_ptr->wlanNetworkClosed(closedIapId, KErrNone); |
|
819 |
} |
|
820 |
// else: connection creation started by thid dll, but creation failed |
|
821 |
// -> wlanNetworkClosed is sent from updateConnectionStatus |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
822 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
823 |
|
31 | 824 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_REMOVEACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
825 |
} |
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
826 |
|
31 | 827 |
/*! |
828 |
Slot for updating active connection status from wrapper. |
|
829 |
||
830 |
@param [in] connectionId ID of the updated connection. |
|
831 |
@param [in] connectionStatus New status of the connection. |
|
832 |
*/ |
|
833 |
||
834 |
void WlanQtUtilsPrivate::updateActiveConnection( |
|
835 |
uint connectionId, |
|
836 |
WlanQtUtils::ConnStatus connectionStatus) |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
837 |
{ |
31 | 838 |
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION_ENTRY, this); |
839 |
OstTraceExt2( |
|
840 |
TRACE_BORDER, |
|
841 |
WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION, |
|
39 | 842 |
"WlanQtUtilsPrivate::updateActiveConnection;connectionId=%u;connectionStatus=%{ConnStatus}", |
31 | 843 |
connectionId, |
844 |
(uint)connectionStatus); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
845 |
|
31 | 846 |
Q_ASSERT(mConnection); |
847 |
if (mConnection->connectionId() == connectionId |
|
848 |
&& mConnection->connectionStatus() != connectionStatus) { |
|
849 |
// Update connection status and inform UI, if necessary |
|
850 |
mConnection->setConnectionStatus(connectionStatus); |
|
851 |
if (connectionStatus == WlanQtUtils::ConnStatusConnected) { |
|
852 |
OstTrace1( |
|
853 |
TRACE_BORDER, |
|
854 |
DUP1_WLANQTUTILSPRIVATE_WLANNETWORKOPENED, |
|
39 | 855 |
"WlanQtUtilsPrivate::emit wlanNetworkOpened;iapId=%d", |
31 | 856 |
mConnection->iapId()); |
857 |
emit q_ptr->wlanNetworkOpened(mConnection->iapId()); |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
858 |
} |
31 | 859 |
// Do not inform UI about connection closing here. It is done in |
860 |
// removeActiveConnection(), because that may occur without any |
|
861 |
// connection status updates. |
|
862 |
} // else: connection status did not change |
|
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
863 |
|
31 | 864 |
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEACTIVECONNECTION_EXIT, this); |
19
10810c91db26
Revision: 201011
Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
parents:
diff
changeset
|
865 |
} |