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

refs #478, CUrl class and moved network utils

Browse Source 
* moved network utils into network folder
* CUrl / CUrlList as DBus/JSON compliant class for locations
* Added support for selsigned certificates in network utils
This commit is contained in:
Klaus Basan
2015-10-14 01:37:23 +02:00
committed by Mathew Sutcliffe
parent dff7ed5a90
commit 19df8a5d71
14 changed files with 840 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_network_impl.cpp
View File

@@ -17,7 +17,7 @@
#include "vatsimmetarreader.h"
#include "airspace_monitor.h"
#include "webdataservices.h"
#include "blackmisc/networkutils.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/simplecommandparser.h"

5
src/blackcore/dbus_server.cpp
View File

@@ -8,12 +8,13 @@
*/
#include "blackmisc/logmessage.h"
#include "blackmisc/networkutils.h"
#include "blackmisc/network/networkutils.h"
#include "dbus_server.h"
#include <QDebug>
#include <QMetaClassInfo>
using namespace BlackMisc;
using namespace BlackMisc::Network;
namespace BlackCore
{
@@ -270,7 +271,7 @@ namespace BlackCore
}
// todo: Replace assert with input validation
Q_ASSERT_X(BlackMisc::CNetworkUtils::isValidIPv4Address(p), "p2pAdress", "Wrong IP in String");
Q_ASSERT_X(CNetworkUtils::isValidIPv4Address(p), "p2pAdress", "Wrong IP in String");
QString p2p = QString("tcp:host=%1,port=%2").arg(h).arg(p);
return p2p;
}