From 627bcf0ee7e209ed59394dcec85b2cfacd8ada4b Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 22 Sep 2011 16:47:47 +0200 Subject: added some more js functions. abortBootDialog() and chooseInterfaceDialog() --- LogReceiver/logreceiver.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'LogReceiver/logreceiver.cpp') diff --git a/LogReceiver/logreceiver.cpp b/LogReceiver/logreceiver.cpp index 011d5f3..7f8c7f3 100644 --- a/LogReceiver/logreceiver.cpp +++ b/LogReceiver/logreceiver.cpp @@ -79,6 +79,10 @@ void LogReceiver::initAndRun(QString serverPath, QString pathToExe, } +int LogReceiver::replaceDefaultRoute(QString &ifName, QString &gateway, int af, int mss) { + rm.replaceDefaultRoute(ifName, gateway, mss, AF_INET); +} + QList LogReceiver::getListOfNetworkInterfaces() { QList nIList = QNetworkInterface::allInterfaces(); QList result; @@ -209,7 +213,7 @@ bool LogReceiver::checkConnectivity(QString ifName) { // blockiere jeden weiteren check // emite continueBoot _blocked = true; - emit continueBoot(ifName); + emit continueBoot(ifName, _userChoice); } else { emit connectionEstablished(&ifConf); } @@ -441,7 +445,7 @@ void LogReceiver::handleProcessFinished(int exitCode, QProcess* p = qobject_cast (QObject::sender()); QString ifName = clientProcessToIfNameMap.value(p, "ifName"); - if (!_blocked) { + if (!_blocked) { //_blocked becomes true, if _userChoice is false and we found a usable interface if (ifName.compare("ifName") == 0) { qDebug() << "--- \t [LogReceiver::handleProcessFinished] haven't found process!"; @@ -458,7 +462,7 @@ void LogReceiver::handleProcessFinished(int exitCode, checkConnectivity(ifName); } } - if (!_blocked) { + if (!_blocked) { //_blocked becomes true, if _userChoice is false and we found a usable interface QLocalSocket *client = ifNameToClient.value(ifName, 0); if (client != 0) { handleNewInput(client); -- cgit v1.2.3-55-g7522