1 files changed, 25 insertions, 20 deletions
diff --git a/src/networkdiscovery.h b/src/networkdiscovery.h
index c45b5aa..1f7bd9d 100644
--- a/src/networkdiscovery.h
+++ b/src/networkdiscovery.h
@@ -21,6 +21,7 @@
 #include "dhcp.h"
 
 
+
 #define DEFAULT_QTSOCKETADDRESS "/var/tmp/qt_c_socket_default"
 //#define DEFAULT_PATHTODHCPCDEXE "/home/niklas/fbgui/customdhcpcd/src/build/cdhcpcd"
 #define DEFAULT_PATHTODHCPCDEXE "/bin/cdhcpcd"
@@ -44,6 +45,8 @@ public:
 	int ip4_setManualConfiguration(QVariantMap result);
 	QString readLogFile();
 	void tryAgain();
+	bool checkConnectivityViaTcp();
+	QVariantMap getInterfaceConfig(QString ifName);
 
 private slots:
 	void handleNewConnection();
@@ -72,26 +75,27 @@ signals:
 
 private:
     QString _tag;
-	QLocalServer *_server;
-	QMap<QLocalSocket *, QLocalSocket *> _clients;
-	QLocalSocket * _client;
-	QMap<QString, QLocalSocket*> _ifNameToClient;
-	QMap<QProcess*, QString> _clientProcessToIfNameMap;
-	QString _pathToDhcpcdExe;
-	QStringList _dhcpcdArguments;
-	int _numberOfProcesses;
-	NetworkManager _networkManager;
-	bool _userChoice;
-	bool _blocked;
-	bool _autoUp;
-	QString _serverIp;
-	QString _pathToLogFile;
-	QList<QString> _ifUpList;
-	QList<QString> _ifDownList;
-	int _ifUpCountdown;
-	QTimer* _timer;
-
-	QMap<QString, interfaceconfiguration*> _ifcMap;
+    QLocalServer *_server;
+    QMap<QLocalSocket*,QLocalSocket*> _clients;
+    QLocalSocket *_client;
+    QMap<QString,QLocalSocket*> _ifNameToClient;
+    QMap<QProcess*,QString> _clientProcessToIfNameMap;
+    QString _pathToDhcpcdExe;
+    QStringList _dhcpcdArguments;
+    int _numberOfProcesses;
+    NetworkManager _networkManager;
+    bool _userChoice;
+    bool _blocked;
+    bool _autoUp;
+    QString _serverIp;
+    QString _pathToLogFile;
+    QList<QString> _ifUpList;
+    QList<QString> _ifDownList;
+    int _ifUpCountdown;
+    QTimer *_timer;
+    QList<Q_PID> _pidsList;
+    QMap<QString,interfaceconfiguration*> _ifcMap;
+    void mainWork();
 
 	void handleNewInput(QLocalSocket * client);
 
@@ -101,6 +105,7 @@ private:
 	bool checkCarrierState(QString interface);
 	bool checkConnectivity(QString ifName);
 	bool checkConnectivityViaTcp(QString server);
+	
 	bool checkBlackList(QString i);
 
 	void getListOfNetworkInterfaces();