| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have discovered that the active object ConnectionStarter could
potentially leave after deleteing itself in RunL. If that were to
happen, QtRRActiveScheduler::RunMarkedIfReady would have crashed when
it asked the deleted active object to handle the error.
Some active object deletion detection has been added to
QtRRActiveScheduler::RunMarkedIfReady to protect against crashes.
The ConnectionStarter active object has been modified so that even if
it does leave, when running in CActiveScheduler, it still won't cause
a crash and will clean itself up correctly.
Task-number: ou1cimx1#979241
Change-Id: Iafa10b96bbd8bedfec82d6d546c7ffaf0557fd8b
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QNetworkAccessManager::get is called from the slot connected to
QNetworkAccessManager::finished, this is equivalent to calling
QNetworkSession::open from the slot connected to QNetworkSession::error.
Close handles before emitting the error signal, instead of afterwards.
Otherwise the session start would be silently cancelled in the above
situation.
Task-number: ou1cimx1#960395
Change-Id: I48cb376722e0169721fd33614a0b9280c17bdd62
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When WLAN and 3G connections are both active, the proxy for the wrong
connection may have been chosen in the case of plain sockets or
QNetworkAccessManager with an invalid configuration.
When enumarating active connections to choose a proxy, prefer a connection
that was opened by this process.
Task-number: QTBUG-22615
Task-number: ou1cimx1#930701
Reviewed-by: mread
|
|
|
|
|
|
| |
Handle could be closed too early in some situations causing a panic.
Reviewed-By: mread
|
|
|
|
|
|
|
| |
Changes the libraries to match the case of files for building
Symbian in linux.
Reviewed-by: Miikka Heikkinen
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QNetworkConfiguration::purpose() will now return translated values
for the system SNAPs rather than always UnknownPurpose.
e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs
return ServiceSpecificPurpose.
IAPs inherit the purpose of the service network that contains them,
unless the same IAP is present in more than one with conflicting
purposes, in which case UnknownPurpose is returned.
Task-Number: QTBUG-19166
Reviewed-By: mread
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian is not reporting the expected KLinkLayerClosed event on the
last RConnection handle. Instead, it reports the event
KConfigDaemonFinishedDeregistrationStop, which indicates the nif
plugin is being destroyed (this is followed by unload events)
To fix, this event is treated the same as a link down event, and
results in the state change to disconnected.
Either there has been a behaviour change in the platform, or the
test was previously run with another user of the API running in the
background (e.g. WLAN wizard, connection monitor) which prevented
the unload.
Task-Number: QTBUG-21382
Reviewed-By: mread
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The symbian IAP records don't distinguish between GRPS/EDGE/3G/HSPA,
although the phone knows what type of cell it is attached to.
For the IAP records which are of packet data type (reported as
KCommDbBearerWcdma), we now query the phone network mode to
determine the bearer type to report.
The Qt API doesn't distinguish GRPS/EDGE (both are "2G")
The Symbian API doesn't distinguish 3G and HSPA unless there is an
active connection. So we have to report both of these as WCDMA.
When a connection becomes active, we update Qt's IAP record list
to show the known connection type (which may include HSPA now).
Qt already contained code to observe roaming between cell types,
which reports all types.
Note that the bearer type may change during connection (handover
to another cell may occur), which should be covered by the already
existing code.
Task-Number: QTBUG-19011
Reviewed-By: mread
|
|
|
|
|
|
|
|
| |
Refactoring the body of a large TRAP into a separate function. This was
not compiling on WINSCW, perhaps due to the use of #ifdef within the
TRAP macro expansion. It does compile now.
Reviewed-by: Sami Merila
|
|
|
|
|
| |
Making these whitespace fixes in preparation for fixing a compile error
and my editor likes to fix whitespace.
|
|\
| |
| |
| |
| | |
Conflicts:
src/s60installs/s60installs.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The plugin was ignoring errors when opening a handle, and as a result
crashed if the handle was invalid.
Error checking / handle validity checks added.
Task-number: QTBUG-18572
Reviewed-by: mread
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.
This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing Linux compatibility issues for Symbian
|
| | |
| | |
| | |
| | | |
Reviewed-by: Laszlo Agocs
|
| |/
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/socket/qlocalsocket.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| |
| |
| |
| |
| | |
Task-Number: QT-4652
Reviewed-by: Xizhi Zhu
|
| |
| |
| |
| |
| |
| |
| | |
Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called.
Task-number: QTBUG-15108
Reviewed-by: Ville Pernu
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. QNetworkSession being deleted from the closed signal caused data
abort or E32User-CBase 49 panics. (both observed)
2. Potential E32User-CBase 46 panic in
ConnectionProgressNotifier::StartNotifications()
Reviewed-by: Aaron Tunney
Reviewed-By: Markus Goetz
Task-Number: QTBUG-17196
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added a mutex to QNetworkSessionPrivate
Lock the mutex in the symbian bearer plugin for functions that change
the validity of the RConnection.
Added factory functions to open an RSocket or RHostResolver, which lock
the mutex before the esock function calls. If there is no RConnection,
then KErrNotReady is returned (the same as when there is an RConnection
but it has not been started).
Task-number: QTBUG-18143
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QObject and CBase both expect to be the root class of the object hierarchy
so it can cause problems if they are used in multiple inheritance.
Refactored the CActive used for starting RConnection into a helper class.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The implementation was opening RConnection handles on top of previous
instances, and not closing RConnection handles. Both of these cause a
resource leak in the socket server which cannot clean up the connection
until the Qt process has exited.
After a lot of this (which could be triggered by the QNetworkReply auto
test), the socket server may run out of memory resulting in all socket
operations failing.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| | |
Qt no longer uses open C sockets
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Implemented a tunnel to get the QNetworkSession from QNetworkAccessManager
down to the socket engine. This is currently a private API for QNAM.
This patch only implements the FTP backend - the other backends are to
follow.
On Symbian, the native socket engine will extract the native session
(RConnection) from the QNetworkSession implementation, and use that to
open sockets using the explicitly specified session.
When no session is specified on the socket (default for networking usage
outside of QNAM) then the socket is opened with no RConnection specified,
which allows the IP stack to find any route via an open interface.
The QFtp autotest is enhanced to test QFtp with an explicit session as well
as implicit connectivity (where a QNetworkSession is opened by the user,
and then QFtp is used without a specified connection).
This autotest gives better coverage than the FTP test cases in QNetworkReply.
Reviewed-by: Markus Goetz
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.
Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. QNetworkSession being deleted from the closed signal caused data
abort or E32User-CBase 49 panics. (both observed)
2. Potential E32User-CBase 46 panic in
ConnectionProgressNotifier::StartNotifications()
Reviewed-by: Aaron Tunney
Reviewed-By: Markus Goetz
Task-Number: QTBUG-17196
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.
Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Bearer pushes RConnection into QtCore.
QSocket can pull this RConnection back out when it needs to open an RSocket
(potentially this can be removed again later if QSocket is made
QNetworkSession aware)
Reviewed-by: Markus Goetz
|
|/
|
|
|
|
|
| |
Converted uses of RSocketServ in QtNetwork and the symbian bearer plugin
to use the shared session from QtCore instead of creating their own
Reviewed-by: Markus Goetz
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
QT-4155 bug.
Canceling Network Session before canceling connection notifier
notifications causes a call to an invalid RConnection instance.
Fix: CanceL Network session after canceling notifications.
|
|/
|
|
|
|
|
|
| |
Fixing the initial problem of this error opened up a possibility to
start a new WLAN scan while there was one still ongoing. This caused
a crash.
Task-number: QT-3996
|
| |
|
|
|
|
|
| |
Removed implicit QtGui linking from qsymbianbearer plugin as it
is not needed.
|
| |
|
|
|
|
|
|
|
| |
The active object made a request before it was set as active.
Task-number: QT-3996
Written-by: Perttu Pohjonen <perttu.pohjonen@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Symbian3 and later builds are not compatible with pre-Symbian3 phones
anyway, so no need to build and deploy older version plugins when
building for Symbian3 or later.
Task-number: QT-3949
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
| |
Checking for existence of files does not work in clean platform builds,
so check the S60_VERSION instead, which can be explicitly set by
those builds to correct value.
Task-number: QT-3949
Reviewed-by: axis
|
|
|
|
|
|
|
|
| |
SymbianEngine::updateConfigurationsL cannot be called from a
non-main thread as it uses Symbian resources not shared between
threads.
Task-number: QTBUG-13064
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit bce4c42a3d0c7d24009230e09aa58db60db39d40.
This change did not have the desired effect on Symbian versions prior
to Symbian^3.
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.cpp
|
|
|
|
|
|
|
| |
RCmManager is not sharable between threads, use a function local
instance instead.
Task-number: QTBUG-13064
|
|
|
|
|
|
|
| |
If setdefaultif(0) or unsetdefaultif() is called all sockets belonging
to the current process are closed by OpenC.
Task-number: QTBUG-12686
|