From b92a0317173140f4765cbc7708121add810b54cb Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 27 Oct 2011 23:12:30 +0200 Subject: changed the tryout, also some big changes in program flow. there is now userchoice page anymore. also it is now possible to press the user choice button f5 all the time. --- src/networkdiscovery.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/networkdiscovery.h') diff --git a/src/networkdiscovery.h b/src/networkdiscovery.h index d49bc19..3256ced 100644 --- a/src/networkdiscovery.h +++ b/src/networkdiscovery.h @@ -44,6 +44,7 @@ public: int ip4_setManualConfiguration(QVariantMap result); QString readLogFile(); void tryAgain(); + bool checkConnectivity(QString ifName); bool checkConnectivityViaTcp(); QVariantMap getInterfaceConfig(QString ifName); @@ -68,7 +69,7 @@ signals: void updateIfStatus(QString ifName, QString status); void updateStatus(QString status); void allProcessesFinished(); - void continueBoot(QString ifName, int userChoice); + void continueBoot(QString ifName); void setManualConfInterfaces(QString jsonArr); void readyForRun(); @@ -80,10 +81,11 @@ private: QLocalSocket *_client; QMap _ifNameToClient; QMap _clientProcessToIfNameMap; + QString _serverPath; QString _pathToDhcpcdExe; QStringList _dhcpcdArguments; int _numberOfProcesses; - NetworkManager _networkManager; + NetworkManager* _networkManager; bool _userChoice; bool _blocked; bool _autoUp; @@ -92,18 +94,19 @@ private: QList _ifUpList; QList _ifDownList; int _ifUpCountdown; - QTimer *_timer; + QTimer*_timer; QList _pidsList; QMap _ifcMap; void mainWork(); + void killDHCPCD(); + void handleNewInput(QLocalSocket * client); void runDHCPCD(QList &interfaces); void runDHCPCD(QString interface); bool checkCarrierState(QString interface); - bool checkConnectivity(QString ifName); bool checkConnectivityViaTcp(QString server); bool checkBlackList(QString i); -- cgit v1.2.3-55-g7522