1 files changed, 79 insertions, 75 deletions

diff --git a/src/fbgui/networkdiscovery.h b/src/fbgui/networkdiscovery.h
index 4f057e0..f98566f 100644
--- a/src/fbgui/networkdiscovery.h
+++ b/src/fbgui/networkdiscovery.h
@@ -11,8 +11,6 @@
  * General information about OpenSLX can be found under http://openslx.org
  */
 
-
-
 #ifndef NetworkDiscovery_H
 #define NetworkDiscovery_H
 
@@ -30,94 +28,100 @@
 #include "interfaceconfiguration.h"
 #include "networkmanager.h"
 
-
 #include "dhcp.h"
 #include "globals.h"
 #include "../common/fbgui.h"
 
-class NetworkDiscovery: public QObject
-{
-  Q_OBJECT
+class NetworkDiscovery: public QObject {
+Q_OBJECT
 
 public:
-  NetworkDiscovery(QObject *parent = 0);
-  ~NetworkDiscovery();
-
-  void initAndRun(bool userChoice, QStringList* args = NULL);
-  int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
-  QString getGatewayForInterface(QString ifName);
-
-  int ip4_setManualConfiguration(QVariantMap result);
-  QString readLogFile();
-  void tryAgain();
-  void prepareTryAgain();
-  bool checkConnectivity(QString ifName);
-  bool checkConnectivityViaTcp();
-  InterfaceConfiguration* getInterfaceConfig(QString ifName);
-  QString GetErrorStr();
-  QList<QString> getIfUpList();
+	NetworkDiscovery(QObject *parent = 0);
+	~NetworkDiscovery();
+
+	void initAndRun(bool userChoice, QStringList* args = NULL);
+	int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
+
+
+	int ip4_setManualConfiguration(QVariantMap result);
+	void tryAgain();
+	void prepareTryAgain();
+	bool checkConnectivity(QString ifName);
+	bool checkConnectivityViaTcp();
+
+	// Public member access
+	QList<QString> getIfUpList();
+	InterfaceConfiguration* getInterfaceConfig(QString ifName);
+	QString GetErrorStr();
+
+	QString getGatewayForInterface(QString ifName);
+
 
 public slots:
-  void handleNewConnection();
-  void handleNewInput();
-  void handleNewInputLine(QLocalSocket * client, QString data);
-  void handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
-  void handleProcessStarted();
-  void handleClientDisconnect();
 
-  void slotReadyForRun();
+	void checkForIsRunning();
+
+	void handleNewConnection();
+	void handleClientDisconnect();
 
-  void checkForIsRunning();
+	void handleNewInput();
+	void handleNewInputLine(QLocalSocket * client, QString data);
 
+	void handleProcessStarted();
+	void handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
+
+	void readyForRun();
 
 signals:
-  void addInterface(const QString &ifName);
-  void changeProgressBarValue(const QString & ifName, const int $newValue);
-  void connectionEstablished(QString ifName);
-  void abortBoot(QString msg);
-  void updateIfStatus(QString ifName, QString status);
-  void updateStatus(QString status);
-  void allProcessesFinished();
-  void continueBoot(QString ifName);
-  void continueBootWithoutCheck(QString ifName);
-  void setManualConfInterfaces(QString jsonArr);
-
-  void readyForRun();
+	void addInterface(const QString &ifName);
+	void changeProgressBarValue(const QString & ifName, const int $newValue);
+	void connectionEstablished(QString ifName);
+	void abortBoot(QString msg);
+	void updateIfStatus(QString ifName, QString status);
+	void updateStatus(QString status);
+	void allProcessesFinished();
+	void continueBoot(QString ifName);
+	void continueBootWithoutCheck(QString ifName);
+	void setManualConfInterfaces(QString jsonArr);
+
+	//void readyForRun();
 
 private:
-  QLocalServer *_server;
-  QMap<QLocalSocket*, QLocalSocket*> _clients;
-  QLocalSocket *_client;
-  QMap<QString, QLocalSocket*> _ifNameToClient;
-  QMap<QProcess*, QString> _clientProcessToIfNameMap;
-  QStringList _dhcpcdArguments;
-  int _numberOfProcesses;
-  NetworkManager* _networkManager;
-  bool _userChoice;
-  bool _blocked;
-  QList<QString> _ifUpList;
-  QList<QString> _ifDownList;
-  int _ifUpCountdown;
-  QTimer*_timer;
-  QList<Q_PID> _pidsList;
-  QString _errorStr;
-  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 checkConnectivityViaTcp(QString server);
-
-  bool checkBlackList(QString i);
-
-  void getListOfNetworkInterfaces();
-  void getListOfNetworkInterfacesWithAutoUp();
+
+	void mainWork();
+
+	void killDHCPCD();
+
+	void handleNewInput(QLocalSocket * client);
+
+	void runDHCPCD(QList<QString> &interfaces);
+	void runDHCPCD(QString interface);
+
+	bool checkCarrierState(QString interface);
+	bool checkConnectivityViaTcp(QString server);
+
+	bool checkBlackList(QString i);
+
+	void getListOfNetworkInterfaces();
+	void getListOfNetworkInterfacesWithAutoUp();
+
+	QLocalServer *_server;
+	QMap<QLocalSocket*, QLocalSocket*> _clients;
+	QLocalSocket *_client;
+	QMap<QString, QLocalSocket*> _ifNameToClient;
+	QMap<QProcess*, QString> _clientProcessToIfNameMap;
+	QStringList _dhcpcdArguments;
+	int _numberOfProcesses;
+	NetworkManager* _networkManager;
+	bool _userChoice;
+	bool _blocked;
+	QList<QString> _ifUpList;
+	QList<QString> _ifDownList;
+	int _ifUpCountdown;
+	QTimer*_timer;
+	QList<Q_PID> _pidsList;
+	QString _errorStr;
+	QMap<QString, InterfaceConfiguration*> _ifcMap;
 };
 
 #endif // NetworkDiscovery_H