Commit 48414159 authored by Brett Stottlemyer's avatar Brett Stottlemyer
Browse files

Revert "Allow the user ot listen on all addresses on a free port."

This reverts commit 9f2c918c

, which
was committed before it passed all unit tests.  Reverting to address
those tests.

Change-Id: If0034716e317bd6f4b1b7ed2563e7981b05cf71f
Reviewed-by: default avatarContinuous Integration (KDAB) <build@kdab.com>
Reviewed-by: default avatarAllen Winter <allen.winter@kdab.com>
Reviewed-by: default avatarGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Showing with 7 additions and 9 deletions
......@@ -185,16 +185,14 @@ QUrl TcpServerImpl::address() const
bool TcpServerImpl::listen(const QUrl &address)
{
QHostAddress host(address.host());
if (host.isNull())
host = QHostAddress::Any;
bool ret = m_server.listen(host, address.port());
if (ret) {
m_originalUrl.setScheme(QLatin1String("tcp"));
m_originalUrl.setHost(m_server.serverAddress().toString());
m_originalUrl.setPort(m_server.serverPort());
if (host.isNull()) {
const QList<QHostAddress> addresses = QHostInfo::fromName(address.host()).addresses();;
Q_ASSERT(addresses.size() >= 1);
host = addresses.first();
m_originalUrl = address;
}
return ret;
return m_server.listen(host, address.port());
}
QAbstractSocket::SocketError TcpServerImpl::serverError() const
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment