flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 08:36:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #485, improved p2p address handling

Browse Source
This commit is contained in:
Klaus Basan
2016-02-15 00:07:03 +01:00
committed by Mathew Sutcliffe
parent 7a38afe8c3
commit 41a88266ab
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/dbusserver.cpp
View File

@@ -291,17 +291,34 @@ namespace BlackMisc
QString CDBusServer::p2pAddress(const QString &host, const QString &port)
{
QString h = host.isEmpty() ? "127.0.0.1" : host.trimmed();
QString p = port;
QString h = host.trimmed().toLower().remove(' ');
if (h.isEmpty()) { h = "127.0.0.1"; }
// check port
bool ok = false;
QString p = port.toLower().trimmed();
if (!p.isEmpty())
{
p.toInt(&ok);
if (!ok)
{
p = ""; // was not a number
}
}
// can handle host and port separately or combined, e.g. "myhost:1234"
if (port.isEmpty())
{
if (h.startsWith("tcp:") && h.contains("host=") && h.contains("port="))
{
// looks we already got a full string
return h;
}
// 192.168.5.3:9300 style
if (h.contains(":"))
{
QStringList parts = h.split(":");
// todo: Replace assert with input validation
Q_ASSERT_X(parts.length() == 2, "p2pAdress", "Wrong IP string split");
h = parts.at(0).trimmed();
p = parts.at(1).trimmed();
}
@@ -318,7 +335,16 @@ namespace BlackMisc
QString CDBusServer::normalizeAddress(const QString &address)
{
if (address.isEmpty() || address == sessionBusAddress() || address == systemBusAddress()) { return address; }
QString lc(address.toLower().trimmed());
if (lc.isEmpty()) { return sessionBusAddress(); }
if (lc == sessionBusAddress() || lc == systemBusAddress()) { return lc; }
// some aliases
if (lc.startsWith("sys")) { return systemBusAddress(); }
if (lc.startsWith("ses")) { return sessionBusAddress(); }
// Qt / p2p
if (isQtDBusAddress(address)) { return address; }
return p2pAddress(address);
}

5
src/blackmisc/dbusserver.h
View File

@@ -85,9 +85,12 @@ namespace BlackMisc
//! Address denoting a P2P server at the given host and port.
//! \remarks Port number may be embedding in the host string after a colon.
static QString p2pAddress(const QString &host = "127.0.0.1", const QString &port = "");
//! \return p2p address like "tcp:host=foo.bar.com,port=1234"
static QString p2pAddress(const QString &host, const QString &port = "");
//! Turn something like 127.0.0.1:45000 into "tcp:host=127.0.0.1,port=45000"
//! \note Handles also "session" and "system" as valid address while CDBusServer::p2pAddress is for
//! P2P addresses only.
static QString normalizeAddress(const QString &address);
//! Return the server mode of the given address