summaryrefslogtreecommitdiffstats
path: root/LogReceiver/networkdiscovery.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'LogReceiver/networkdiscovery.cpp')
-rw-r--r--LogReceiver/networkdiscovery.cpp30
1 files changed, 8 insertions, 22 deletions
diff --git a/LogReceiver/networkdiscovery.cpp b/LogReceiver/networkdiscovery.cpp
index 7255095..1677573 100644
--- a/LogReceiver/networkdiscovery.cpp
+++ b/LogReceiver/networkdiscovery.cpp
@@ -11,10 +11,11 @@ NetworkDiscovery::~NetworkDiscovery() {
}
-void NetworkDiscovery::initAndRun(QString serverPath, QString pathToExe,
+void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice,QString serverPath, QString pathToExe,
QStringList* args) {
- _userChoice = true;
+ _serverIp = serverIp;
+ _userChoice = userChoice;
_blocked = false;
if (serverPath != DEFAULT_QTSOCKETADDRESS) {
@@ -86,24 +87,8 @@ int NetworkDiscovery::ip4_replaceDefaultRoute(QString ifName, QString gateway, i
}
int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
- //QJson::Parser parser;
- //bool ok;
-
- //QVariantMap result = parser.parse(, &ok);
- //if(!ok) {
- // error
- //return -1;
- //}
QList<QString> dns;
dns.append(result["dns"].toString());
- qDebug() << result["ifname"].toString();
- qDebug() << result["ipaddr"].toString();
- qDebug() << result["netmask"].toString();
- qDebug() << result["broadcast"].toString();
- qDebug() << result["gateway"].toString();
- qDebug() << dns;
-
-
networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
result["ipaddr"].toString(),
result["netmask"].toString(),
@@ -117,12 +102,13 @@ int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
qDebug() << "set man conf. test connectivity";
- if (!checkConnectivityViaTcp(QString("74.125.39.99"))) {
+ if (!checkConnectivityViaTcp(_serverIp)) {
qDebug() << "no connectivity. reset conf.";
interfaceconfiguration * ifc = _ifcMap.value(result["ifname"].toString(), NULL);
if(ifc != NULL) {
- QList<QString> dns = ifc->getDnsservers().trimmed().split(" ");
- networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
+ dns.clear();
+ dns = ifc->getDnsservers().trimmed().split(" ");
+ networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
ifc->getIpAddress(),
ifc->getNetmask(),
ifc->getBroadcast(),
@@ -264,7 +250,7 @@ bool NetworkDiscovery::checkConnectivity(QString ifName) {
qDebug() << networkManager.replaceDefaultRoute(ifName,
ifConf->getGateway(), 0, AF_INET);
- if (checkConnectivityViaTcp("209.85.148.105")) {
+ if (checkConnectivityViaTcp(_serverIp)) {
qDebug() << "internet: check passed! for interface" << ifName;
emit
updateStatusLabel(ifName, "connection possible");