diff options
28 files changed, 12 insertions, 3922 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 51aed45753..fca3d5999e 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -69,11 +69,7 @@ QT_BEGIN_NAMESPACE -#ifdef Q_OS_SYMBIAN -const int QHttpNetworkConnectionPrivate::defaultChannelCount = 3; -#else const int QHttpNetworkConnectionPrivate::defaultChannelCount = 6; -#endif // The pipeline length. So there will be 4 requests in flight. const int QHttpNetworkConnectionPrivate::defaultPipelineLength = 3; diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 7eb4c4c6ae..3978bd6c85 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -160,22 +160,12 @@ static void ensureInitialized() upon the platform supporting connection management. The \l QNetworkConfigurationManager::NetworkSessionRequired can be used to detect whether QNetworkAccessManager utilizes this feature. Currently only - Meego/Harmattan and Symbian platforms provide connection management support. + Meego/Harmattan platforms provide connection management support. \note This feature cannot be used in combination with the Bearer Management API as provided by QtMobility. Applications have to migrate to the Qt version of Bearer Management. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use this class must have the - \c NetworkServices platform security capability. If the client - process lacks this capability, operations will result in a panic. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QNetworkRequest, QNetworkReply, QNetworkProxy */ diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index 6c73828096..28bbafab36 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -200,7 +200,7 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate() works across multiple processes. If the platform session support is missing this API can only ensure the above behavior for network sessions within the same process. - In general mobile platforms (such as Symbian/S60) have such + In general mobile platforms have such support whereas most desktop platform lack this capability. \value ApplicationLevelRoaming The system gives applications control over the systems roaming behavior. Applications can initiate roaming (in case the diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 5d2dd36950..f63298dba1 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -49,11 +49,6 @@ #include "qnetworkconfigmanager_p.h" #include "qnetworksession_p.h" -#ifdef Q_OS_SYMBIAN -#include <es_sock.h> -#include <private/qcore_symbian_p.h> -#endif - #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE @@ -362,9 +357,6 @@ void QNetworkSession::close() underlying network interface. This function always changes the session's state() flag to \l Disconnected. - On Symbian platform, a 'NetworkControl' capability is required for - full interface-level stop (without the capability, only the current session is stopped). - \sa open(), close() */ void QNetworkSession::stop() @@ -391,9 +383,6 @@ QNetworkConfiguration QNetworkSession::configuration() const The returned interface may change as a result of a roaming process. - Note: this function does not work in Symbian emulator due to the way the - connectivity is emulated on Windows. - \sa state() */ QNetworkInterface QNetworkSession::interface() const @@ -586,7 +575,7 @@ void QNetworkSession::migrate() */ void QNetworkSession::ignore() { - // Needed on at least Symbian platform: the roaming must be explicitly + // Needed on mobile platforms (was needed for Symbian/S60): the roaming must be explicitly // ignore()'d or migrate()'d if (d) d->ignore(); @@ -711,40 +700,6 @@ void QNetworkSession::disconnectNotify(const char *signal) d->setALREnabled(false); } -#ifdef Q_OS_SYMBIAN -RConnection* QNetworkSessionPrivate::nativeSession(QNetworkSession &s) -{ - if (!s.d) - return 0; - if (s.thread() != QThread::currentThread()) - qWarning("QNetworkSessionPrivate::nativeSession called in wrong thread"); - return s.d->nativeSession(); -} - -TInt QNetworkSessionPrivate::nativeOpenSocket(QNetworkSession& s, RSocket& sock, TUint family, TUint type, TUint protocol) -{ - if (!s.d) - return 0; - QMutexLocker lock(&(s.d->mutex)); - RConnection *con = s.d->nativeSession(); - if (!con || !con->SubSessionHandle()) - return KErrNotReady; - return sock.Open(qt_symbianGetSocketServer(), family, type, protocol, *con); -} - -TInt QNetworkSessionPrivate::nativeOpenHostResolver(QNetworkSession& s, RHostResolver& resolver, TUint family, TUint protocol) -{ - if (!s.d) - return 0; - QMutexLocker lock(&(s.d->mutex)); - RConnection *con = s.d->nativeSession(); - if (!con || !con->SubSessionHandle()) - return KErrNotReady; - return resolver.Open(qt_symbianGetSocketServer(), family, protocol, *con); -} - -#endif - #include "moc_qnetworksession.cpp" QT_END_NAMESPACE diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index cfd744479c..ddf0428b52 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -59,12 +59,6 @@ #ifndef QT_NO_BEARERMANAGEMENT -#ifdef Q_OS_SYMBIAN -class RConnection; -class RSocket; -class RHostResolver; -#endif - QT_BEGIN_NAMESPACE class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject @@ -109,15 +103,6 @@ public: virtual quint64 bytesReceived() const = 0; virtual quint64 activeTime() const = 0; -#ifdef Q_OS_SYMBIAN - // get internal RConnection (not thread safe, call only from thread that owns the QNetworkSession) - static RConnection* nativeSession(QNetworkSession&); - virtual RConnection* nativeSession() = 0; - // open socket using the internal RConnection (thread safe) - static TInt nativeOpenSocket(QNetworkSession& session, RSocket& socket, TUint family, TUint type, TUint protocol); - // open host resolver using the internal RConnection (thread safe) - static TInt nativeOpenHostResolver(QNetworkSession& session, RHostResolver& resolver, TUint family, TUint protocol); -#endif protected: inline QNetworkConfigurationPrivatePointer privateConfiguration(const QNetworkConfiguration &config) const { diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index bb98305173..d6e099701d 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -20,15 +20,11 @@ SOURCES += kernel/qauthenticator.cpp \ kernel/qnetworkproxy.cpp \ kernel/qnetworkinterface.cpp -symbian: SOURCES += kernel/qhostinfo_symbian.cpp kernel/qnetworkinterface_symbian.cpp -unix:!symbian:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp +unix:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp win32:SOURCES += kernel/qhostinfo_win.cpp kernel/qnetworkinterface_win.cpp integrity:SOURCES += kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation mac:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp -else:symbian:SOURCES += kernel/qnetworkproxy_symbian.cpp else:SOURCES += kernel/qnetworkproxy_generic.cpp - -symbian: LIBS += -lcommsdat diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index d42c2598f8..465345c085 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -59,11 +59,7 @@ QT_BEGIN_NAMESPACE //#define QHOSTINFO_DEBUG -#ifndef Q_OS_SYMBIAN Q_GLOBAL_STATIC(QHostInfoLookupManager, theHostInfoLookupManager) -#else -Q_GLOBAL_STATIC(QSymbianHostInfoLookupManager, theHostInfoLookupManager) -#endif /*! \class QHostInfo @@ -178,7 +174,6 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, return id; } -#ifndef Q_OS_SYMBIAN QHostInfoLookupManager *manager = theHostInfoLookupManager(); if (manager) { @@ -201,39 +196,6 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, QObject::connect(&runnable->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection); manager->scheduleLookup(runnable); } -#else - QSymbianHostInfoLookupManager *manager = theHostInfoLookupManager(); - - if (manager) { - // the application is still alive - if (manager->cache.isEnabled()) { - // check cache first - bool valid = false; - QHostInfo info = manager->cache.get(name, &valid); - if (valid) { - info.setLookupId(id); - QHostInfoResult result; - QObject::connect(&result, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection); - result.emitResultsReady(info); - return id; - } - } - - // cache is not enabled or it was not in the cache, do normal lookup -#ifndef QT_NO_BEARERMANAGEMENT - QSharedPointer<QNetworkSession> networkSession; - QVariant v(receiver->property("_q_networksession")); - if (v.isValid()) - networkSession = qvariant_cast< QSharedPointer<QNetworkSession> >(v); -#endif - - QSymbianHostResolver *symbianResolver = 0; - QT_TRAP_THROWING(symbianResolver = new QSymbianHostResolver(name, id, networkSession)); - QObject::connect(&symbianResolver->resultEmitter, SIGNAL(resultsReady(QHostInfo)), receiver, member, Qt::QueuedConnection); - manager->scheduleLookup(symbianResolver); - } -#endif - return id; } @@ -286,13 +248,10 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor } #endif -#ifndef Q_OS_SYMBIAN -// This function has a special implementation for symbian right now in qhostinfo_symbian.cpp but not on other OS. QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>) { return QHostInfoAgent::fromName(hostName); } -#endif /*! @@ -471,7 +430,6 @@ void QHostInfo::setErrorString(const QString &str) \sa hostName() */ -#ifndef Q_OS_SYMBIAN QHostInfoRunnable::QHostInfoRunnable(QString hn, int i) : toBeLookedUp(hn), id(i) { setAutoDelete(true); @@ -699,7 +657,6 @@ void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r) finishedLookups.append(r); work(); } -#endif // This function returns immediately when we had a result in the cache, else it will later emit a signal QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id) diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 035aa0126a..fb7ae37c53 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -72,12 +72,6 @@ #include <QNetworkSession> #include <QSharedPointer> -#ifdef Q_OS_SYMBIAN -// Symbian Headers -#include <es_sock.h> -#include <in_sock.h> -#endif - QT_BEGIN_NAMESPACE @@ -102,11 +96,6 @@ class QHostInfoAgent : public QObject public: static QHostInfo fromName(const QString &hostName); static QHostInfo fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession); - -#ifdef Q_OS_SYMBIAN - static int lookupHost(const QString &name, QObject *receiver, const char *member); - static void abortHostLookup(int lookupId); -#endif }; class QHostInfoPrivate @@ -188,7 +177,6 @@ protected: }; -#ifndef Q_OS_SYMBIAN class QHostInfoLookupManager : public QAbstractHostInfoLookupManager { Q_OBJECT @@ -225,95 +213,6 @@ private slots: void waitForThreadPoolDone() { threadPool.waitForDone(); } }; -#else - -class QSymbianHostResolver : public CActive -{ -public: - QSymbianHostResolver(const QString &hostName, int id, QSharedPointer<QNetworkSession> networkSession); - ~QSymbianHostResolver(); - - void requestHostLookup(); - void abortHostLookup(); - int id(); - - void returnResults(); - - QHostInfoResult resultEmitter; - -private: - void DoCancel(); - void RunL(); - void run(); - TInt RunError(TInt aError); - - void processNameResult(); - void nextNameResult(); - void processAddressResult(); - -private: - int iId; - - const QString iHostName; - QString iEncodedHostName; - TPtrC iHostNamePtr; - - RSocketServ& iSocketServ; - RHostResolver iHostResolver; - QSharedPointer<QNetworkSession> iNetworkSession; - - TNameEntry iNameResult; - TInetAddr IpAdd; - - QHostAddress iAddress; - - QHostInfo iResults; - - QList<QHostAddress> iHostAddresses; - - enum { - EIdle, - EGetByName, - EGetByAddress, - ECompleteFromCache, - EError - } iState; -}; - -class QSymbianHostInfoLookupManager : public QAbstractHostInfoLookupManager -{ - Q_OBJECT -public: - QSymbianHostInfoLookupManager(); - ~QSymbianHostInfoLookupManager(); - - static QSymbianHostInfoLookupManager* globalInstance(); - - int id(); - void clear(); - - // called from QHostInfo - void scheduleLookup(QSymbianHostResolver *r); - void abortLookup(int id); - - // called from QSymbianHostResolver - void lookupFinished(QSymbianHostResolver *r); - -private: - void runNextLookup(); - - // this is true for single threaded use, with multiple threads the max is ((number of threads) + KMaxConcurrentLookups - 1) - static const int KMaxConcurrentLookups = 5; - - QList<QSymbianHostResolver*> iCurrentLookups; - QList<QSymbianHostResolver*> iScheduledLookups; - - QMutex mutex; -}; -#endif - - - QT_END_NAMESPACE #endif // QHOSTINFO_P_H diff --git a/src/network/kernel/qhostinfo_symbian.cpp b/src/network/kernel/qhostinfo_symbian.cpp deleted file mode 100644 index 042899d9a4..0000000000 --- a/src/network/kernel/qhostinfo_symbian.cpp +++ /dev/null @@ -1,600 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define QHOSTINFO_DEBUG - -// Qt Headers -#include <QByteArray> -#include <QUrl> -#include <QList> - -#include "qplatformdefs.h" - -#include "qhostinfo_p.h" -#include <private/qcore_symbian_p.h> -#include <private/qsystemerror_p.h> -#include <private/qnetworksession_p.h> - -// Header does not exist in the S60 5.0 SDK -//#include <networking/dnd_err.h> -const TInt KErrDndNameNotFound = -5120; // Returned when no data found for GetByName -const TInt KErrDndAddrNotFound = -5121; // Returned when no data found for GetByAddr - -QT_BEGIN_NAMESPACE - -static void setError_helper(QHostInfo &info, TInt symbianError) -{ - switch (symbianError) { - case KErrDndNameNotFound: - case KErrDndAddrNotFound: - case KErrNotFound: - case KErrEof: - // various "no more results" error codes - info.setError(QHostInfo::HostNotFound); - info.setErrorString(QObject::tr("Host not found")); - break; - default: - // Unknown error - info.setError(QHostInfo::UnknownError); - info.setErrorString(QSystemError(symbianError, QSystemError::NativeError).toString()); - break; - } -} - -QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession) -{ - QHostInfo results; - - // Connect to ESOCK - RSocketServ socketServ(qt_symbianGetSocketServer()); - RHostResolver hostResolver; - - - int err; - if (networkSession) - err = QNetworkSessionPrivate::nativeOpenHostResolver(*networkSession, hostResolver, KAfInet, KProtocolInetUdp); - else - err = hostResolver.Open(socketServ, KAfInet, KProtocolInetUdp); - if (err) { - setError_helper(results, err); - return results; - } - - TNameEntry nameResult; - -#if defined(QHOSTINFO_DEBUG) - qDebug("QHostInfoAgent::fromName(%s) looking up...", - hostName.toLatin1().constData()); -#endif - - QHostAddress address; - if (address.setAddress(hostName)) { - // Reverse lookup -#if defined(QHOSTINFO_DEBUG) - qDebug("(reverse lookup)"); -#endif - TInetAddr IpAdd; - IpAdd.Input(qt_QString2TPtrC(hostName)); - - // Synchronous request. nameResult returns Host Name. - err = hostResolver.GetByAddress(IpAdd, nameResult); - if (err) { - //for behavioural compatibility with Qt 4.7 and unix/windows - //backends: don't report error, return ip address as host name - results.setHostName(address.toString()); - } else { - results.setHostName(qt_TDesC2QString(nameResult().iName)); - } - results.setAddresses(QList<QHostAddress>() << address); - return results; - } - - // IDN support - QByteArray aceHostname = QUrl::toAce(hostName); - results.setHostName(hostName); - if (aceHostname.isEmpty()) { - results.setError(QHostInfo::HostNotFound); - results.setErrorString(hostName.isEmpty() ? - QCoreApplication::translate("QHostInfoAgent", "No host name given") : - QCoreApplication::translate("QHostInfoAgent", "Invalid hostname")); - return results; - } - - - // Call RHostResolver::GetByAddress, and place all IPv4 addresses at the start and - // the IPv6 addresses at the end of the address list in results. - - // Synchronous request. - err = hostResolver.GetByName(qt_QString2TPtrC(QString::fromLatin1(aceHostname)), nameResult); - if (err) { - setError_helper(results, err); - return results; - } - - QList<QHostAddress> hostAddresses; - - TInetAddr hostAdd = nameResult().iAddr; - // 39 is the maximum length of an IPv6 address. - TBuf<39> ipAddr; - - // Fill ipAddr with the IP address from hostAdd - hostAdd.Output(ipAddr); - if (ipAddr.Length() > 0) - hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); - - // Check if there's more than one IP address linkd to this name - while (hostResolver.Next(nameResult) == KErrNone) { - hostAdd = nameResult().iAddr; - hostAdd.Output(ipAddr); - - // Ensure that record is valid (not an alias and with length greater than 0) - if (!(nameResult().iFlags & TNameRecord::EAlias) && !(hostAdd.IsUnspecified())) { - hostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); - } - } - - hostResolver.Close(); - - results.setAddresses(hostAddresses); - return results; -} - -QHostInfo QHostInfoAgent::fromName(const QString &hostName) -{ - // null shared pointer - QSharedPointer<QNetworkSession> networkSession; - return fromName(hostName, networkSession); -} - -QString QHostInfo::localHostName() -{ - // Connect to ESOCK - RSocketServ socketServ(qt_symbianGetSocketServer()); - RHostResolver hostResolver; - - // RConnection not required to get the host name - int err = hostResolver.Open(socketServ, KAfInet, KProtocolInetUdp); - if (err) - return QString(); - - THostName hostName; - err = hostResolver.GetHostName(hostName); - if (err) - return QString(); - - hostResolver.Close(); - - return qt_TDesC2QString(hostName); -} - -QString QHostInfo::localDomainName() -{ - // This concept does not exist on Symbian OS because the device can be on - // multiple networks with multiple "local domain" names. - // For now, return a null string. - return QString(); -} - - -QSymbianHostResolver::QSymbianHostResolver(const QString &hostName, int identifier, QSharedPointer<QNetworkSession> networkSession) - : CActive(CActive::EPriorityStandard), iHostName(hostName), - iSocketServ(qt_symbianGetSocketServer()), iNetworkSession(networkSession), iResults(identifier) -{ - CActiveScheduler::Add(this); -} - -QSymbianHostResolver::~QSymbianHostResolver() -{ -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::~QSymbianHostResolver" << id(); -#endif - Cancel(); - iHostResolver.Close(); -} - -// Async equivalent to QHostInfoAgent::fromName() -void QSymbianHostResolver::requestHostLookup() -{ - -#if defined(QHOSTINFO_DEBUG) - qDebug("QSymbianHostResolver::requestHostLookup(%s) looking up... (id = %d)", - iHostName.toLatin1().constData(), id()); -#endif - - QSymbianHostInfoLookupManager *manager = QSymbianHostInfoLookupManager::globalInstance(); - if (manager->cache.isEnabled()) { - //check if name has been put in the cache while this request was queued - bool valid; - QHostInfo cachedResult = manager->cache.get(iHostName, &valid); - if (valid) { -#if defined(QHOSTINFO_DEBUG) - qDebug("...found in cache"); -#endif - iResults = cachedResult; - iState = ECompleteFromCache; - SetActive(); - TRequestStatus* stat = &iStatus; - User::RequestComplete(stat, KErrNone); - return; - } - } - - int err; - if (iNetworkSession) { - err = QNetworkSessionPrivate::nativeOpenHostResolver(*iNetworkSession, iHostResolver, KAfInet, KProtocolInetUdp); -#if defined(QHOSTINFO_DEBUG) - qDebug("using resolver from session (err = %d)", err); -#endif - } else { - err = iHostResolver.Open(iSocketServ, KAfInet, KProtocolInetUdp); -#if defined(QHOSTINFO_DEBUG) - qDebug("using default resolver (err = %d)", err); -#endif - } - if (err) { - setError_helper(iResults, err); - } else { - - if (iAddress.setAddress(iHostName)) { - // Reverse lookup - IpAdd.Input(qt_QString2TPtrC(iHostName)); - - // Asynchronous request. - iHostResolver.GetByAddress(IpAdd, iNameResult, iStatus); // <---- ASYNC - iState = EGetByAddress; - - } else { - - // IDN support - QByteArray aceHostname = QUrl::toAce(iHostName); - iResults.setHostName(iHostName); - if (aceHostname.isEmpty()) { - iResults.setError(QHostInfo::HostNotFound); - iResults.setErrorString(iHostName.isEmpty() ? - QCoreApplication::translate("QHostInfoAgent", "No host name given") : - QCoreApplication::translate("QHostInfoAgent", "Invalid hostname")); - - err = KErrArgument; - } else { - iEncodedHostName = QString::fromLatin1(aceHostname); - iHostNamePtr.Set(qt_QString2TPtrC(iEncodedHostName)); - - // Asynchronous request. - iHostResolver.GetByName(iHostNamePtr, iNameResult, iStatus); - iState = EGetByName; - } - } - } - SetActive(); - if (err) { - iHostResolver.Close(); - - //self complete so that RunL can inform manager without causing recursion - iState = EError; - TRequestStatus* stat = &iStatus; - User::RequestComplete(stat, err); - } -} - -void QSymbianHostResolver::abortHostLookup() -{ - if (resultEmitter.thread() == QThread::currentThread()) { -#ifdef QHOSTINFO_DEBUG - qDebug("QSymbianHostResolver::abortHostLookup - deleting %d", id()); -#endif - //normal case, abort from same thread it was started - delete this; //will cancel outstanding request - } else { -#ifdef QHOSTINFO_DEBUG - qDebug("QSymbianHostResolver::abortHostLookup - detaching %d", id()); -#endif - //abort from different thread, carry on but don't report the results - resultEmitter.disconnect(); - } -} - -void QSymbianHostResolver::DoCancel() -{ -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostResolver::DoCancel" << QThread::currentThreadId() << id() << (int)iState << this; -#endif - if (iState == EGetByAddress || iState == EGetByName) { - //these states have made an async request to host resolver - iHostResolver.Cancel(); - } else { - //for the self completing states there is nothing to cancel - Q_ASSERT(iState == EError || iState == ECompleteFromCache); - } -} - -void QSymbianHostResolver::RunL() -{ - QT_TRYCATCH_LEAVING(run()); -} - -void QSymbianHostResolver::run() -{ - switch (iState) { - case EGetByName: - processNameResult(); - break; - case EGetByAddress: - processAddressResult(); - break; - case ECompleteFromCache: - case EError: - returnResults(); - break; - default: - qWarning("QSymbianHostResolver internal error, bad state in run()"); - iResults.setError(QHostInfo::UnknownError); - iResults.setErrorString(QSystemError(KErrCorrupt,QSystemError::NativeError).toString()); - returnResults(); - } -} - -void QSymbianHostResolver::returnResults() -{ -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostResolver::returnResults" << iResults.error() << iResults.errorString(); - foreach (QHostAddress addr, iResults.addresses()) - qDebug() << addr; -#endif - iState = EIdle; - - QSymbianHostInfoLookupManager *manager = QSymbianHostInfoLookupManager::globalInstance(); - if (manager->cache.isEnabled()) { - manager->cache.put(iHostName, iResults); - } - manager->lookupFinished(this); - - resultEmitter.emitResultsReady(iResults); - - delete this; -} - -TInt QSymbianHostResolver::RunError(TInt aError) -{ - QT_TRY { - iState = EIdle; - - QSymbianHostInfoLookupManager *manager = QSymbianHostInfoLookupManager::globalInstance(); - manager->lookupFinished(this); - - setError_helper(iResults, aError); - - resultEmitter.emitResultsReady(iResults); - } - QT_CATCH(...) {} - - delete this; - - return KErrNone; -} - -void QSymbianHostResolver::processNameResult() -{ - if (iStatus.Int() == KErrNone) { - TInetAddr hostAdd = iNameResult().iAddr; - // 39 is the maximum length of an IPv6 address. - TBuf<39> ipAddr; - - hostAdd.Output(ipAddr); - - // Ensure that record is valid (not an alias and with length greater than 0) - if (!(iNameResult().iFlags & TNameRecord::EAlias) && !(hostAdd.IsUnspecified())) { - iHostAddresses.append(QHostAddress(qt_TDesC2QString(ipAddr))); - } - - iState = EGetByName; - iHostResolver.Next(iNameResult, iStatus); - SetActive(); - } - else { - // No more addresses, so return the results (or an error if there aren't any). -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostResolver::processNameResult with err=" << iStatus.Int() << "count=" << iHostAddresses.count(); -#endif - if (iHostAddresses.count() > 0) { - iResults.setAddresses(iHostAddresses); - } else { - iState = EError; - setError_helper(iResults, iStatus.Int()); - } - returnResults(); - } -} - -void QSymbianHostResolver::processAddressResult() -{ - TInt err = iStatus.Int(); - - if (err < 0) { - //For behavioural compatibility with Qt 4.7, don't report errors on reverse lookup, - //return the address as a string (same as unix/windows backends) - iResults.setHostName(iAddress.toString()); - } else { - iResults.setHostName(qt_TDesC2QString(iNameResult().iName)); - } - iResults.setAddresses(QList<QHostAddress>() << iAddress); - returnResults(); -} - - -int QSymbianHostResolver::id() -{ - return iResults.lookupId(); -} - -QSymbianHostInfoLookupManager::QSymbianHostInfoLookupManager() -{ -} - -QSymbianHostInfoLookupManager::~QSymbianHostInfoLookupManager() -{ -} - -void QSymbianHostInfoLookupManager::clear() -{ - QMutexLocker locker(&mutex); -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::clear" << QThread::currentThreadId(); -#endif - foreach (QSymbianHostResolver *hr, iCurrentLookups) - hr->abortHostLookup(); - iCurrentLookups.clear(); - qDeleteAll(iScheduledLookups); - cache.clear(); -} - -void QSymbianHostInfoLookupManager::lookupFinished(QSymbianHostResolver *r) -{ - QMutexLocker locker(&mutex); - -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::lookupFinished" << QThread::currentThreadId() << r->id() << "current" << iCurrentLookups.count() << "queued" << iScheduledLookups.count(); -#endif - // remove finished lookup from array and destroy - TInt count = iCurrentLookups.count(); - for (TInt i = 0; i < count; i++) { - if (iCurrentLookups[i]->id() == r->id()) { - iCurrentLookups.removeAt(i); - break; - } - } - - runNextLookup(); -} - -void QSymbianHostInfoLookupManager::runNextLookup() -{ -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::runNextLookup" << QThread::currentThreadId() << "current" << iCurrentLookups.count() << "queued" << iScheduledLookups.count(); -#endif - // check to see if there are any scheduled lookups - for (int i=0; i<iScheduledLookups.count(); i++) { - QSymbianHostResolver* hostResolver = iScheduledLookups.at(i); - if (hostResolver->resultEmitter.thread() == QThread::currentThread()) { - // if so, move one to the current lookups and run it - iCurrentLookups.append(hostResolver); - iScheduledLookups.removeAt(i); - hostResolver->requestHostLookup(); - // if spare capacity, try to start another one - if (iCurrentLookups.count() >= KMaxConcurrentLookups) - break; - i--; //compensate for removeAt - } - } -} - -// called from QHostInfo -void QSymbianHostInfoLookupManager::scheduleLookup(QSymbianHostResolver* r) -{ - QMutexLocker locker(&mutex); - -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::scheduleLookup" << QThread::currentThreadId() << r->id() << "current" << iCurrentLookups.count() << "queued" << iScheduledLookups.count(); -#endif - // Check to see if we have space on the current lookups pool. - bool defer = false; - if (iCurrentLookups.count() >= KMaxConcurrentLookups) { - // busy, defer unless there are no request in this thread - // at least one active request per thread with queued requests is needed - for (int i=0; i < iCurrentLookups.count();i++) { - if (iCurrentLookups.at(i)->resultEmitter.thread() == QThread::currentThread()) { - defer = true; - break; - } - } - } - if (defer) { - // If no, schedule for later. - iScheduledLookups.append(r); -#if defined(QHOSTINFO_DEBUG) - qDebug(" - scheduled"); -#endif - return; - } else { - // If yes, add it to the current lookups. - iCurrentLookups.append(r); - - // ... and trigger the async call. - r->requestHostLookup(); - } -} - -void QSymbianHostInfoLookupManager::abortLookup(int id) -{ - QMutexLocker locker(&mutex); - -#if defined(QHOSTINFO_DEBUG) - qDebug() << "QSymbianHostInfoLookupManager::abortLookup" << QThread::currentThreadId() << id << "current" << iCurrentLookups.count() << "queued" << iScheduledLookups.count(); -#endif - int i = 0; - // Find the aborted lookup by ID. - // First in the current lookups. - for (i = 0; i < iCurrentLookups.count(); i++) { - if (id == iCurrentLookups[i]->id()) { - QSymbianHostResolver* r = iCurrentLookups.at(i); - iCurrentLookups.removeAt(i); - r->abortHostLookup(); - runNextLookup(); - return; - } - } - // Then in the scheduled lookups. - for (i = 0; i < iScheduledLookups.count(); i++) { - if (id == iScheduledLookups[i]->id()) { - QSymbianHostResolver* r = iScheduledLookups.at(i); - iScheduledLookups.removeAt(i); - delete r; - return; - } - } -} - -QSymbianHostInfoLookupManager* QSymbianHostInfoLookupManager::globalInstance() -{ - return static_cast<QSymbianHostInfoLookupManager*> - (QAbstractHostInfoLookupManager::globalInstance()); -} - -QT_END_NAMESPACE diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp deleted file mode 100644 index e7d3ca9d99..0000000000 --- a/src/network/kernel/qnetworkinterface_symbian.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtNetwork of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define QNETWORKINTERFACE_DEBUG - -#include "qnetworkinterface.h" -#include "qnetworkinterface_p.h" -#include <private/qcore_symbian_p.h> - -#ifndef QT_NO_NETWORKINTERFACE - -#include <in_sock.h> -#include <in_iface.h> -#include <es_sock.h> - -QT_BEGIN_NAMESPACE - - -static QNetworkInterface::InterfaceFlags convertFlags(const TSoInetInterfaceInfo& aInfo) -{ - QNetworkInterface::InterfaceFlags flags = 0; - flags |= (aInfo.iState == EIfUp) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0); - // We do not have separate flag for running in Symbian OS - flags |= (aInfo.iState == EIfUp) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0); - flags |= (aInfo.iFeatures & KIfCanBroadcast) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0); - flags |= (aInfo.iFeatures & KIfIsLoopback) ? QNetworkInterface::IsLoopBack : QNetworkInterface::InterfaceFlag(0); - flags |= (aInfo.iFeatures & KIfIsPointToPoint) ? QNetworkInterface::IsPointToPoint : QNetworkInterface::InterfaceFlag(0); - flags |= (aInfo.iFeatures & KIfCanMulticast) ? QNetworkInterface::CanMulticast : QNetworkInterface::InterfaceFlag(0); - return flags; -} - -//TODO: share this, at least QHostInfo needs to do the same thing -static QHostAddress qt_QHostAddressFromTInetAddr(const TInetAddr& addr) -{ - //TODO: do we want to call v4 mapped addresses v4 or v6 outside of this file? - if (addr.IsV4Mapped() || addr.Family() == KAfInet) { - //convert v4 host address - return QHostAddress(addr.Address()); - } else { - //convert v6 host address - return QHostAddress((quint8 *)(addr.Ip6Address().u.iAddr8)); - } -} - -static QList<QNetworkInterfacePrivate *> interfaceListing() -{ - TInt err(KErrNone); - QList<QNetworkInterfacePrivate *> interfaces; - QList<QHostAddress> addressesWithEstimatedNetmasks; - - // Open dummy socket for interface queries - RSocket socket; - err = socket.Open(qt_symbianGetSocketServer(), _L("udp")); - if (err) { - return interfaces; - } - - // Ask socket to start enumerating interfaces - err = socket.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl); - if (err) { - socket.Close(); - return interfaces; - } - - int ifindex = 0; - TPckgBuf<TSoInetInterfaceInfo> infoPckg; - TSoInetInterfaceInfo &info = infoPckg(); - while (socket.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, infoPckg) == KErrNone) { - if (info.iName != KNullDesC) { - TName address; - QNetworkAddressEntry entry; - QNetworkInterfacePrivate *iface = 0; - - iface = new QNetworkInterfacePrivate; - iface->index = ifindex++; - interfaces << iface; - iface->name = qt_TDesC2QString(info.iName); - iface->flags = convertFlags(info); - - if (/*info.iFeatures&KIfHasHardwareAddr &&*/ info.iHwAddr.Family() != KAFUnspec) { - for (TInt i = sizeof(SSockAddr); i < sizeof(SSockAddr) + info.iHwAddr.GetUserLen(); i++) { - address.AppendNumFixedWidth(info.iHwAddr[i], EHex, 2); - if ((i + 1) < sizeof(SSockAddr) + info.iHwAddr.GetUserLen()) - address.Append(_L(":")); - } - address.UpperCase(); - iface->hardwareAddress = qt_TDesC2QString(address); - } - - // Get the address of the interface - entry.setIp(qt_QHostAddressFromTInetAddr(info.iAddress)); - -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "address is" << info.iAddress.Family() << entry.ip(); - qDebug() << "netmask is" << info.iNetMask.Family() << qt_QHostAddressFromTInetAddr( info.iNetMask ); -#endif - - // Get the interface netmask - if (info.iNetMask.IsUnspecified()) { - // For some reason netmask is always 0.0.0.0 for IPv4 interfaces - // and loopback interfaces (which we statically know) - if (info.iAddress.IsV4Mapped()) { - if (info.iFeatures & KIfIsLoopback) { - entry.setPrefixLength(32); - } else { - // Workaround: Let Symbian determine netmask based on IP address class (IPv4 only API) - TInetAddr netmask; - netmask.NetMask(info.iAddress); - entry.setNetmask(QHostAddress(netmask.Address())); //binary convert v4 address - addressesWithEstimatedNetmasks << entry.ip(); -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "address class determined netmask" << entry.netmask(); -#endif - } - } else { - // For IPv6 interfaces - if (info.iFeatures & KIfIsLoopback) { - entry.setPrefixLength(128); - } else if (info.iNetMask.IsUnspecified()) { - //Don't see this error for IPv6, but try to handle it if it happens - entry.setPrefixLength(64); //most common -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "total guess netmask" << entry.netmask(); -#endif - addressesWithEstimatedNetmasks << entry.ip(); - } - } - } else { - //Expected code path for IPv6 non loopback interfaces (IPv4 could come here if symbian is fixed) - entry.setNetmask(qt_QHostAddressFromTInetAddr(info.iNetMask)); -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "reported netmask" << entry.netmask(); -#endif - } - - // broadcast address is determined from the netmask in postProcess() - - // Add new entry to interface address entries - iface->addressEntries << entry; - -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug("\n Found network interface %s, interface flags:\n\ - IsUp = %d, IsRunning = %d, CanBroadcast = %d,\n\ - IsLoopBack = %d, IsPointToPoint = %d, CanMulticast = %d, \n\ - ip = %s, netmask = %s, broadcast = %s,\n\ - hwaddress = %s", - iface->name.toLatin1().constData(), - iface->flags & QNetworkInterface::IsUp, iface->flags & QNetworkInterface::IsRunning, iface->flags & QNetworkInterface::CanBroadcast, - iface->flags & QNetworkInterface::IsLoopBack, iface->flags & QNetworkInterface::IsPointToPoint, iface->flags & QNetworkInterface::CanMulticast, - entry.ip().toString().toLatin1().constData(), entry.netmask().toString().toLatin1().constData(), entry.broadcast().toString().toLatin1().constData(), - iface->hardwareAddress.toLatin1().constData()); -#endif - } - } - - // if we didn't have to guess any netmasks, then we're done. - if (addressesWithEstimatedNetmasks.isEmpty()) { - socket.Close(); - return interfaces; - } - - // we will try to use routing info to detect more precisely - // estimated netmasks and then ::postProcess() should calculate - // broadcast addresses - - // use dummy socket to start enumerating routes - err = socket.SetOpt(KSoInetEnumRoutes, KSolInetRtCtrl); - if (err) { - socket.Close(); - // return what we have - // up to this moment - return interfaces; - } - - TSoInetRouteInfo routeInfo; - TPckg<TSoInetRouteInfo> routeInfoPkg(routeInfo); - while (socket.GetOpt(KSoInetNextRoute, KSolInetRtCtrl, routeInfoPkg) == KErrNone) { - // get interface address - QHostAddress ifAddr(qt_QHostAddressFromTInetAddr(routeInfo.iIfAddr)); - if (ifAddr.isNull()) - continue; - if (!addressesWithEstimatedNetmasks.contains(ifAddr)) { -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "skipping route from" << ifAddr << "because it wasn't an estimated netmask"; -#endif - continue; - } - - QHostAddress destination(qt_QHostAddressFromTInetAddr(routeInfo.iDstAddr)); -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << "route from" << ifAddr << "to" << destination; -#endif - if (destination.isNull() || destination != ifAddr) - continue; - - // search interfaces - for (int ifindex = 0; ifindex < interfaces.size(); ++ifindex) { - QNetworkInterfacePrivate *iface = interfaces.at(ifindex); - for (int eindex = 0; eindex < iface->addressEntries.size(); ++eindex) { - QNetworkAddressEntry entry = iface->addressEntries.at(eindex); - if (entry.ip() != ifAddr) { - continue; - } else if (!routeInfo.iNetMask.IsUnspecified()) { - //the route may also return 0.0.0.0 netmask, in which case don't use it. - QHostAddress netmask(qt_QHostAddressFromTInetAddr(routeInfo.iNetMask)); - entry.setNetmask(netmask); -#if defined(QNETWORKINTERFACE_DEBUG) - qDebug() << " - route netmask" << routeInfo.iNetMask.Family() << netmask << " (using route determined netmask)"; -#endif - iface->addressEntries.replace(eindex, entry); - } - } - } - } - - socket.Close(); - - return interfaces; -} - -QList<QNetworkInterfacePrivate *> QNetworkInterfaceManager::scan() -{ - return interfaceListing(); -} - -QT_END_NAMESPACE - -#endif // QT_NO_NETWORKINTERFACE diff --git a/src/network/kernel/qnetworkproxy_symbian.cpp b/src/network/kernel/qnetworkproxy_symbian.cpp deleted file mode 100644 index 1be8de3aad..0000000000 --- a/src/network/kernel/qnetworkproxy_symbian.cpp +++ /dev/null @@ -1,272 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the FOO module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/** - * Some notes about the code: - * - * ** It is assumed that the system proxies are for url based requests - * ie. HTTP/HTTPS based. - * ** It is assumed that proxies don't use authentication. - * ** It is assumed that there is no exceptions to proxy use (Symbian side - * does have the field for it but it is not user modifiable by default). - * ** There is no checking for protocol name. - */ - -#include <QtNetwork/qnetworkproxy.h> - -#ifndef QT_NO_NETWORKPROXY - -#include <metadatabase.h> // CMDBSession -#include <commsdattypeinfov1_1.h> // CCDIAPRecord, CCDProxiesRecord -#include <commsdattypesv1_1.h> // KCDTIdIAPRecord, KCDTIdProxiesRecord -#include <QtNetwork/QNetworkConfigurationManager> -#include <QtNetwork/QNetworkConfiguration> -#include <QFlags> - -using namespace CommsDat; - -QT_BEGIN_NAMESPACE - -class SymbianIapId -{ -public: - enum State{ - NotValid, - Valid - }; - Q_DECLARE_FLAGS(States, State) - SymbianIapId() {} - ~SymbianIapId() {} - void setIapId(TUint32 iapId) { iapState |= Valid; id = iapId; } - bool isValid() { return iapState == Valid; } - TUint32 iapId() { return id; } -private: - QFlags<States> iapState; - TUint32 id; -}; - -Q_DECLARE_OPERATORS_FOR_FLAGS(SymbianIapId::States) - -class SymbianProxyQuery -{ -public: - static QNetworkConfiguration findCurrentConfiguration(QNetworkConfigurationManager& configurationManager); - static SymbianIapId getIapId(QNetworkConfigurationManager &configurationManager, const QNetworkProxyQuery &query); - static CCDIAPRecord *getIapRecordLC(TUint32 aIAPId, CMDBSession &aDb); - static CMDBRecordSet<CCDProxiesRecord> *prepareQueryLC(TUint32 serviceId, TDesC& serviceType); - static QList<QNetworkProxy> proxyQueryL(TUint32 aIAPId, const QNetworkProxyQuery &query); -}; - -QNetworkConfiguration SymbianProxyQuery::findCurrentConfiguration(QNetworkConfigurationManager& configurationManager) -{ - QList<QNetworkConfiguration> activeConfigurations = configurationManager.allConfigurations( - QNetworkConfiguration::Active); - QNetworkConfiguration currentConfig; - if (activeConfigurations.count() > 0) { - currentConfig = activeConfigurations.at(0); - } else { - // No active configurations, try default one - QNetworkConfiguration defaultConfiguration = configurationManager.defaultConfiguration(); - if (defaultConfiguration.isValid()) { - switch (defaultConfiguration.type()) { - case QNetworkConfiguration::InternetAccessPoint: - currentConfig = defaultConfiguration; - break; - case QNetworkConfiguration::ServiceNetwork: - { - // Note: This code assumes that the only unambigious way to - // find current proxy config is if there is only one access point - // or if the found access point is immediately usable. - QList<QNetworkConfiguration> childConfigurations = defaultConfiguration.children(); - if (childConfigurations.count() == 1) { - currentConfig = childConfigurations.at(0); - } else { - for (int index = 0; index < childConfigurations.count(); index++) { - QNetworkConfiguration childConfig = childConfigurations.at(index); - if (childConfig.isValid() && childConfig.state() == QNetworkConfiguration::Discovered) { - currentConfig = childConfig; - break; - } - } - } - } - break; - case QNetworkConfiguration::UserChoice: - // User choice is not a valid configuration for proxy discovery - break; - } - } - } - return currentConfig; -} - -SymbianIapId SymbianProxyQuery::getIapId(QNetworkConfigurationManager& configurationManager, const QNetworkProxyQuery &query) -{ - SymbianIapId iapId; - - QNetworkConfiguration currentConfig = query.networkConfiguration(); - if (!currentConfig.isValid()) { - //If config is not specified, then try to find out an active or default one - currentConfig = findCurrentConfiguration(configurationManager); - } - if (currentConfig.isValid()) { - // Note: the following code assumes that the identifier is in format - // I_xxxx where xxxx is the identifier of IAP. This is meant as a - // temporary solution until there is a support for returning - // implementation specific identifier. - const int generalPartLength = 2; - const int identifierNumberLength = currentConfig.identifier().length() - generalPartLength; - QString idString(currentConfig.identifier().right(identifierNumberLength)); - bool success; - uint id = idString.toUInt(&success); - if (success) - iapId.setIapId(id); - else - qWarning() << "Failed to convert identifier to access point identifier: " - << currentConfig.identifier(); - } - - return iapId; -} - -CCDIAPRecord *SymbianProxyQuery::getIapRecordLC(TUint32 aIAPId, CMDBSession &aDb) -{ - CCDIAPRecord *iap = static_cast<CCDIAPRecord*> (CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord)); - CleanupStack::PushL(iap); - iap->SetRecordId(aIAPId); - iap->LoadL(aDb); - return iap; -} - -CMDBRecordSet<CCDProxiesRecord> *SymbianProxyQuery::prepareQueryLC(TUint32 serviceId, TDesC& serviceType) -{ - // Create a recordset of type CCDProxiesRecord - // for priming search. - // This will ultimately contain record(s) - // matching the priming record attributes - CMDBRecordSet<CCDProxiesRecord> *proxyRecords = new (ELeave) CMDBRecordSet<CCDProxiesRecord> ( - KCDTIdProxiesRecord); - CleanupStack::PushL(proxyRecords); - - CCDProxiesRecord *primingProxyRecord = - static_cast<CCDProxiesRecord *> (CCDRecordBase::RecordFactoryL(KCDTIdProxiesRecord)); - CleanupStack::PushL(primingProxyRecord); - - primingProxyRecord->iServiceType.SetMaxLengthL(serviceType.Length()); - primingProxyRecord->iServiceType = serviceType; - primingProxyRecord->iService = serviceId; - primingProxyRecord->iUseProxyServer = ETrue; - - proxyRecords->iRecords.AppendL(primingProxyRecord); - // Ownership of primingProxyRecord is transferred to - // proxyRecords, just remove it from the CleanupStack - CleanupStack::Pop(primingProxyRecord); - return proxyRecords; -} - -QList<QNetworkProxy> SymbianProxyQuery::proxyQueryL(TUint32 aIAPId, const QNetworkProxyQuery &query) -{ - QList<QNetworkProxy> foundProxies; - if (query.queryType() != QNetworkProxyQuery::UrlRequest) { - return foundProxies; - } - - CMDBSession *iDb = CMDBSession::NewLC(KCDVersion1_1); - CCDIAPRecord *iap = getIapRecordLC(aIAPId, *iDb); - - // Read service table id and service type - // from the IAP record found - TUint32 serviceId = iap->iService; - RBuf serviceType; - serviceType.CreateL(iap->iServiceType); - CleanupStack::PopAndDestroy(iap); - CleanupClosePushL(serviceType); - - CMDBRecordSet<CCDProxiesRecord> *proxyRecords = prepareQueryLC(serviceId, serviceType); - - // Now to find a proxy table matching our criteria - if (proxyRecords->FindL(*iDb)) { - TInt count = proxyRecords->iRecords.Count(); - for(TInt index = 0; index < count; index++) { - CCDProxiesRecord *proxyRecord = static_cast<CCDProxiesRecord *> (proxyRecords->iRecords[index]); - RBuf serverName; - serverName.CreateL(proxyRecord->iServerName); - CleanupClosePushL(serverName); - if (serverName.Length() == 0) - User::Leave(KErrNotFound); - QString serverNameQt((const QChar*)serverName.Ptr(), serverName.Length()); - CleanupStack::Pop(); // serverName - TUint32 port = proxyRecord->iPortNumber; - - QNetworkProxy proxy(QNetworkProxy::HttpProxy, serverNameQt, port); - foundProxies.append(proxy); - } - } - - CleanupStack::PopAndDestroy(proxyRecords); - CleanupStack::Pop(); // serviceType - CleanupStack::PopAndDestroy(iDb); - - return foundProxies; -} - -QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query) -{ - QList<QNetworkProxy> proxies; - SymbianIapId iapId; - TInt error; - QNetworkConfigurationManager manager; - iapId = SymbianProxyQuery::getIapId(manager, query); - if (iapId.isValid()) { - TRAP(error, proxies = SymbianProxyQuery::proxyQueryL(iapId.iapId(), query)) - if (error != KErrNone) { - qWarning() << "Error while retrieving proxies: '" << error << '"'; - proxies.clear(); - } - } - proxies << QNetworkProxy::NoProxy; - - return proxies; -} - -QT_END_NAMESPACE - -#endif diff --git a/src/network/network.pro b/src/network/network.pro index cfd3f95300..671b7fde69 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -31,9 +31,3 @@ include(socket/socket.pri) include(ssl/ssl.pri) QMAKE_LIBS += $$QMAKE_LIBS_NETWORK - - -symbian { - TARGET.UID3=0x2001B2DE - LIBS += -lesock -linsock -lcertstore -lefsrv -lctframework -} diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp index 2c5b5dc032..7fc0ea3993 100644 --- a/src/network/socket/qabstractsocketengine.cpp +++ b/src/network/socket/qabstractsocketengine.cpp @@ -41,11 +41,7 @@ #include "qabstractsocketengine_p.h" -#ifdef Q_OS_SYMBIAN -#include "qsymbiansocketengine_p.h" -#else #include "qnativesocketengine_p.h" -#endif #include "qmutex.h" #include "qnetworkproxy.h" @@ -119,11 +115,7 @@ QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(QAbstractSocket return 0; #endif -#ifdef Q_OS_SYMBIAN - return new QSymbianSocketEngine(parent); -#else return new QNativeSocketEngine(parent); -#endif } QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(int socketDescripter, QObject *parent) @@ -133,11 +125,7 @@ QAbstractSocketEngine *QAbstractSocketEngine::createSocketEngine(int socketDescr if (QAbstractSocketEngine *ret = socketHandlers()->at(i)->createSocketEngine(socketDescripter, parent)) return ret; } -#ifdef Q_OS_SYMBIAN - return new QSymbianSocketEngine(parent); -#else return new QNativeSocketEngine(parent); -#endif } QAbstractSocket::SocketError QAbstractSocketEngine::error() const diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp index d4f847a445..ffd87aa946 100644 --- a/src/network/socket/qlocalserver.cpp +++ b/src/network/socket/qlocalserver.cpp @@ -275,10 +275,6 @@ QLocalSocket *QLocalServer::nextPendingConnection() return 0; QLocalSocket *nextSocket = d->pendingConnections.dequeue(); #ifndef QT_LOCALSOCKET_TCP -#ifdef Q_OS_SYMBIAN - if(!d->socketNotifier) - return nextSocket; -#endif if (d->pendingConnections.size() <= d->maxPendingConnections) #ifndef Q_OS_WIN d->socketNotifier->setEnabled(true); diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 851e898553..b3575920dc 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -111,24 +111,6 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName) ::memcpy(addr.sun_path, fullServerName.toLatin1().data(), fullServerName.toLatin1().size() + 1); -#ifdef Q_OS_SYMBIAN - // In SYMBIAN OS it can currently happen that accept is called twice, - // once from waitForNewConnection and once via QSocketNotfier activity - // - // As an workaround, we set the socket to non blocking so possible - // subsequent call to accept will not block in any case - // - // This change can be removed once more generic fix to select thread - // synchronization problem is implemented. - int flags = fcntl(listenSocket, F_GETFL, 0); - if (-1 == flags - || -1 == (fcntl(listenSocket, F_SETFL, flags | O_NONBLOCK))) { - setError(QLatin1String("QLocalServer::listen")); - closeServer(); - return false; - } -#endif - // bind if(-1 == QT_SOCKET_BIND(listenSocket, (sockaddr *)&addr, sizeof(sockaddr_un))) { setError(QLatin1String("QLocalServer::listen")); diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 7c2a8f3162..1bdf604eb1 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -242,7 +242,6 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) QLatin1String("QLocalSocket::connectToServer")); return; } -#ifndef Q_OS_SYMBIAN // set non blocking so we can try to connect and it wont wait int flags = fcntl(d->connectingSocket, F_GETFL, 0); if (-1 == flags @@ -251,7 +250,6 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) QLatin1String("QLocalSocket::connectToServer")); return; } -#endif // _q_connectToSocket does the actual connecting d->connectingName = name; @@ -538,14 +536,7 @@ bool QLocalSocket::waitForConnected(int msec) timer.start(); while (state() == ConnectingState && (-1 == msec || timer.elapsed() < msec)) { -#ifdef Q_OS_SYMBIAN - // On Symbian, ready-to-write is signaled when non-blocking socket - // connect is finised. Is ready-to-read really used on other - // UNIX paltforms when using non-blocking AF_UNIX socket? - result = ::select(d->connectingSocket + 1, 0, &fds, 0, &timeout); -#else result = ::select(d->connectingSocket + 1, &fds, 0, 0, &timeout); -#endif if (-1 == result && errno != EINTR) { d->errorOccurred( QLocalSocket::UnknownSocketError, QLatin1String("QLocalSocket::waitForConnected")); diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 514a7a0f6f..5f510fa84b 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -60,11 +60,7 @@ QT_BEGIN_NAMESPACE -#ifdef Q_OS_SYMBIAN -static const int MaxWriteBufferSize = 4*1024; -#else static const int MaxWriteBufferSize = 128*1024; -#endif //#define QSOCKS5SOCKETLAYER_DEBUG diff --git a/src/network/socket/qsymbiansocketengine.cpp b/src/network/socket/qsymbiansocketengine.cpp deleted file mode 100644 index f8831d3b45..0000000000 --- a/src/network/socket/qsymbiansocketengine.cpp +++ /dev/null @@ -1,1770 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define QNATIVESOCKETENGINE_DEBUG -#include "qsymbiansocketengine_p.h" - -#include "qiodevice.h" -#include "qhostaddress.h" -#include "qelapsedtimer.h" -#include "qvarlengtharray.h" -#include "qnetworkinterface.h" -#include <private/qnetworksession_p.h> -#include <es_sock.h> -#include <in_sock.h> -#include <net/if.h> - -#include <private/qcore_symbian_p.h> - -#if !defined(QT_NO_NETWORKPROXY) -# include "qnetworkproxy.h" -# include "qabstractsocket.h" -# include "qtcpserver.h" -#endif - -#include <QCoreApplication> - -#include <qabstracteventdispatcher.h> -#include <private/qeventdispatcher_symbian_p.h> -#include <qsocketnotifier.h> -#include <qnetworkinterface.h> - -#include <private/qthread_p.h> -#include <private/qobject_p.h> -#include <private/qsystemerror_p.h> - -#if defined QNATIVESOCKETENGINE_DEBUG -#include <qstring.h> -#include <ctype.h> -#endif - -QT_BEGIN_NAMESPACE - -#define Q_VOID -// Common constructs -#define Q_CHECK_VALID_SOCKETLAYER(function, returnValue) do { \ - if (!isValid()) { \ - qWarning(""#function" was called on an uninitialized socket device"); \ - return returnValue; \ - } } while (0) -#define Q_CHECK_INVALID_SOCKETLAYER(function, returnValue) do { \ - if (isValid()) { \ - qWarning(""#function" was called on an already initialized socket device"); \ - return returnValue; \ - } } while (0) -#define Q_CHECK_STATE(function, checkState, returnValue) do { \ - if (d->socketState != (checkState)) { \ - qWarning(""#function" was not called in "#checkState); \ - return (returnValue); \ - } } while (0) -#define Q_CHECK_NOT_STATE(function, checkState, returnValue) do { \ - if (d->socketState == (checkState)) { \ - qWarning(""#function" was called in "#checkState); \ - return (returnValue); \ - } } while (0) -#define Q_CHECK_STATES(function, state1, state2, returnValue) do { \ - if (d->socketState != (state1) && d->socketState != (state2)) { \ - qWarning(""#function" was called" \ - " not in "#state1" or "#state2); \ - return (returnValue); \ - } } while (0) -#define Q_CHECK_TYPE(function, type, returnValue) do { \ - if (d->socketType != (type)) { \ - qWarning(#function" was called by a" \ - " socket other than "#type""); \ - return (returnValue); \ - } } while (0) - -#if defined QNATIVESOCKETENGINE_DEBUG - -/* - Returns a human readable representation of the first \a len - characters in \a data. -*/ -static QByteArray qt_prettyDebug(const char *data, int len, int maxSize) -{ - if (!data) return "(null)"; - QByteArray out; - for (int i = 0; i < len; ++i) { - char c = data[i]; - if (isprint(c)) { - out += c; - } else switch (c) { - case '\n': out += "\\n"; break; - case '\r': out += "\\r"; break; - case '\t': out += "\\t"; break; - default: - QString tmp; - tmp.sprintf("\\%o", c); - out += tmp.toLatin1(); - } - } - - if (len < maxSize) - out += "..."; - - return out; -} -#endif - -void QSymbianSocketEnginePrivate::getPortAndAddress(const TInetAddr& a, quint16 *port, QHostAddress *addr) -{ - if (a.Family() == KAfInet6 && !a.IsV4Compat() && !a.IsV4Mapped()) { - Q_IPV6ADDR tmp; - memcpy(&tmp, a.Ip6Address().u.iAddr8, sizeof(tmp)); - if (addr) { - QHostAddress tmpAddress; - tmpAddress.setAddress(tmp); - *addr = tmpAddress; - TPckgBuf<TSoInetIfQuery> query; - query().iSrcAddr = a; - TInt err = nativeSocket.GetOpt(KSoInetIfQueryBySrcAddr, KSolInetIfQuery, query); - if (!err) - addr->setScopeId(qt_TDesC2QString(query().iName)); - else - addr->setScopeId(QString::number(a.Scope())); - } - if (port) - *port = a.Port(); - return; - } - if (port) - *port = a.Port(); - if (addr) { - QHostAddress tmpAddress; - tmpAddress.setAddress(a.Address()); - *addr = tmpAddress; - } -} -/*! \internal - - Creates and returns a new socket descriptor of type \a socketType - and \a socketProtocol. Returns -1 on failure. -*/ -bool QSymbianSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType socketType, - QAbstractSocket::NetworkLayerProtocol socketProtocol) -{ - Q_Q(QSymbianSocketEngine); - TUint family = KAfInet; // KAfInet6 is only used as an address family, not as a protocol family - TUint type = (socketType == QAbstractSocket::UdpSocket) ? KSockDatagram : KSockStream; - TUint protocol = (socketType == QAbstractSocket::UdpSocket) ? KProtocolInetUdp : KProtocolInetTcp; - - //Check if there is a user specified session - QVariant v(q->property("_q_networksession")); - TInt err; - if (v.isValid()) { - QSharedPointer<QNetworkSession> s = qvariant_cast<QSharedPointer<QNetworkSession> >(v); - err = QNetworkSessionPrivate::nativeOpenSocket(*s, nativeSocket, family, type, protocol); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::createNewSocket - _q_networksession was set" << err; -#endif - } else - err = nativeSocket.Open(socketServer, family, type, protocol); //TODO: FIXME - deprecated API, make sure we always have a connection instead - - if (err != KErrNone) { - switch (err) { - case KErrNotSupported: - case KErrNotFound: - setError(QAbstractSocket::UnsupportedSocketOperationError, - ProtocolUnsupportedErrorString); - break; - default: - setError(err); - break; - } - - return false; - } -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::createNewSocket - created" << nativeSocket.SubSessionHandle(); -#endif - socketDescriptor = QSymbianSocketManager::instance().addSocket(nativeSocket); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << " - allocated socket descriptor" << socketDescriptor; -#endif - return true; -} - -void QSymbianSocketEnginePrivate::setPortAndAddress(TInetAddr& nativeAddr, quint16 port, const QHostAddress &addr) -{ - nativeAddr.SetPort(port); - if (addr.protocol() == QAbstractSocket::IPv6Protocol) { - TPckgBuf<TSoInetIfQuery> query; - query().iName = qt_QString2TPtrC(addr.scopeId()); - TInt err = nativeSocket.GetOpt(KSoInetIfQueryByName, KSolInetIfQuery, query); - if (!err) - nativeAddr.SetScope(query().iIndex); - else - nativeAddr.SetScope(0); - Q_IPV6ADDR ip6 = addr.toIPv6Address(); - TIp6Addr v6addr; - memcpy(v6addr.u.iAddr8, ip6.c, 16); - nativeAddr.SetAddress(v6addr); - } else if (addr.protocol() == QAbstractSocket::IPv4Protocol) { - nativeAddr.SetAddress(addr.toIPv4Address()); - } else { - qWarning("unsupported network protocol (%d)", addr.protocol()); - } -} - -QSymbianSocketEnginePrivate::QSymbianSocketEnginePrivate() : - socketDescriptor(-1), - socketServer(QSymbianSocketManager::instance().getSocketServer()), - readNotificationsEnabled(false), - writeNotificationsEnabled(false), - exceptNotificationsEnabled(false), - asyncSelect(0), - hasReceivedBufferedDatagram(false) -{ -} - -QSymbianSocketEnginePrivate::~QSymbianSocketEnginePrivate() -{ -} - - -QSymbianSocketEngine::QSymbianSocketEngine(QObject *parent) - : QAbstractSocketEngine(*new QSymbianSocketEnginePrivate(), parent) -{ -} - - -QSymbianSocketEngine::~QSymbianSocketEngine() -{ - close(); -} - -/*! - Initializes a QSymbianSocketEngine by creating a new socket of type \a - socketType and network layer protocol \a protocol. Returns true on - success; otherwise returns false. - - If the socket was already initialized, this function closes the - socket before reeinitializing it. - - The new socket is non-blocking, and for UDP sockets it's also - broadcast enabled. -*/ -bool QSymbianSocketEngine::initialize(QAbstractSocket::SocketType socketType, QAbstractSocket::NetworkLayerProtocol protocol) -{ - Q_D(QSymbianSocketEngine); - if (isValid()) - close(); - - // Create the socket - if (!d->createNewSocket(socketType, protocol)) { -#if defined (QNATIVESOCKETENGINE_DEBUG) - QString typeStr = QLatin1String("UnknownSocketType"); - if (socketType == QAbstractSocket::TcpSocket) typeStr = QLatin1String("TcpSocket"); - else if (socketType == QAbstractSocket::UdpSocket) typeStr = QLatin1String("UdpSocket"); - QString protocolStr = QLatin1String("UnknownProtocol"); - if (protocol == QAbstractSocket::IPv4Protocol) protocolStr = QLatin1String("IPv4Protocol"); - else if (protocol == QAbstractSocket::IPv6Protocol) protocolStr = QLatin1String("IPv6Protocol"); - qDebug("QSymbianSocketEngine::initialize(type == %s, protocol == %s) failed: %s", - typeStr.toLatin1().constData(), protocolStr.toLatin1().constData(), d->socketErrorString.toLatin1().constData()); -#endif - return false; - } - - // Make the socket nonblocking. - if (!setOption(NonBlockingSocketOption, 1)) { - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - d->NonBlockingInitFailedErrorString); - close(); - return false; - } - - // Set the broadcasting flag if it's a UDP socket. - if (socketType == QAbstractSocket::UdpSocket - && !setOption(BroadcastSocketOption, 1)) { - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - d->BroadcastingInitFailedErrorString); - close(); - return false; - } - - - // Make sure we receive out-of-band data - if (socketType == QAbstractSocket::TcpSocket - && !setOption(ReceiveOutOfBandData, 1)) { - qWarning("QSymbianSocketEngine::initialize unable to inline out-of-band data"); - } - - - d->socketType = socketType; - d->socketProtocol = protocol; - return true; -} - -/*! \overload - - Initializes the socket using \a socketDescriptor instead of - creating a new one. The socket type and network layer protocol are - determined automatically. The socket's state is set to \a - socketState. - - If the socket type is either TCP or UDP, it is made non-blocking. - UDP sockets are also broadcast enabled. - */ -bool QSymbianSocketEngine::initialize(int socketDescriptor, QAbstractSocket::SocketState socketState) -{ - Q_D(QSymbianSocketEngine); - - if (isValid()) - close(); - - if (!QSymbianSocketManager::instance().lookupSocket(socketDescriptor, d->nativeSocket)) { - qWarning("QSymbianSocketEngine::initialize - socket descriptor not found"); - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - QSymbianSocketEnginePrivate::InvalidSocketErrorString); - return false; - } -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::initialize - attached to" << d->nativeSocket.SubSessionHandle() << socketDescriptor; -#endif - Q_ASSERT(d->socketDescriptor == socketDescriptor || d->socketDescriptor == -1); - d->socketDescriptor = socketDescriptor; - - // determine socket type and protocol - if (!d->fetchConnectionParameters()) { -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::initialize(socketDescriptor == %i) failed: %s", - socketDescriptor, d->socketErrorString.toLatin1().constData()); -#endif - d->socketDescriptor = -1; - return false; - } - - if (d->socketType != QAbstractSocket::UnknownSocketType) { - // Make the socket nonblocking. - if (!setOption(NonBlockingSocketOption, 1)) { - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - d->NonBlockingInitFailedErrorString); - close(); - return false; - } - - // Set the broadcasting flag if it's a UDP socket. - if (d->socketType == QAbstractSocket::UdpSocket - && !setOption(BroadcastSocketOption, 1)) { - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - d->BroadcastingInitFailedErrorString); - close(); - return false; - } - - // Make sure we receive out-of-band data - if (d->socketType == QAbstractSocket::TcpSocket - && !setOption(ReceiveOutOfBandData, 1)) { - qWarning("QSymbianSocketEngine::initialize unable to inline out-of-band data"); - } - } - - d->socketState = socketState; - return true; -} - -/*! - Returns true if the socket is valid; otherwise returns false. A - socket is valid if it has not been successfully initialized, or if - it has been closed. -*/ -bool QSymbianSocketEngine::isValid() const -{ - Q_D(const QSymbianSocketEngine); - return d->socketDescriptor != -1; -} - - -/*! - Returns the native socket descriptor. Any use of this descriptor - stands the risk of being non-portable. -*/ -int QSymbianSocketEngine::socketDescriptor() const -{ - Q_D(const QSymbianSocketEngine); - return d->socketDescriptor; -} - -/* - Sets the socket option \a opt to \a v. -*/ -bool QSymbianSocketEngine::setOption(QAbstractSocketEngine::SocketOption opt, int v) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::setOption(), false); - - TUint n = 0; - TUint level = KSOLSocket; // default - - if (!QSymbianSocketEnginePrivate::translateSocketOption(opt, n, level)) - return false; - - if (!level && !n) - return true; - - return (KErrNone == d->nativeSocket.SetOpt(n, level, v)); -} - -/* - Returns the value of the socket option \a opt. -*/ -int QSymbianSocketEngine::option(QAbstractSocketEngine::SocketOption opt) const -{ - Q_D(const QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::option(), -1); - - TUint n; - TUint level = KSOLSocket; // default - - if (!QSymbianSocketEnginePrivate::translateSocketOption(opt, n, level)) - return false; - - if (!level && !n) - return 1; - - int v = -1; - //GetOpt() is non const - TInt err = d->nativeSocket.GetOpt(n, level, v); - if (!err) - return v; - - return -1; -} - -bool QSymbianSocketEnginePrivate::translateSocketOption(QAbstractSocketEngine::SocketOption opt, TUint &n, TUint &level) -{ - - switch (opt) { - case QAbstractSocketEngine::ReceiveBufferSocketOption: - n = KSORecvBuf; - break; - case QAbstractSocketEngine::SendBufferSocketOption: - n = KSOSendBuf; - break; - case QAbstractSocketEngine::NonBlockingSocketOption: - n = KSONonBlockingIO; - break; - case QAbstractSocketEngine::AddressReusable: - level = KSolInetIp; - n = KSoReuseAddr; - break; - case QAbstractSocketEngine::BroadcastSocketOption: - case QAbstractSocketEngine::BindExclusively: - level = 0; - n = 0; - return true; - case QAbstractSocketEngine::ReceiveOutOfBandData: - level = KSolInetTcp; - n = KSoTcpOobInline; - break; - case QAbstractSocketEngine::LowDelayOption: - level = KSolInetTcp; - n = KSoTcpNoDelay; - break; - case QAbstractSocketEngine::KeepAliveOption: - level = KSolInetTcp; - n = KSoTcpKeepAlive; - break; - case QAbstractSocketEngine::MulticastLoopbackOption: - level = KSolInetIp; - n = KSoIp6MulticastLoop; - break; - case QAbstractSocketEngine::MulticastTtlOption: - level = KSolInetIp; - n = KSoIp6MulticastHops; - break; - default: - return false; - } - return true; -} - -qint64 QSymbianSocketEngine::receiveBufferSize() const -{ - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::receiveBufferSize(), -1); - return option(ReceiveBufferSocketOption); -} - -void QSymbianSocketEngine::setReceiveBufferSize(qint64 size) -{ - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::setReceiveBufferSize(), Q_VOID); - setOption(ReceiveBufferSocketOption, size); -} - -qint64 QSymbianSocketEngine::sendBufferSize() const -{ - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::setSendBufferSize(), -1); - return option(SendBufferSocketOption); -} - -void QSymbianSocketEngine::setSendBufferSize(qint64 size) -{ - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::setSendBufferSize(), Q_VOID); - setOption(SendBufferSocketOption, size); -} - -/*! - Connects to the remote host name given by \a name on port \a - port. When this function is called, the upper-level will not - perform a hostname lookup. - - The native socket engine does not support this operation, - but some other socket engines (notably proxy-based ones) do. -*/ -bool QSymbianSocketEngine::connectToHostByName(const QString &name, quint16 port) -{ - Q_UNUSED(name); - Q_UNUSED(port); - Q_D(QSymbianSocketEngine); - d->setError(QAbstractSocket::UnsupportedSocketOperationError, - QSymbianSocketEnginePrivate::OperationUnsupportedErrorString); - return false; -} - -/*! - If there's a connection activity on the socket, process it. Then - notify our parent if there really was activity. -*/ -void QSymbianSocketEngine::connectionNotification() -{ - // FIXME check if we really need to do it like that in Symbian - Q_D(QSymbianSocketEngine); - Q_ASSERT(state() == QAbstractSocket::ConnectingState); - - connectToHost(d->peerAddress, d->peerPort); - if (state() != QAbstractSocket::ConnectingState) { - // we changed states - QAbstractSocketEngine::connectionNotification(); - } -} - - -bool QSymbianSocketEngine::connectToHost(const QHostAddress &addr, quint16 port) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::connectToHost(), false); - -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug("QSymbianSocketEngine::connectToHost() : %d ", d->socketDescriptor); -#endif - - if (!d->checkProxy(addr)) - return false; - - d->peerAddress = addr; - d->peerPort = port; - - TInetAddr nativeAddr; - d->setPortAndAddress(nativeAddr, port, addr); - TRequestStatus status; - d->nativeSocket.Connect(nativeAddr, status); - User::WaitForRequest(status); - TInt err = status.Int(); - //For non blocking connect, KErrAlreadyExists is returned from the second Connect() to indicate - //the connection is up. So treat this the same as KErrNone which would be returned from the first - //call if it wouldn't block. (e.g. winsock wrapper in the emulator ignores the nonblocking flag) - if (err && err != KErrAlreadyExists) { - switch (err) { - case KErrWouldBlock: - d->socketState = QAbstractSocket::ConnectingState; - break; - default: - d->setError(err); - d->socketState = QAbstractSocket::UnconnectedState; - break; - } - - if (d->socketState != QAbstractSocket::ConnectedState) { -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::connectToHost(%s, %i) == false (%s)", - addr.toString().toLatin1().constData(), port, - d->socketState == QAbstractSocket::ConnectingState - ? "Connection in progress" : d->socketErrorString.toLatin1().constData()); -#endif - return false; - } - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::Connect(%s, %i) == true", - addr.toString().toLatin1().constData(), port); -#endif - - d->socketState = QAbstractSocket::ConnectedState; - d->fetchConnectionParameters(); - return true; -} - -bool QSymbianSocketEngine::bind(const QHostAddress &address, quint16 port) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::bind(), false); - - if (!d->checkProxy(address)) - return false; - - Q_CHECK_STATE(QSymbianSocketEngine::bind(), QAbstractSocket::UnconnectedState, false); - - TInetAddr nativeAddr; - if (address == QHostAddress::Any || address == QHostAddress::AnyIPv6) { - //Should allow both IPv4 and IPv6 - //Listening on "0.0.0.0" accepts ONLY ipv4 connections - //Listening on "::" accepts ONLY ipv6 connections - nativeAddr.SetFamily(KAFUnspec); - nativeAddr.SetPort(port); - } else { - d->setPortAndAddress(nativeAddr, port, address); - } - - TInt err = d->nativeSocket.Bind(nativeAddr); -#ifdef __WINS__ - if (err == KErrArgument) // winsock prt returns wrong error code - err = KErrInUse; -#endif - - if (err) { - switch (err) { - case KErrNotFound: - // the specified interface was not found - use the error code expected - d->setError(QAbstractSocket::SocketAddressNotAvailableError, QSymbianSocketEnginePrivate::AddressNotAvailableErrorString); - break; - default: - d->setError(err); - break; - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::bind(%s, %i) == false (%s)", - address.toString().toLatin1().constData(), port, d->socketErrorString.toLatin1().constData()); -#endif - - return false; - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::bind(%s, %i) == true", - address.toString().toLatin1().constData(), port); -#endif - d->socketState = QAbstractSocket::BoundState; - - d->fetchConnectionParameters(); - - // When we bind to unspecified address (to get a dual mode socket), report back the - // same type of address that was requested. This is required for SOCKS proxy to work. - if (nativeAddr.Family() == KAFUnspec) - d->localAddress = address; - return true; -} - -bool QSymbianSocketEngine::listen() -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::listen(), false); - Q_CHECK_STATE(QSymbianSocketEngine::listen(), QAbstractSocket::BoundState, false); - Q_CHECK_TYPE(QSymbianSocketEngine::listen(), QAbstractSocket::TcpSocket, false); - TInt err = d->nativeSocket.Listen(50); - if (err) { - d->setError(err); - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::listen() == false (%s)", - d->socketErrorString.toLatin1().constData()); -#endif - return false; - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::listen() == true"); -#endif - - d->socketState = QAbstractSocket::ListeningState; - return true; -} - -int QSymbianSocketEngine::accept() -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::accept(), -1); - Q_CHECK_STATE(QSymbianSocketEngine::accept(), QAbstractSocket::ListeningState, false); - Q_CHECK_TYPE(QSymbianSocketEngine::accept(), QAbstractSocket::TcpSocket, false); - RSocket blankSocket; - blankSocket.Open(d->socketServer); - TRequestStatus status; - d->nativeSocket.Accept(blankSocket, status); - User::WaitForRequest(status); - if (status.Int()) { - blankSocket.Close(); - if (status != KErrWouldBlock) - qWarning("QSymbianSocketEngine::accept() - error %d", status.Int()); - return -1; - } - -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::accept - created" << blankSocket.SubSessionHandle(); -#endif - int fd = QSymbianSocketManager::instance().addSocket(blankSocket); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << " - allocated socket descriptor" << fd; -#endif - return fd; -} - -qint64 QSymbianSocketEngine::bytesAvailable() const -{ - Q_D(const QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::bytesAvailable(), -1); - Q_CHECK_NOT_STATE(QSymbianSocketEngine::bytesAvailable(), QAbstractSocket::UnconnectedState, false); - int nbytes = 0; - qint64 available = 0; - TInt err = d->nativeSocket.GetOpt(KSOReadBytesPending, KSOLSocket, nbytes); - if (err) - return 0; - available = (qint64) nbytes; - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::bytesAvailable() == %lli", available); -#endif - return available; -} - -bool QSymbianSocketEngine::hasPendingDatagrams() const -{ - Q_D(const QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::hasPendingDatagrams(), false); - Q_CHECK_NOT_STATE(QSymbianSocketEngine::hasPendingDatagrams(), QAbstractSocket::UnconnectedState, false); - Q_CHECK_TYPE(QSymbianSocketEngine::hasPendingDatagrams(), QAbstractSocket::UdpSocket, false); - int nbytes; - TInt err = d->nativeSocket.GetOpt(KSOReadBytesPending,KSOLSocket, nbytes); - return err == KErrNone && nbytes > 0; -} - -qint64 QSymbianSocketEngine::pendingDatagramSize() const -{ - Q_D(const QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::pendingDatagramSize(), false); - Q_CHECK_TYPE(QSymbianSocketEngine::hasPendingDatagrams(), QAbstractSocket::UdpSocket, false); - //can only buffer one datagram at a time - if (d->hasReceivedBufferedDatagram) - return d->receivedDataBuffer.size(); - int nbytes = 0; - TInt err = d->nativeSocket.GetOpt(KSOReadBytesPending,KSOLSocket, nbytes); - if (nbytes > 0) { - //nbytes includes IP header, which is of variable length (IPv4 with or without options, IPv6...) - //therefore read the datagram into a buffer to find its true size - d->receivedDataBuffer.resize(nbytes); - TPtr8 buffer((TUint8*)d->receivedDataBuffer.data(), nbytes); - //nbytes = size including IP header, buffer is a pointer descriptor backed by the receivedDataBuffer - TInetAddr addr; - TRequestStatus status; - //RecvFrom copies only the payload (we don't want the header so don't specify the option to retrieve it) - d->nativeSocket.RecvFrom(buffer, addr, 0, status); - User::WaitForRequest(status); - if (status != KErrNone) { - d->receivedDataBuffer.clear(); - return 0; - } - nbytes = buffer.Length(); - //nbytes = size of payload, resize the receivedDataBuffer to the final size - d->receivedDataBuffer.resize(nbytes); - d->hasReceivedBufferedDatagram = true; - //now receivedDataBuffer contains one datagram, which has been removed from the socket's internal buffer -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "QSymbianSocketEngine::pendingDatagramSize buffering" << nbytes << "bytes"; -#endif - } - return qint64(nbytes); -} - - -qint64 QSymbianSocketEngine::readDatagram(char *data, qint64 maxSize, - QHostAddress *address, quint16 *port) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::readDatagram(), -1); - Q_CHECK_TYPE(QSymbianSocketEngine::readDatagram(), QAbstractSocket::UdpSocket, false); - - // if a datagram was buffered in pendingDatagramSize(), return it now - if (d->hasReceivedBufferedDatagram) { - qint64 size = qMin(maxSize, (qint64)d->receivedDataBuffer.size()); - memcpy(data, d->receivedDataBuffer.constData(), size); - d->receivedDataBuffer.clear(); - d->hasReceivedBufferedDatagram = false; -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "QSymbianSocketEngine::readDatagram returning" << size << "bytes from buffer"; -#endif - return size; - } - - TPtr8 buffer((TUint8*)data, (int)maxSize); - TInetAddr addr; - TRequestStatus status; - d->nativeSocket.RecvFrom(buffer, addr, 0, status); - User::WaitForRequest(status); //Non blocking receive - - if (status.Int()) { - d->setError(QAbstractSocket::NetworkError, d->ReceiveDatagramErrorString); - } else if (port || address) { - d->getPortAndAddress(addr, port, address); - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - int len = buffer.Length(); - qDebug("QSymbianSocketEngine::receiveDatagram(%p \"%s\", %lli, %s, %i) == %lli", - data, qt_prettyDebug(data, qMin(len, ssize_t(16)), len).data(), maxSize, - address ? address->toString().toLatin1().constData() : "(nil)", - port ? *port : 0, (qint64) len); -#endif - - if (status.Int()) - return -1; - return qint64(buffer.Length()); -} - - -qint64 QSymbianSocketEngine::writeDatagram(const char *data, qint64 len, - const QHostAddress &host, quint16 port) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::writeDatagram(), -1); - Q_CHECK_TYPE(QSymbianSocketEngine::writeDatagram(), QAbstractSocket::UdpSocket, -1); - TPtrC8 buffer((TUint8*)data, (int)len); - TInetAddr addr; - d->setPortAndAddress(addr, port, host); - TSockXfrLength sentBytes; - TRequestStatus status; - d->nativeSocket.SendTo(buffer, addr, 0, status, sentBytes); - User::WaitForRequest(status); //Non blocking send - TInt err = status.Int(); - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::writeDatagram(%p \"%s\", %lli, \"%s\", %i) == %lli (err=%d)", data, - qt_prettyDebug(data, qMin<int>(len, 16), len).data(), len, host.toString().toLatin1().constData(), - port, (qint64) sentBytes(), err); -#endif - - if (err) { - switch (err) { - case KErrWouldBlock: - // do not error the socket. (otherwise socket layer is reset) - // On symbian^1 and earlier, KErrWouldBlock is returned when interface is not up yet - // On symbian^3, KErrNone is returned but sentBytes = 0 - return 0; - case KErrTooBig: - d->setError(QAbstractSocket::DatagramTooLargeError, d->DatagramTooLargeErrorString); - break; - default: - d->setError(QAbstractSocket::NetworkError, d->SendDatagramErrorString); - } - return -1; - } - - if (QSysInfo::s60Version() <= QSysInfo::SV_S60_5_0) { - // This is evil hack, but for some reason native RSocket::SendTo returns 0, - // for large datagrams (such as 600 bytes). Based on comments from Open C team - // this should happen only in platforms <= S60 5.0. - return len; - } - return sentBytes(); -} - -// FIXME check where the native socket engine called that.. -bool QSymbianSocketEnginePrivate::fetchConnectionParameters() -{ - localPort = 0; - localAddress.clear(); - peerPort = 0; - peerAddress.clear(); - - if (socketDescriptor == -1) - return false; - - if (!nativeSocket.SubSessionHandle()) { - if (!QSymbianSocketManager::instance().lookupSocket(socketDescriptor, nativeSocket)) { - setError(QAbstractSocket::UnsupportedSocketOperationError, InvalidSocketErrorString); - return false; - } - } - - // Determine local address - TSockAddr addr; - nativeSocket.LocalName(addr); - getPortAndAddress(addr, &localPort, &localAddress); - - // Determine protocol family - socketProtocol = localAddress.protocol(); - - // Determine the remote address - nativeSocket.RemoteName(addr); - getPortAndAddress(addr, &peerPort, &peerAddress); - - // Determine the socket type (UDP/TCP) - TProtocolDesc protocol; - TInt err = nativeSocket.Info(protocol); - if (err) { - setError(err); - return false; - } else { - switch (protocol.iProtocol) { - case KProtocolInetTcp: - socketType = QAbstractSocket::TcpSocket; - break; - case KProtocolInetUdp: - socketType = QAbstractSocket::UdpSocket; - break; - default: - socketType = QAbstractSocket::UnknownSocketType; - break; - } - } -#if defined (QNATIVESOCKETENGINE_DEBUG) - QString socketProtocolStr = QLatin1String("UnknownProtocol"); - if (socketProtocol == QAbstractSocket::IPv4Protocol) socketProtocolStr = QLatin1String("IPv4Protocol"); - else if (socketProtocol == QAbstractSocket::IPv6Protocol) socketProtocolStr = QLatin1String("IPv6Protocol"); - - QString socketTypeStr = QLatin1String("UnknownSocketType"); - if (socketType == QAbstractSocket::TcpSocket) socketTypeStr = QLatin1String("TcpSocket"); - else if (socketType == QAbstractSocket::UdpSocket) socketTypeStr = QLatin1String("UdpSocket"); - - qDebug("QSymbianSocketEnginePrivate::fetchConnectionParameters() local == %s:%i," - " peer == %s:%i, socket == %s - %s", - localAddress.toString().toLatin1().constData(), localPort, - peerAddress.toString().toLatin1().constData(), peerPort,socketTypeStr.toLatin1().constData(), - socketProtocolStr.toLatin1().constData()); -#endif - return true; -} - -void QSymbianSocketEngine::close() -{ - if (!isValid()) - return; - Q_D(QSymbianSocketEngine); -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::close()"); -#endif - - d->readNotificationsEnabled = false; - d->writeNotificationsEnabled = false; - d->exceptNotificationsEnabled = false; - if (d->asyncSelect) { - d->asyncSelect->deleteLater(); - d->asyncSelect = 0; - } - - //TODO: call nativeSocket.Shutdown(EImmediate) in some cases? - if (d->socketType == QAbstractSocket::UdpSocket) { - //TODO: Close hangs without this, but only for UDP - why? - TRequestStatus stat; - d->nativeSocket.Shutdown(RSocket::EImmediate, stat); - User::WaitForRequest(stat); - } -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::close - closing socket" << d->nativeSocket.SubSessionHandle() << d->socketDescriptor; -#endif - //remove must come before close to avoid a race where another thread gets the old subsession handle - //reused & asserts when calling QSymbianSocketManager::instance->addSocket - QSymbianSocketManager::instance().removeSocket(d->nativeSocket); - d->nativeSocket.Close(); - d->socketDescriptor = -1; - - d->socketState = QAbstractSocket::UnconnectedState; - d->hasSetSocketError = false; - d->localPort = 0; - d->localAddress.clear(); - d->peerPort = 0; - d->peerAddress.clear(); - - d->hasReceivedBufferedDatagram = false; - d->receivedDataBuffer.clear(); -} - -qint64 QSymbianSocketEngine::write(const char *data, qint64 len) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::write(), -1); - Q_CHECK_STATE(QSymbianSocketEngine::write(), QAbstractSocket::ConnectedState, -1); - TPtrC8 buffer((TUint8*)data, (int)len); - TSockXfrLength sentBytes = 0; - TRequestStatus status; - d->nativeSocket.Send(buffer, 0, status, sentBytes); - User::WaitForRequest(status); //TODO: on emulator this blocks for write >16kB (non blocking IO not implemented properly?) - TInt err = status.Int(); - - if (err) { - switch (err) { - case KErrDisconnected: - case KErrEof: - sentBytes = -1; - d->setError(QAbstractSocket::RemoteHostClosedError, d->RemoteHostClosedErrorString); - close(); - break; - case KErrTooBig: - d->setError(QAbstractSocket::DatagramTooLargeError, d->DatagramTooLargeErrorString); - break; - case KErrWouldBlock: - break; - default: - sentBytes = -1; - d->setError(err); - close(); - break; - } - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::write(%p \"%s\", %llu) == %i", - data, qt_prettyDebug(data, qMin((int) len, 16), - (int) len).data(), len, (int) sentBytes()); -#endif - - return qint64(sentBytes()); -} -/* -*/ -qint64 QSymbianSocketEngine::read(char *data, qint64 maxSize) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::read(), -1); - Q_CHECK_STATES(QSymbianSocketEngine::read(), QAbstractSocket::ConnectedState, QAbstractSocket::BoundState, -1); - - // if a datagram was buffered in pendingDatagramSize(), return it now - if (d->hasReceivedBufferedDatagram) { - qint64 size = qMin(maxSize, (qint64)d->receivedDataBuffer.size()); - memcpy(data, d->receivedDataBuffer.constData(), size); - d->receivedDataBuffer.clear(); - d->hasReceivedBufferedDatagram = false; -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "QSymbianSocketEngine::read returning" << size << "bytes from buffer"; -#endif - return size; - } - - TPtr8 buffer((TUint8*)data, (int)maxSize); - TSockXfrLength received = 0; - TRequestStatus status; - TSockAddr dummy; - if (d->socketType == QAbstractSocket::UdpSocket) { - //RecvOneOrMore() can only be used with stream-interfaced connected sockets; datagram interface sockets will return KErrNotSupported. - d->nativeSocket.RecvFrom(buffer, dummy, 0, status); - } else { - d->nativeSocket.RecvOneOrMore(buffer, 0, status, received); - } - User::WaitForRequest(status); //Non blocking receive - TInt err = status.Int(); - int r = buffer.Length(); - - if (err == KErrWouldBlock) { - // No data was available for reading - r = -2; - } else if (err != KErrNone) { - d->setError(err); - close(); - r = -1; - } - -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug("QSymbianSocketEngine::read(%p \"%s\", %llu) == %i (err = %d)", - data, qt_prettyDebug(data, qMin(r, ssize_t(16)), r).data(), - maxSize, r, err); -#endif - - return qint64(r); -} - -int QSymbianSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const -{ - bool readyRead = false; - bool readyWrite = false; - if (selectForRead) - return nativeSelect(timeout, true, false, &readyRead, &readyWrite); - else - return nativeSelect(timeout, false, true, &readyRead, &readyWrite); -} - -/*! - \internal - \param timeout timeout in milliseconds - \param checkRead caller is interested if the socket is ready to read - \param checkWrite caller is interested if the socket is ready for write - \param selectForRead (out) should set to true if ready to read - \param selectForWrite (out) should set to true if ready to write - \return 0 on timeout, >0 on success, <0 on error - */ -int QSymbianSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool checkWrite, - bool *selectForRead, bool *selectForWrite) const -{ - //cancel asynchronous notifier (only one IOCTL allowed at a time) - if (asyncSelect) - asyncSelect->Cancel(); - - TPckgBuf<TUint> selectFlags; - selectFlags() = KSockSelectExcept; - if (checkRead) - selectFlags() |= KSockSelectRead; - if (checkWrite) - selectFlags() |= KSockSelectWrite; - TInt err; - if (timeout == 0) { - //if timeout is zero, poll - err = nativeSocket.GetOpt(KSOSelectPoll, KSOLSocket, selectFlags); - } else { - TRequestStatus selectStat; - nativeSocket.Ioctl(KIOctlSelect, selectStat, &selectFlags, KSOLSocket); - - if (timeout < 0) - User::WaitForRequest(selectStat); //negative means no timeout - else { - if (!selectTimer.Handle()) - qt_symbian_throwIfError(selectTimer.CreateLocal()); - TRequestStatus timerStat; - selectTimer.HighRes(timerStat, timeout * 1000); - User::WaitForRequest(timerStat, selectStat); - if (selectStat == KRequestPending) { - nativeSocket.CancelIoctl(); - //CancelIoctl completes the request (most likely with KErrCancel) - //We need to wait for this to keep the thread semaphore balanced (or active scheduler will panic) - User::WaitForRequest(selectStat); - //restart asynchronous notifier (only one IOCTL allowed at a time) - if (asyncSelect) - asyncSelect->IssueRequest(); - #ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::nativeSelect: select timeout"; - #endif - return 0; //timeout - } else { - selectTimer.Cancel(); - User::WaitForRequest(timerStat); - } - } - - #ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::nativeSelect: select status" << selectStat.Int() << (int)selectFlags(); - #endif - err = selectStat.Int(); - } - - if (!err && (selectFlags() & KSockSelectExcept)) { - nativeSocket.GetOpt(KSOSelectLastError, KSOLSocket, err); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEnginePrivate::nativeSelect: select last error" << err; -#endif - } - if (err) { - //TODO: avoidable cast? - //set the error here, because read won't always return the same error again as select. - const_cast<QSymbianSocketEnginePrivate*>(this)->setError(err); - //restart asynchronous notifier (only one IOCTL allowed at a time) - if (asyncSelect) - asyncSelect->IssueRequest(); //TODO: in error case should we restart or not? - return err; - } - if (checkRead && (selectFlags() & KSockSelectRead)) { - Q_ASSERT(selectForRead); - *selectForRead = true; - } - if (checkWrite && (selectFlags() & KSockSelectWrite)) { - Q_ASSERT(selectForWrite); - *selectForWrite = true; - } - //restart asynchronous notifier (only one IOCTL allowed at a time) - if (asyncSelect) - asyncSelect->IssueRequest(); - return 1; -} - -bool QSymbianSocketEngine::joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::joinMulticastGroup(), false); - Q_CHECK_STATE(QSymbianSocketEngine::joinMulticastGroup(), QAbstractSocket::BoundState, false); - Q_CHECK_TYPE(QSymbianSocketEngine::joinMulticastGroup(), QAbstractSocket::UdpSocket, false); - return d->multicastGroupMembershipHelper(groupAddress, iface, KSoIp6JoinGroup); -} - -bool QSymbianSocketEngine::leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::leaveMulticastGroup(), false); - Q_CHECK_STATE(QSymbianSocketEngine::leaveMulticastGroup(), QAbstractSocket::BoundState, false); - Q_CHECK_TYPE(QSymbianSocketEngine::leaveMulticastGroup(), QAbstractSocket::UdpSocket, false); - return d->multicastGroupMembershipHelper(groupAddress, iface, KSoIp6LeaveGroup); -} - -bool QSymbianSocketEnginePrivate::multicastGroupMembershipHelper(const QHostAddress &groupAddress, - const QNetworkInterface &iface, - TUint operation) -{ -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "QSymbianSocketEnginePrivate::multicastGroupMembershipHelper" << groupAddress << iface << operation; -#endif - //translate address - TPckgBuf<TIp6Mreq> option; - if (groupAddress.protocol() == QAbstractSocket::IPv6Protocol) { - Q_IPV6ADDR ip6 = groupAddress.toIPv6Address(); - memcpy(option().iAddr.u.iAddr8, ip6.c, 16); - } else { - TInetAddr wrapped; - wrapped.SetAddress(groupAddress.toIPv4Address()); - wrapped.ConvertToV4Mapped(); - option().iAddr = wrapped.Ip6Address(); - } - option().iInterface = iface.index(); - //join or leave group - TInt err = nativeSocket.SetOpt(operation, KSolInetIp, option); -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "address" << qt_prettyDebug((const char *)(option().iAddr.u.iAddr8), 16, 16); - qDebug() << "interface" << option().iInterface; - qDebug() << "error" << err; -#endif - if (err) { - setError(err); - } - return (KErrNone == err); -} - -QNetworkInterface QSymbianSocketEngine::multicastInterface() const -{ - //TODO - const Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::multicastInterface(), QNetworkInterface()); - Q_CHECK_TYPE(QSymbianSocketEngine::multicastInterface(), QAbstractSocket::UdpSocket, QNetworkInterface()); - return QNetworkInterface(); -} - -bool QSymbianSocketEngine::setMulticastInterface(const QNetworkInterface &iface) -{ - //TODO - this is possibly a unix'ism as the RConnection on which the socket was created is probably controlling this - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::setMulticastInterface(), false); - Q_CHECK_TYPE(QSymbianSocketEngine::setMulticastInterface(), QAbstractSocket::UdpSocket, false); - return false; -} - -bool QSymbianSocketEnginePrivate::checkProxy(const QHostAddress &address) -{ - if (address.isLoopback()) - return true; - -#if !defined(QT_NO_NETWORKPROXY) - QObject *parent = q_func()->parent(); - QNetworkProxy proxy; - if (QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(parent)) { - proxy = socket->proxy(); - } else if (QTcpServer *server = qobject_cast<QTcpServer *>(parent)) { - proxy = server->proxy(); - } else { - // no parent -> no proxy - return true; - } - - if (proxy.type() == QNetworkProxy::DefaultProxy) - proxy = QNetworkProxy::applicationProxy(); - - if (proxy.type() != QNetworkProxy::DefaultProxy && - proxy.type() != QNetworkProxy::NoProxy) { - // QSymbianSocketEngine doesn't do proxies - setError(QAbstractSocket::UnsupportedSocketOperationError, - InvalidProxyTypeString); - return false; - } -#endif - - return true; -} - -// FIXME this is also in QNativeSocketEngine, unify it -/*! \internal - - Sets the error and error string if not set already. The only - interesting error is the first one that occurred, and not the last - one. -*/ -void QSymbianSocketEnginePrivate::setError(QAbstractSocket::SocketError error, ErrorString errorString) const -{ - if (hasSetSocketError) { - // Only set socket errors once for one engine; expect the - // socket to recreate its engine after an error. Note: There's - // one exception: SocketError(11) bypasses this as it's purely - // a temporary internal error condition. - // Another exception is the way the waitFor*() functions set - // an error when a timeout occurs. After the call to setError() - // they reset the hasSetSocketError to false - return; - } - if (error != QAbstractSocket::SocketError(11)) - hasSetSocketError = true; - - socketError = error; - - switch (errorString) { - case NonBlockingInitFailedErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unable to initialize non-blocking socket"); - break; - case BroadcastingInitFailedErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unable to initialize broadcast socket"); - break; - case NoIpV6ErrorString: - socketErrorString = QSymbianSocketEngine::tr("Attempt to use IPv6 socket on a platform with no IPv6 support"); - break; - case RemoteHostClosedErrorString: - socketErrorString = QSymbianSocketEngine::tr("The remote host closed the connection"); - break; - case TimeOutErrorString: - socketErrorString = QSymbianSocketEngine::tr("Network operation timed out"); - break; - case ResourceErrorString: - socketErrorString = QSymbianSocketEngine::tr("Out of resources"); - break; - case OperationUnsupportedErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unsupported socket operation"); - break; - case ProtocolUnsupportedErrorString: - socketErrorString = QSymbianSocketEngine::tr("Protocol type not supported"); - break; - case InvalidSocketErrorString: - socketErrorString = QSymbianSocketEngine::tr("Invalid socket descriptor"); - break; - case HostUnreachableErrorString: - socketErrorString = QSymbianSocketEngine::tr("Host unreachable"); - break; - case NetworkUnreachableErrorString: - socketErrorString = QSymbianSocketEngine::tr("Network unreachable"); - break; - case AccessErrorString: - socketErrorString = QSymbianSocketEngine::tr("Permission denied"); - break; - case ConnectionTimeOutErrorString: - socketErrorString = QSymbianSocketEngine::tr("Connection timed out"); - break; - case ConnectionRefusedErrorString: - socketErrorString = QSymbianSocketEngine::tr("Connection refused"); - break; - case AddressInuseErrorString: - socketErrorString = QSymbianSocketEngine::tr("The bound address is already in use"); - break; - case AddressNotAvailableErrorString: - socketErrorString = QSymbianSocketEngine::tr("The address is not available"); - break; - case AddressProtectedErrorString: - socketErrorString = QSymbianSocketEngine::tr("The address is protected"); - break; - case DatagramTooLargeErrorString: - socketErrorString = QSymbianSocketEngine::tr("Datagram was too large to send"); - break; - case SendDatagramErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unable to send a message"); - break; - case ReceiveDatagramErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unable to receive a message"); - break; - case WriteErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unable to write"); - break; - case ReadErrorString: - socketErrorString = QSymbianSocketEngine::tr("Network error"); - break; - case PortInuseErrorString: - socketErrorString = QSymbianSocketEngine::tr("Another socket is already listening on the same port"); - break; - case NotSocketErrorString: - socketErrorString = QSymbianSocketEngine::tr("Operation on non-socket"); - break; - case InvalidProxyTypeString: - socketErrorString = QSymbianSocketEngine::tr("The proxy type is invalid for this operation"); - break; - case InvalidAddressErrorString: - socketErrorString = QSymbianSocketEngine::tr("The address is invalid for this operation"); - break; - case SessionNotOpenErrorString: - socketErrorString = QSymbianSocketEngine::tr("The specified network session is not opened"); - break; - case UnknownSocketErrorString: - socketErrorString = QSymbianSocketEngine::tr("Unknown error"); - break; - } -} - -void QSymbianSocketEnginePrivate::setError(TInt symbianError) -{ - switch (symbianError) { - case KErrDisconnected: - case KErrEof: - case KErrConnectionTerminated: //interface stopped externally - RConnection::Stop(EStopAuthoritative) - setError(QAbstractSocket::RemoteHostClosedError, - QSymbianSocketEnginePrivate::RemoteHostClosedErrorString); - break; - case KErrNetUnreach: - setError(QAbstractSocket::NetworkError, - QSymbianSocketEnginePrivate::NetworkUnreachableErrorString); - break; - case KErrHostUnreach: - setError(QAbstractSocket::NetworkError, - QSymbianSocketEnginePrivate::HostUnreachableErrorString); - break; - case KErrNoProtocolOpt: - setError(QAbstractSocket::NetworkError, - QSymbianSocketEnginePrivate::ProtocolUnsupportedErrorString); - break; - case KErrInUse: - setError(QAbstractSocket::AddressInUseError, AddressInuseErrorString); - break; - case KErrPermissionDenied: - setError(QAbstractSocket::SocketAccessError, AccessErrorString); - break; - case KErrNotSupported: - setError(QAbstractSocket::UnsupportedSocketOperationError, OperationUnsupportedErrorString); - break; - case KErrNoMemory: - setError(QAbstractSocket::SocketResourceError, ResourceErrorString); - break; - case KErrCouldNotConnect: - setError(QAbstractSocket::ConnectionRefusedError, ConnectionRefusedErrorString); - break; - case KErrTimedOut: - setError(QAbstractSocket::NetworkError, ConnectionTimeOutErrorString); - break; - case KErrBadName: - setError(QAbstractSocket::NetworkError, InvalidAddressErrorString); - break; - default: - socketError = QAbstractSocket::NetworkError; - socketErrorString = QSystemError(symbianError, QSystemError::NativeError).toString(); - break; - } - hasSetSocketError = true; -} - -void QSymbianSocketEngine::startNotifications() -{ - Q_D(QSymbianSocketEngine); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::startNotifications" << d->readNotificationsEnabled << d->writeNotificationsEnabled << d->exceptNotificationsEnabled; -#endif - if (!d->asyncSelect && (d->readNotificationsEnabled || d->writeNotificationsEnabled || d->exceptNotificationsEnabled)) { - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::startNotifications(), Q_VOID); - if (d->threadData->eventDispatcher) { - d->asyncSelect = q_check_ptr(new QAsyncSelect( - static_cast<QEventDispatcherSymbian*> (d->threadData->eventDispatcher), d->nativeSocket, - this)); - } else { - // call again when event dispatcher has been created - QMetaObject::invokeMethod(this, "startNotifications", Qt::QueuedConnection); - } - } - if (d->asyncSelect) - d->asyncSelect->IssueRequest(); -} - -bool QSymbianSocketEngine::isReadNotificationEnabled() const -{ - Q_D(const QSymbianSocketEngine); - return d->readNotificationsEnabled; -} - -void QSymbianSocketEngine::setReadNotificationEnabled(bool enable) -{ - Q_D(QSymbianSocketEngine); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::setReadNotificationEnabled" << enable << "socket" << d->socketDescriptor; -#endif - d->readNotificationsEnabled = enable; - startNotifications(); -} - -bool QSymbianSocketEngine::isWriteNotificationEnabled() const -{ - Q_D(const QSymbianSocketEngine); - return d->writeNotificationsEnabled; -} - -void QSymbianSocketEngine::setWriteNotificationEnabled(bool enable) -{ - Q_D(QSymbianSocketEngine); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::setWriteNotificationEnabled" << enable << "socket" << d->socketDescriptor; -#endif - d->writeNotificationsEnabled = enable; - startNotifications(); -} - -bool QSymbianSocketEngine::isExceptionNotificationEnabled() const -{ - Q_D(const QSymbianSocketEngine); - return d->exceptNotificationsEnabled; - return false; -} - -void QSymbianSocketEngine::setExceptionNotificationEnabled(bool enable) -{ - Q_D(QSymbianSocketEngine); -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::setExceptionNotificationEnabled" << enable << "socket" << d->socketDescriptor; -#endif - d->exceptNotificationsEnabled = enable; - startNotifications(); -} - -bool QSymbianSocketEngine::waitForRead(int msecs, bool *timedOut) -{ - Q_D(const QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::waitForRead(), false); - Q_CHECK_NOT_STATE(QSymbianSocketEngine::waitForRead(), - QAbstractSocket::UnconnectedState, false); - - if (timedOut) - *timedOut = false; - - int ret = d->nativeSelect(msecs, true); - if (ret == 0) { - if (timedOut) - *timedOut = true; - d->setError(QAbstractSocket::SocketTimeoutError, - d->TimeOutErrorString); - d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions - return false; - } else if (state() == QAbstractSocket::ConnectingState) { - connectToHost(d->peerAddress, d->peerPort); - } - - return ret > 0; -} - -bool QSymbianSocketEngine::waitForWrite(int msecs, bool *timedOut) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::waitForWrite(), false); - Q_CHECK_NOT_STATE(QSymbianSocketEngine::waitForWrite(), - QAbstractSocket::UnconnectedState, false); - - if (timedOut) - *timedOut = false; - - int ret = d->nativeSelect(msecs, false); - - if (ret == 0) { - if (timedOut) - *timedOut = true; - d->setError(QAbstractSocket::SocketTimeoutError, - d->TimeOutErrorString); - d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions - return false; - } else if (state() == QAbstractSocket::ConnectingState) { - connectToHost(d->peerAddress, d->peerPort); - } - - return ret > 0; -} - -bool QSymbianSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWrite, - bool checkRead, bool checkWrite, - int msecs, bool *timedOut) -{ - Q_D(QSymbianSocketEngine); - Q_CHECK_VALID_SOCKETLAYER(QSymbianSocketEngine::waitForWrite(), false); - Q_CHECK_NOT_STATE(QSymbianSocketEngine::waitForReadOrWrite(), - QAbstractSocket::UnconnectedState, false); - - int ret = d->nativeSelect(msecs, checkRead, checkWrite, readyToRead, readyToWrite); - - if (ret == 0) { - if (timedOut) - *timedOut = true; - d->setError(QAbstractSocket::SocketTimeoutError, - d->TimeOutErrorString); - d->hasSetSocketError = false; // A timeout error is temporary in waitFor functions - return false; - } else if (state() == QAbstractSocket::ConnectingState) { - connectToHost(d->peerAddress, d->peerPort); - } - - return ret > 0; -} - -qint64 QSymbianSocketEngine::bytesToWrite() const -{ - // This is what the QNativeSocketEngine does - return 0; -} - -bool QSymbianSocketEngine::event(QEvent* ev) -{ - Q_D(QSymbianSocketEngine); - if (ev->type() == QEvent::ThreadChange) { -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QSymbianSocketEngine::event - ThreadChange" << d->readNotificationsEnabled << d->writeNotificationsEnabled << d->exceptNotificationsEnabled; -#endif - if (d->asyncSelect) { - delete d->asyncSelect; - d->asyncSelect = 0; - // recreate select in new thread (because it is queued, the method is called in the new thread context) - QMetaObject::invokeMethod(this, "startNotifications", Qt::QueuedConnection); - } - d->selectTimer.Close(); - return true; - } - return QAbstractSocketEngine::event(ev); -} - -QAsyncSelect::QAsyncSelect(QEventDispatcherSymbian *dispatcher, RSocket& sock, QSymbianSocketEngine *parent) - : QActiveObject(CActive::EPriorityStandard, dispatcher), - m_inSocketEvent(false), - m_deleteLater(false), - m_socket(sock), - m_selectFlags(0), - engine(parent) -{ - CActiveScheduler::Add(this); -} - -QAsyncSelect::~QAsyncSelect() -{ - Cancel(); -} - -void QAsyncSelect::DoCancel() -{ - m_socket.CancelIoctl(); -} - -void QAsyncSelect::RunL() -{ - QT_TRYCATCH_LEAVING(run()); -} - -//RunError is called by the active scheduler if RunL leaves. -//Typically this will happen if a std::bad_alloc propagates down from the application -TInt QAsyncSelect::RunError(TInt aError) -{ - if (engine) { - QT_TRY { - engine->d_func()->setError(aError); - if (engine->isExceptionNotificationEnabled()) - engine->exceptionNotification(); - if (engine->isReadNotificationEnabled()) - engine->readNotification(); - } - QT_CATCH(...) {} - } -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QAsyncSelect::RunError" << aError; -#endif - return KErrNone; -} - -void QAsyncSelect::run() -{ - //when event loop disabled socket events, defer until later - if (maybeDeferSocketEvent()) - return; -#if defined (QNATIVESOCKETENGINE_DEBUG) - qDebug() << "QAsyncSelect::run" << m_selectBuf() << m_selectFlags; -#endif - m_inSocketEvent = true; - m_selectBuf() &= m_selectFlags; //the select ioctl reports everything, so mask to only what we requested - //KSockSelectReadContinuation is for reading datagrams in a mode that doesn't discard when the - //datagram is larger than the read buffer - Qt doesn't need to use this. - if (engine && engine->isReadNotificationEnabled() - && ((m_selectBuf() & KSockSelectRead) || iStatus != KErrNone)) { - engine->readNotification(); - } - if (engine && engine->isWriteNotificationEnabled() - && ((m_selectBuf() & KSockSelectWrite) || iStatus != KErrNone)) { - if (engine->state() == QAbstractSocket::ConnectingState) - engine->connectionNotification(); - else - engine->writeNotification(); - } - if (engine && engine->isExceptionNotificationEnabled() - && ((m_selectBuf() & KSockSelectExcept) || iStatus != KErrNone)) { - engine->exceptionNotification(); - } - m_inSocketEvent = false; - if (m_deleteLater) { - delete this; - return; - } - // select again (unless disabled by one of the callbacks) - IssueRequest(); -} - -void QAsyncSelect::deleteLater() -{ - if (m_inSocketEvent) { - engine = 0; - m_deleteLater = true; - } else { - delete this; - } -} - -void QAsyncSelect::IssueRequest() -{ - if (m_inSocketEvent) - return; //prevent thrashing during a callback - socket engine enables/disables multiple notifiers - TUint selectFlags = 0; - if (engine->isReadNotificationEnabled()) - selectFlags |= KSockSelectRead; - if (engine->isWriteNotificationEnabled()) - selectFlags |= KSockSelectWrite; - if (engine->isExceptionNotificationEnabled()) - selectFlags |= KSockSelectExcept; - if (selectFlags != m_selectFlags) { -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QAsyncSelect::IssueRequest() - select flags" << m_selectFlags << "->" << selectFlags; -#endif - Cancel(); - m_selectFlags = selectFlags; - } - if (m_selectFlags && !IsActive()) { - //always request errors (write notification does not complete on connect errors) - m_selectBuf() = m_selectFlags | KSockSelectExcept; - m_socket.Ioctl(KIOctlSelect, iStatus, &m_selectBuf, KSOLSocket); - SetActive(); - } -#ifdef QNATIVESOCKETENGINE_DEBUG - qDebug() << "QAsyncSelect::IssueRequest() - IsActive" << IsActive(); -#endif -} - -QT_END_NAMESPACE diff --git a/src/network/socket/qsymbiansocketengine_p.h b/src/network/socket/qsymbiansocketengine_p.h deleted file mode 100644 index 81156fc247..0000000000 --- a/src/network/socket/qsymbiansocketengine_p.h +++ /dev/null @@ -1,258 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtNetwork module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSYMBIANSOCKETENGINE_P_H -#define QSYMBIANSOCKETENGINE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of the QLibrary class. This header file may change from -// version to version without notice, or even be removed. -// -// We mean it. -// -#include "QtNetwork/qhostaddress.h" -#include "private/qabstractsocketengine_p.h" -#include "qplatformdefs.h" - -#include <private/qeventdispatcher_symbian_p.h> -#include <unistd.h> -#include <es_sock.h> -#include <in_sock.h> - -QT_BEGIN_NAMESPACE - - -class QSymbianSocketEnginePrivate; -class QNetworkInterface; - -class Q_AUTOTEST_EXPORT QSymbianSocketEngine : public QAbstractSocketEngine -{ - Q_OBJECT - friend class QAsyncSelect; -public: - QSymbianSocketEngine(QObject *parent = 0); - ~QSymbianSocketEngine(); - - bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol); - bool initialize(int socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState); - - int socketDescriptor() const; - - bool isValid() const; - - bool connectToHost(const QHostAddress &address, quint16 port); - bool connectToHostByName(const QString &name, quint16 port); - bool bind(const QHostAddress &address, quint16 port); - bool listen(); - int accept(); - void close(); - - bool joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface); - bool leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface); - QNetworkInterface multicastInterface() const; - bool setMulticastInterface(const QNetworkInterface &iface); - - qint64 bytesAvailable() const; - - qint64 read(char *data, qint64 maxlen); - qint64 write(const char *data, qint64 len); - - qint64 readDatagram(char *data, qint64 maxlen, QHostAddress *addr = 0, - quint16 *port = 0); - qint64 writeDatagram(const char *data, qint64 len, const QHostAddress &addr, - quint16 port); - bool hasPendingDatagrams() const; - qint64 pendingDatagramSize() const; - - qint64 bytesToWrite() const; - - qint64 receiveBufferSize() const; - void setReceiveBufferSize(qint64 bufferSize); - - qint64 sendBufferSize() const; - void setSendBufferSize(qint64 bufferSize); - - int option(SocketOption option) const; - bool setOption(SocketOption option, int value); - - bool waitForRead(int msecs = 30000, bool *timedOut = 0); - bool waitForWrite(int msecs = 30000, bool *timedOut = 0); - bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite, - bool checkRead, bool checkWrite, - int msecs = 30000, bool *timedOut = 0); - - bool isReadNotificationEnabled() const; - void setReadNotificationEnabled(bool enable); - bool isWriteNotificationEnabled() const; - void setWriteNotificationEnabled(bool enable); - bool isExceptionNotificationEnabled() const; - void setExceptionNotificationEnabled(bool enable); - - bool event(QEvent* ev); - - Q_INVOKABLE void startNotifications(); - -public Q_SLOTS: - // TODO: Why do we do this? This is private Qt implementation stuff anyway, no need for it - // non-virtual override; - void connectionNotification(); - -private: - Q_DECLARE_PRIVATE(QSymbianSocketEngine) - Q_DISABLE_COPY(QSymbianSocketEngine) -}; - -class QSocketNotifier; - -class QReadNotifier; -class QWriteNotifier; -class QExceptionNotifier; -class QAsyncSelect : public QActiveObject -{ -public: - QAsyncSelect(QEventDispatcherSymbian *dispatcher, RSocket& sock, QSymbianSocketEngine *parent); - ~QAsyncSelect(); - - void deleteLater(); - void IssueRequest(); - - void refresh(); - -protected: - void DoCancel(); - void RunL(); - void run(); - TInt RunError(TInt aError); - -private: - bool m_inSocketEvent; - bool m_deleteLater; - RSocket &m_socket; - - TUint m_selectFlags; - TPckgBuf<TUint> m_selectBuf; //in & out IPC buffer - QSymbianSocketEngine *engine; -}; - -class QSymbianSocketEnginePrivate : public QAbstractSocketEnginePrivate -{ - Q_DECLARE_PUBLIC(QSymbianSocketEngine) -public: - QSymbianSocketEnginePrivate(); - ~QSymbianSocketEnginePrivate(); - - int socketDescriptor; - mutable RSocket nativeSocket; - // From QtCore: - RSocketServ& socketServer; - mutable RTimer selectTimer; - - bool readNotificationsEnabled; - bool writeNotificationsEnabled; - bool exceptNotificationsEnabled; - QAsyncSelect* asyncSelect; - - mutable QByteArray receivedDataBuffer; - mutable bool hasReceivedBufferedDatagram; - // FIXME this is duplicated from qnativesocketengine_p.h - enum ErrorString { - NonBlockingInitFailedErrorString, - BroadcastingInitFailedErrorString, - NoIpV6ErrorString, - RemoteHostClosedErrorString, - TimeOutErrorString, - ResourceErrorString, - OperationUnsupportedErrorString, - ProtocolUnsupportedErrorString, - InvalidSocketErrorString, - HostUnreachableErrorString, - NetworkUnreachableErrorString, - AccessErrorString, - ConnectionTimeOutErrorString, - ConnectionRefusedErrorString, - AddressInuseErrorString, - AddressNotAvailableErrorString, - AddressProtectedErrorString, - DatagramTooLargeErrorString, - SendDatagramErrorString, - ReceiveDatagramErrorString, - WriteErrorString, - ReadErrorString, - PortInuseErrorString, - NotSocketErrorString, - InvalidProxyTypeString, - //symbian specific - InvalidAddressErrorString, - SessionNotOpenErrorString, - - UnknownSocketErrorString = -1 - }; - void setError(QAbstractSocket::SocketError error, ErrorString errorString) const; - - void getPortAndAddress(const TInetAddr& a, quint16 *port, QHostAddress *addr); - void setPortAndAddress(TInetAddr& nativeAddr, quint16 port, const QHostAddress &addr); - void setError(TInt symbianError); - - int nativeSelect(int timeout, bool selectForRead) const; - int nativeSelect(int timeout, bool checkRead, bool checkWrite, - bool *selectForRead, bool *selectForWrite) const; - - bool createNewSocket(QAbstractSocket::SocketType socketType, - QAbstractSocket::NetworkLayerProtocol socketProtocol); - - bool checkProxy(const QHostAddress &address); - bool fetchConnectionParameters(); - - bool multicastGroupMembershipHelper(const QHostAddress &groupAddress, - const QNetworkInterface &iface, - TUint operation); - static bool translateSocketOption(QAbstractSocketEngine::SocketOption opt, TUint &n, TUint &level); -}; - -QT_END_NAMESPACE - -#endif // QSYMBIANSOCKETENGINE_P_H diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index f82348a6cb..500d383e0f 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -79,16 +79,6 @@ use waitForNewConnection(), which blocks until either a connection is available or a timeout expires. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use this class must have the - \c NetworkServices platform security capability. If the client - process lacks this capability, it will lead to a panic. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QTcpSocket, {Fortune Server Example}, {Threaded Fortune Server Example}, {Loopback Example}, {Torrent Example} */ diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp index 04b81969f4..78fb4cd050 100644 --- a/src/network/socket/qtcpsocket.cpp +++ b/src/network/socket/qtcpsocket.cpp @@ -60,16 +60,6 @@ \bold{Note:} TCP sockets cannot be opened in QIODevice::Unbuffered mode. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use this class must have the - \c NetworkServices platform security capability. If the client - process lacks this capability, it will result in a panic. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QTcpServer, QUdpSocket, QFtp, QNetworkAccessManager, {Fortune Server Example}, {Fortune Client Example}, {Threaded Fortune Server Example}, {Blocking Fortune Client Example}, diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index 79083e489a..e12034d86b 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -95,16 +95,6 @@ \l{network/multicastreceiver}{Multicast Receiver} examples illustrate how to use QUdpSocket in applications. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use this class must have the - \c NetworkServices platform security capability. If the client - process lacks this capability, operations will result in a panic. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QTcpSocket */ diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index ac9001247a..48c38a209e 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -23,26 +23,15 @@ SOURCES += socket/qabstractsocketengine.cpp \ socket/qlocalsocket.cpp \ socket/qlocalserver.cpp -# On Symbian we use QSymbianSocketEngine -symbian:SOURCES += socket/qsymbiansocketengine.cpp -symbian:HEADERS += socket/qsymbiansocketengine_p.h -# On others we use QNativeSocketEngine -!symbian:SOURCES += socket/qnativesocketengine.cpp -!symbian:HEADERS += socket/qnativesocketengine_p.h +SOURCES += socket/qnativesocketengine.cpp +HEADERS += socket/qnativesocketengine_p.h -unix:!symbian: { +unix: { SOURCES += socket/qnativesocketengine_unix.cpp \ socket/qlocalsocket_unix.cpp \ socket/qlocalserver_unix.cpp } -symbian: { - SOURCES += socket/qlocalsocket_tcp.cpp \ - socket/qlocalserver_tcp.cpp - - DEFINES += QT_LOCALSOCKET_TCP -} - unix:HEADERS += \ socket/qnet_unix_p.h diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 7aac889b40..d3795d0ab5 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -165,16 +165,6 @@ is being encrypted and encryptedBytesWritten() will get emitted as soon as data has been written to the TCP socket. - \section1 Symbian Platform Security Requirements - - On Symbian, processes which use this class must have the - \c NetworkServices platform security capability. If the client - process lacks this capability, operations will fail. - - Platform security capabilities are added via the - \l{qmake-variable-reference.html#target-capability}{TARGET.CAPABILITY} - qmake variable. - \sa QSslCertificate, QSslCipher, QSslError */ diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 9cb7066803..4a2ebf89b1 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -60,12 +60,6 @@ #include <QtCore/qvarlengtharray.h> #include <QLibrary> // for loading the security lib for the CA store -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) -// Symbian does not seem to have the symbol for SNI defined -#ifndef SSL_CTRL_SET_TLSEXT_HOSTNAME -#define SSL_CTRL_SET_TLSEXT_HOSTNAME 55 -#endif -#endif QT_BEGIN_NAMESPACE #if defined(Q_OS_MAC) @@ -77,11 +71,6 @@ QT_BEGIN_NAMESPACE PtrCertOpenSystemStoreW QSslSocketPrivate::ptrCertOpenSystemStoreW = 0; PtrCertFindCertificateInStore QSslSocketPrivate::ptrCertFindCertificateInStore = 0; PtrCertCloseStore QSslSocketPrivate::ptrCertCloseStore = 0; -#elif defined(Q_OS_SYMBIAN) -#include <e32base.h> -#include <e32std.h> -#include <e32debug.h> -#include <QtCore/private/qcore_symbian_p.h> #endif bool QSslSocketPrivate::s_libraryLoaded = false; @@ -595,7 +584,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() } else { qWarning("could not load crypt32 library"); // should never happen } -#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_MAC) +#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) QList<QByteArray> dirs = unixRootCertDirectories(); QStringList symLinkFilter; @@ -678,180 +667,6 @@ void QSslSocketPrivate::resetDefaultCiphers() setDefaultCiphers(ciphers); } -#if defined(Q_OS_SYMBIAN) - -CSymbianCertificateRetriever::CSymbianCertificateRetriever() : CActive(CActive::EPriorityStandard), - iCertificatePtr(0,0,0), iSequenceError(KErrNone) -{ -} - -CSymbianCertificateRetriever::~CSymbianCertificateRetriever() -{ - iThread.Close(); -} - -CSymbianCertificateRetriever* CSymbianCertificateRetriever::NewL() -{ - CSymbianCertificateRetriever* self = new (ELeave) CSymbianCertificateRetriever(); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(); - return self; -} - -int CSymbianCertificateRetriever::GetCertificates(QList<QByteArray> &certificates) -{ - iCertificates = &certificates; - - TRequestStatus status; - iThread.Logon(status); - iThread.Resume(); - User::WaitForRequest(status); - if (iThread.ExitType() == EExitKill) - return KErrDied; - else - return status.Int(); // Logon() completes with the thread's exit value -} - -void CSymbianCertificateRetriever::doThreadEntryL() -{ - CActiveScheduler* activeScheduler = new (ELeave) CActiveScheduler; - CleanupStack::PushL(activeScheduler); - CActiveScheduler::Install(activeScheduler); - - CActiveScheduler::Add(this); - - // These aren't deleted in the destructor so leaving the to CS is ok - iCertStore = CUnifiedCertStore::NewLC(qt_s60GetRFs(), EFalse); - iCertFilter = CCertAttributeFilter::NewLC(); - - // only interested in CA certs - iCertFilter->SetOwnerType(ECACertificate); - // only interested in X.509 format (we don't support WAP formats) - iCertFilter->SetFormat(EX509Certificate); - - // Kick off the sequence by initializing the cert store - iState = Initializing; - iCertStore->Initialize(iStatus); - SetActive(); - - CActiveScheduler::Start(); - - // Sequence complete, clean up - - // These MUST be cleaned up before the installed CActiveScheduler is destroyed and can't be left to the - // destructor of CSymbianCertificateRetriever. Otherwise the destructor of CActiveScheduler will get - // stuck. - iCertInfos.Close(); - CleanupStack::PopAndDestroy(3); // activeScheduler, iCertStore, iCertFilter -} - - -TInt CSymbianCertificateRetriever::ThreadEntryPoint(TAny* aParams) -{ - User::SetCritical(User::EProcessCritical); - CTrapCleanup* cleanupStack = CTrapCleanup::New(); - - CSymbianCertificateRetriever* self = (CSymbianCertificateRetriever*) aParams; - TRAPD(err, self->doThreadEntryL()); - delete cleanupStack; - - // doThreadEntryL() can leave only before the retrieval sequence is started - if (err) - return err; - else - return self->iSequenceError; // return any error that occurred during the retrieval -} - -void CSymbianCertificateRetriever::ConstructL() -{ - TInt err; - int i=0; - QString name(QLatin1String("CertWorkerThread-%1")); - //recently closed thread names remain in use for a while until all handles have been closed - //including users of RUndertaker - do { - err = iThread.Create(qt_QString2TPtrC(name.arg(i++)), - CSymbianCertificateRetriever::ThreadEntryPoint, 16384, NULL, this); - } while (err == KErrAlreadyExists); - User::LeaveIfError(err); -} - -void CSymbianCertificateRetriever::DoCancel() -{ - switch(iState) { - case Initializing: - iCertStore->CancelInitialize(); - break; - case Listing: - iCertStore->CancelList(); - break; - case RetrievingCertificates: - iCertStore->CancelGetCert(); - break; - } -} - -TInt CSymbianCertificateRetriever::RunError(TInt aError) -{ - // If something goes wrong in the sequence, abort the sequence - iSequenceError = aError; // this gets reported to the client in the TRequestStatus - CActiveScheduler::Stop(); - return KErrNone; -} - -void CSymbianCertificateRetriever::GetCertificateL() -{ - if (iCurrentCertIndex < iCertInfos.Count()) { - CCTCertInfo* certInfo = iCertInfos[iCurrentCertIndex++]; - iCertificateData = QByteArray(); - QT_TRYCATCH_LEAVING(iCertificateData.resize(certInfo->Size())); - iCertificatePtr.Set((TUint8*)iCertificateData.data(), 0, iCertificateData.size()); -#ifdef QSSLSOCKET_DEBUG - qDebug() << "getting " << qt_TDesC2QString(certInfo->Label()) << " size=" << certInfo->Size(); - qDebug() << "format=" << certInfo->CertificateFormat(); - qDebug() << "ownertype=" << certInfo->CertificateOwnerType(); - qDebug() << "type=" << hex << certInfo->Type().iUid; -#endif - iCertStore->Retrieve(*certInfo, iCertificatePtr, iStatus); - iState = RetrievingCertificates; - SetActive(); - } else { - //reached end of list - CActiveScheduler::Stop(); - } -} - -void CSymbianCertificateRetriever::RunL() -{ -#ifdef QSSLSOCKET_DEBUG - qDebug() << "CSymbianCertificateRetriever::RunL status " << iStatus.Int() << " count " << iCertInfos.Count() << " index " << iCurrentCertIndex; -#endif - switch (iState) { - case Initializing: - User::LeaveIfError(iStatus.Int()); // initialise fail means pointless to continue - iState = Listing; - iCertStore->List(iCertInfos, *iCertFilter, iStatus); - SetActive(); - break; - - case Listing: - User::LeaveIfError(iStatus.Int()); // listing fail means pointless to continue - iCurrentCertIndex = 0; - GetCertificateL(); - break; - - case RetrievingCertificates: - if (iStatus.Int() == KErrNone) - iCertificates->append(iCertificateData); - else - qWarning() << "CSymbianCertificateRetriever: failed to retrieve a certificate, error " << iStatus.Int(); - GetCertificateL(); - break; - } -} -#endif // defined(Q_OS_SYMBIAN) - QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() { ensureInitialized(); @@ -921,7 +736,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() ptrCertCloseStore(hSystemStore, 0); } } -#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_UNIX) QSet<QString> certFiles; QList<QByteArray> directories = unixRootCertDirectories(); QDir currentDir; @@ -943,21 +758,6 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates() } systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss - -#elif defined(Q_OS_SYMBIAN) - QList<QByteArray> certs; - QScopedPointer<CSymbianCertificateRetriever> retriever(CSymbianCertificateRetriever::NewL()); - - retriever->GetCertificates(certs); - foreach (const QByteArray &encodedCert, certs) { - QSslCertificate cert(encodedCert, QSsl::Der); - if (!cert.isNull()) { -#ifdef QSSLSOCKET_DEBUG - qDebug() << "imported certificate: " << cert.issuerInfo(QSslCertificate::CommonName); -#endif - systemCerts.append(cert); - } - } #endif #ifdef QSSLSOCKET_DEBUG qDebug() << "systemCaCertificates retrieval time " << timer.elapsed() << "ms"; diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 080ad0064c..c4b9018db7 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -126,61 +126,6 @@ public: static QString getErrorsFromOpenSsl(); }; -#if defined(Q_OS_SYMBIAN) - -#include <QByteArray> -#include <e32base.h> -#include <f32file.h> -#include <unifiedcertstore.h> // link against certstore.lib -#include <ccertattributefilter.h> // link against ctframework.lib - -// The purpose of this class is to wrap the asynchronous API of Symbian certificate store to one -// synchronizable call. The user of this class needs to provide a TRequestStatus object which can -// be used with User::WaitForRequest() unlike with the calls of the certificate store API. -// A thread is used instead of a CActiveSchedulerWait scheme, because that would make the call -// asynchronous (other events might be processed during the call even though the call would be seemingly -// synchronous). - -class CSymbianCertificateRetriever : public CActive -{ -public: - static CSymbianCertificateRetriever* NewL(); - ~CSymbianCertificateRetriever(); - - int GetCertificates(QList<QByteArray> &aCertificates); - -private: - void ConstructL(); - CSymbianCertificateRetriever(); - static TInt ThreadEntryPoint(TAny* aParams); - void doThreadEntryL(); - void GetCertificateL(); - void DoCancel(); - void RunL(); - TInt RunError(TInt aError); - -private: - enum { - Initializing, - Listing, - RetrievingCertificates - } iState; - - RThread iThread; - CUnifiedCertStore* iCertStore; - RMPointerArray<CCTCertInfo> iCertInfos; - CCertAttributeFilter* iCertFilter; - TInt iCurrentCertIndex; - QByteArray iCertificateData; - TPtr8 iCertificatePtr; - QList<QByteArray>* iCertificates; - TInt iSequenceError; -}; - - -#endif - - QT_END_NAMESPACE #endif diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 7696d15542..1997f550dc 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -293,16 +293,10 @@ DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *C DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) -#ifdef Q_OS_SYMBIAN -#define RESOLVEFUNC(func, ordinal, lib) \ - if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \ - qWarning("QSslSocket: cannot resolve "#func); -#else #define RESOLVEFUNC(func) \ if (!(_q_##func = _q_PTR_##func(libs.first->resolve(#func))) \ && !(_q_##func = _q_PTR_##func(libs.second->resolve(#func)))) \ qWarning("QSslSocket: cannot resolve "#func); -#endif #if !defined QT_LINKED_OPENSSL @@ -412,25 +406,7 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl() pair.first = 0; pair.second = 0; -# if defined(Q_OS_SYMBIAN) - QLibrary *libssl = new QLibrary(QLatin1String("libssl")); - if (!libssl->load()) { - // Cannot find ssleay32.dll - delete libssl; - return pair; - } - - QLibrary *libcrypto = new QLibrary(QLatin1String("libcrypto")); - if (!libcrypto->load()) { - delete libcrypto; - delete libssl; - return pair; - } - - pair.first = libssl; - pair.second = libcrypto; - return pair; -# elif defined(Q_OS_UNIX) +# if defined(Q_OS_UNIX) QLibrary *&libssl = pair.first; QLibrary *&libcrypto = pair.second; libssl = new QLibrary; @@ -536,141 +512,6 @@ bool q_resolveOpenSslSymbols() // failed to load them return false; -#ifdef Q_OS_SYMBIAN -#ifdef SSLEAY_MACROS - RESOLVEFUNC(ASN1_dup, 125, libs.second ) -#endif - RESOLVEFUNC(ASN1_INTEGER_get, 48, libs.second ) - RESOLVEFUNC(ASN1_STRING_data, 71, libs.second ) - RESOLVEFUNC(ASN1_STRING_length, 76, libs.second ) - RESOLVEFUNC(ASN1_STRING_to_UTF8, 86, libs.second ) - RESOLVEFUNC(BIO_ctrl, 184, libs.second ) - RESOLVEFUNC(BIO_free, 209, libs.second ) - RESOLVEFUNC(BIO_new, 222, libs.second ) - RESOLVEFUNC(BIO_new_mem_buf, 230, libs.second ) - RESOLVEFUNC(BIO_read, 244, libs.second ) - RESOLVEFUNC(BIO_s_mem, 251, libs.second ) - RESOLVEFUNC(BIO_write, 269, libs.second ) - RESOLVEFUNC(BN_num_bits, 387, libs.second ) - RESOLVEFUNC(CRYPTO_free, 469, libs.second ) - RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second ) - RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second ) - RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second ) - RESOLVEFUNC(DSA_free, 594, libs.second ) - RESOLVEFUNC(ERR_error_string, 744, libs.second ) - RESOLVEFUNC(ERR_get_error, 749, libs.second ) - RESOLVEFUNC(EVP_des_ede3_cbc, 919, libs.second ) - RESOLVEFUNC(EVP_PKEY_assign, 859, libs.second ) - RESOLVEFUNC(EVP_PKEY_set1_RSA, 880, libs.second ) - RESOLVEFUNC(EVP_PKEY_set1_DSA, 879, libs.second ) - RESOLVEFUNC(EVP_PKEY_free, 867, libs.second ) - RESOLVEFUNC(EVP_PKEY_get1_DSA, 869, libs.second ) - RESOLVEFUNC(EVP_PKEY_get1_RSA, 870, libs.second ) - RESOLVEFUNC(EVP_PKEY_new, 876, libs.second ) - RESOLVEFUNC(EVP_PKEY_type, 882, libs.second ) - RESOLVEFUNC(OBJ_nid2sn, 1036, libs.second ) - RESOLVEFUNC(OBJ_obj2nid, 1037, libs.second ) -#ifdef SSLEAY_MACROS // ### verify - RESOLVEFUNC(PEM_ASN1_read_bio, 1180, libs.second ) -#else - RESOLVEFUNC(PEM_read_bio_DSAPrivateKey, 1219, libs.second ) - RESOLVEFUNC(PEM_read_bio_RSAPrivateKey, 1228, libs.second ) - RESOLVEFUNC(PEM_write_bio_DSAPrivateKey, 1260, libs.second ) - RESOLVEFUNC(PEM_write_bio_RSAPrivateKey, 1271, libs.second ) -#endif - RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY, 1220, libs.second ) - RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY, 1230, libs.second ) - RESOLVEFUNC(PEM_write_bio_DSA_PUBKEY, 1261, libs.second ) - RESOLVEFUNC(PEM_write_bio_RSA_PUBKEY, 1273, libs.second ) - RESOLVEFUNC(RAND_seed, 1426, libs.second ) - RESOLVEFUNC(RAND_status, 1429, libs.second ) - RESOLVEFUNC(RSA_free, 1450, libs.second ) - RESOLVEFUNC(sk_free, 2571, libs.second ) - RESOLVEFUNC(sk_num, 2576, libs.second ) - RESOLVEFUNC(sk_pop_free, 2578, libs.second ) - RESOLVEFUNC(sk_value, 2585, libs.second ) - RESOLVEFUNC(SSL_CIPHER_description, 11, libs.first ) - RESOLVEFUNC(SSL_CTX_check_private_key, 21, libs.first ) - RESOLVEFUNC(SSL_CTX_ctrl, 22, libs.first ) - RESOLVEFUNC(SSL_CTX_free, 24, libs.first ) - RESOLVEFUNC(SSL_CTX_new, 35, libs.first ) - RESOLVEFUNC(SSL_CTX_set_cipher_list, 40, libs.first ) - RESOLVEFUNC(SSL_CTX_set_default_verify_paths, 44, libs.first ) - RESOLVEFUNC(SSL_CTX_set_verify, 56, libs.first ) - RESOLVEFUNC(SSL_CTX_set_verify_depth, 57, libs.first ) - RESOLVEFUNC(SSL_CTX_use_certificate, 64, libs.first ) - RESOLVEFUNC(SSL_CTX_use_certificate_file, 67, libs.first ) - RESOLVEFUNC(SSL_CTX_use_PrivateKey, 58, libs.first ) - RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey, 61, libs.first ) - RESOLVEFUNC(SSL_CTX_use_PrivateKey_file, 60, libs.first ) - RESOLVEFUNC(SSL_accept, 82, libs.first ) - RESOLVEFUNC(SSL_clear, 92, libs.first ) - RESOLVEFUNC(SSL_connect, 93, libs.first ) - RESOLVEFUNC(SSL_free, 99, libs.first ) - RESOLVEFUNC(SSL_get_ciphers, 104, libs.first ) - RESOLVEFUNC(SSL_get_current_cipher, 106, libs.first ) - RESOLVEFUNC(SSL_get_error, 110, libs.first ) - RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first ) - RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first ) - RESOLVEFUNC(SSL_get_verify_result, 132, libs.first ) - RESOLVEFUNC(SSL_library_init, 137, libs.first ) - RESOLVEFUNC(SSL_load_error_strings, 139, libs.first ) - RESOLVEFUNC(SSL_new, 140, libs.first ) -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) - RESOLVEFUNC(SSL_ctrl, 95, libs.first ) -#endif - RESOLVEFUNC(SSL_read, 143, libs.first ) - RESOLVEFUNC(SSL_set_accept_state, 148, libs.first ) - RESOLVEFUNC(SSL_set_bio, 149, libs.first ) - RESOLVEFUNC(SSL_set_connect_state, 152, libs.first ) - RESOLVEFUNC(SSL_shutdown, 173, libs.first ) - RESOLVEFUNC(SSL_write, 188, libs.first ) - RESOLVEFUNC(SSLv2_client_method, 192, libs.first ) - RESOLVEFUNC(SSLv3_client_method, 195, libs.first ) - RESOLVEFUNC(SSLv23_client_method, 189, libs.first ) - RESOLVEFUNC(TLSv1_client_method, 198, libs.first ) - RESOLVEFUNC(SSLv2_server_method, 194, libs.first ) - RESOLVEFUNC(SSLv3_server_method, 197, libs.first ) - RESOLVEFUNC(SSLv23_server_method, 191, libs.first ) - RESOLVEFUNC(TLSv1_server_method, 200, libs.first ) - RESOLVEFUNC(SSL_CTX_load_verify_locations, 34, libs.first ) - RESOLVEFUNC(X509_NAME_entry_count, 1821, libs.second ) - RESOLVEFUNC(X509_NAME_get_entry, 1823, libs.second ) - RESOLVEFUNC(X509_NAME_ENTRY_get_data, 1808, libs.second ) - RESOLVEFUNC(X509_NAME_ENTRY_get_object, 1809, libs.second ) - RESOLVEFUNC(X509_PUBKEY_get, 1844, libs.second ) - RESOLVEFUNC(X509_STORE_free, 1939, libs.second ) - RESOLVEFUNC(X509_STORE_new, 1942, libs.second ) - RESOLVEFUNC(X509_STORE_add_cert, 1936, libs.second ) - RESOLVEFUNC(X509_STORE_CTX_free, 1907, libs.second ) - RESOLVEFUNC(X509_STORE_CTX_init, 1919, libs.second ) - RESOLVEFUNC(X509_STORE_CTX_new, 1920, libs.second ) - RESOLVEFUNC(X509_STORE_CTX_set_purpose, 1931, libs.second ) - RESOLVEFUNC(X509_cmp, 1992, libs.second ) -#ifndef SSLEAY_MACROS - RESOLVEFUNC(X509_dup, 1997, libs.second ) -#endif - RESOLVEFUNC(X509_print, 2046, libs.second ) - RESOLVEFUNC(X509_EXTENSION_get_object, 1785, libs.second ) - RESOLVEFUNC(X509_free, 2001, libs.second ) - RESOLVEFUNC(X509_get_ext, 2012, libs.second ) - RESOLVEFUNC(X509_get_ext_count, 2016, libs.second ) - RESOLVEFUNC(X509_get_ext_d2i, 2017, libs.second ) - RESOLVEFUNC(X509_get_issuer_name, 2018, libs.second ) - RESOLVEFUNC(X509_get_subject_name, 2022, libs.second ) - RESOLVEFUNC(X509_verify_cert, 2069, libs.second ) - RESOLVEFUNC(d2i_X509, 2309, libs.second ) - RESOLVEFUNC(i2d_X509, 2489, libs.second ) -#ifdef SSLEAY_MACROS - RESOLVEFUNC(i2d_DSAPrivateKey, 2395, libs.second ) - RESOLVEFUNC(i2d_RSAPrivateKey, 2476, libs.second ) - RESOLVEFUNC(d2i_DSAPrivateKey, 2220, libs.second ) - RESOLVEFUNC(d2i_RSAPrivateKey, 2296, libs.second ) -#endif - RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf, 1153, libs.second ) - RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second ) - RESOLVEFUNC(SSLeay, 1504, libs.second ) -#else // Q_OS_SYMBIAN #ifdef SSLEAY_MACROS RESOLVEFUNC(ASN1_dup) #endif @@ -817,7 +658,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_load_verify_locations) RESOLVEFUNC(SSLeay) RESOLVEFUNC(SSLeay_version) -#endif // Q_OS_SYMBIAN + symbolsResolved = true; delete libs.first; delete libs.second; diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 9ba8d01f51..7a8694ca62 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -2,11 +2,7 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { -symbian { - INCLUDEPATH *= $$OS_LAYER_SSL_SYSTEMINCLUDE -} else { - include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) -} +include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) HEADERS += ssl/qssl.h \ ssl/qsslcertificate.h \ |