diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-23 13:37:01 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-04 23:58:03 +0000 |
| commit | 9fb68a90af79df3b8dc3225a3a97e2c6387afeec (patch) | |
| tree | b51f4ca6effbcf2da792595837a92198a2181f01 /src/network/kernel | |
| parent | 29051bce39d24a6e33155feeec2833b79b55ff16 (diff) | |
Fix bind+connect in both TCP and UDP
This has been known to be broken for a while. Now it works: you can bind
and you'll retain the port (and the file descriptor) for the connect
call. Incidentally, in fixing the binding for more than one IP for the
hostname (with event loop), this commit fixes the setSocketDescriptor
XFAIL.
[ChangeLog][QtNetwork] Fixed a bug that caused both QTcpSocket and
QUdpSocket to close the socket and lose any bound ports before
connecting. Now bind()/setSocketDescriptor() followed by connect() will
retain the original file descriptor.
Task-number: QTBUG-26538
Change-Id: I691caed7e8fd16a9cf687b5995afbf3006bf453a
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 11 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo_p.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index d2dc7c4850..a2ac9065fd 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -689,6 +689,7 @@ void qt_qhostinfo_clear_cache() } } +#ifdef QT_BUILD_INTERNAL void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e) { QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager(); @@ -697,6 +698,16 @@ void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e) } } +void qt_qhostinfo_cache_inject(const QString &hostname, const QHostInfo &resolution) +{ + QAbstractHostInfoLookupManager* manager = theHostInfoLookupManager(); + if (!manager || !manager->cache.isEnabled()) + return; + + manager->cache.put(hostname, resolution); +} +#endif + // cache for 60 seconds // cache 128 items QHostInfoCache::QHostInfoCache() : max_age(60), enabled(true), cache(128) diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 74cfe2a9aa..a99c3dc8ca 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -117,6 +117,7 @@ public: QHostInfo Q_NETWORK_EXPORT qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id); void Q_AUTOTEST_EXPORT qt_qhostinfo_clear_cache(); void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e); +void Q_AUTOTEST_EXPORT qt_qhostinfo_cache_inject(const QString &hostname, const QHostInfo &resolution); class QHostInfoCache { |