summaryrefslogtreecommitdiffstats
path: root/src/networkdiscovery.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/networkdiscovery.h')
-rw-r--r--src/networkdiscovery.h11
1 files changed, 7 insertions, 4 deletions
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<QString,QLocalSocket*> _ifNameToClient;
QMap<QProcess*,QString> _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<QString> _ifUpList;
QList<QString> _ifDownList;
int _ifUpCountdown;
- QTimer *_timer;
+ QTimer*_timer;
QList<Q_PID> _pidsList;
QMap<QString,interfaceconfiguration*> _ifcMap;
void mainWork();
+ void killDHCPCD();
+
void handleNewInput(QLocalSocket * client);
void runDHCPCD(QList<QString> &interfaces);
void runDHCPCD(QString interface);
bool checkCarrierState(QString interface);
- bool checkConnectivity(QString ifName);
bool checkConnectivityViaTcp(QString server);
bool checkBlackList(QString i);