1 files changed, 5 insertions, 21 deletions
diff --git a/src/fbgui/networkdiscovery.h b/src/fbgui/networkdiscovery.h
index d63ad0b..4f057e0 100644
--- a/src/fbgui/networkdiscovery.h
+++ b/src/fbgui/networkdiscovery.h
@@ -32,13 +32,9 @@
 
 
 #include "dhcp.h"
-
+#include "globals.h"
 #include "../common/fbgui.h"
 
-
-
-#define DEFAULT_PATHTODHCPCDEXE "/bin/cdhcpcd"
-
 class NetworkDiscovery: public QObject
 {
   Q_OBJECT
@@ -47,12 +43,7 @@ public:
   NetworkDiscovery(QObject *parent = 0);
   ~NetworkDiscovery();
 
-  void initAndRun(QString serverIp, bool userChoice,
-                  bool autoUp,
-                  QString pathToLogFile,
-                  QString serverPath = DEFAULT_QTSOCKETADDRESS,
-                  QString pathToExe = DEFAULT_PATHTODHCPCDEXE,
-                  QStringList* args = NULL);
+  void initAndRun(bool userChoice, QStringList* args = NULL);
   int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
   QString getGatewayForInterface(QString ifName);
 
@@ -62,8 +53,9 @@ public:
   void prepareTryAgain();
   bool checkConnectivity(QString ifName);
   bool checkConnectivityViaTcp();
-  QVariantMap getInterfaceConfig(QString ifName);
+  InterfaceConfiguration* getInterfaceConfig(QString ifName);
   QString GetErrorStr();
+  QList<QString> getIfUpList();
 
 public slots:
   void handleNewConnection();
@@ -93,29 +85,23 @@ signals:
   void readyForRun();
 
 private:
-  QString _tag;
   QLocalServer *_server;
   QMap<QLocalSocket*, QLocalSocket*> _clients;
   QLocalSocket *_client;
   QMap<QString, QLocalSocket*> _ifNameToClient;
   QMap<QProcess*, QString> _clientProcessToIfNameMap;
-  QString _serverPath;
-  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;
   QString _errorStr;
-  QMap<QString, interfaceconfiguration*> _ifcMap;
+  QMap<QString, InterfaceConfiguration*> _ifcMap;
   void mainWork();
 
   void killDHCPCD();
@@ -132,8 +118,6 @@ private:
 
   void getListOfNetworkInterfaces();
   void getListOfNetworkInterfacesWithAutoUp();
-
-
 };
 
 #endif // NetworkDiscovery_H