manual config gui added. put the interfaceconfig map into networkDiscovery and adopted the signals.

1 files changed, 9 insertions, 6 deletions

diff --git a/LogReceiver/networkdiscovery.h b/LogReceiver/networkdiscovery.h
index 6efd926..48a6a7e 100644
--- a/LogReceiver/networkdiscovery.h
+++ b/LogReceiver/networkdiscovery.h
@@ -13,10 +13,10 @@
 #include <syslog.h>
 #include <sysfs/libsysfs.h>
 
+
+
 #include "interfaceconfiguration.h"
 #include "networkmanager.h"
-//#include <qlocalserver.h>
-//#include <qlocalsocket.h>
 #include "status.h"
 #include "dhcp.h"
 #include "interface.h"
@@ -47,6 +47,9 @@ public:
 			QString pathToExe = DEFAULT_PATHTODHCPCDEXE,
 			QStringList* args = NULL);
 	int replaceDefaultRoute(QString &ifName, QString &gateway, int af, int mss);
+	int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
+	int ip4_setManualConfiguration(QVariantMap result);
+	QString getGatewayForInterface(QString);
 
 private slots:
 	void handleNewConnection();
@@ -59,11 +62,11 @@ private slots:
 signals:
     void addInterface(const QString &ifName);
     void changeProgressBarValue(const QString & ifName, const int $newValue);
-    void connectionEstablished(interfaceconfiguration *ifConf);
+    void connectionEstablished(QString ifName);
     void abortBoot(QString msg);
     void updateStatusLabel(QString ifName, QString status);
     void allProcessesFinished();
-    void continueBoot(QString ifName, bool userChoice);
+    void continueBoot(QString ifName, int userChoice);
 
 private:
 	QLocalServer *server;
@@ -76,13 +79,13 @@ private:
 	QMap<QProcess*, QString> clientProcessToIfNameMap;
 	QString pathToDhcpcdExe;
 	QStringList dhcpcdArguments;
-	QNetworkConfigurationManager configurationManager;
-	QNetworkAccessManager *accessManager;
 	int numberOfProcesses;
 	NetworkManager networkManager;
 	bool _userChoice;
 	bool _blocked;
 
+	QMap<QString, interfaceconfiguration*> _ifcMap;
+
 	void handleNewInput(QLocalSocket * client);
 
 	void runDHCPCD(QList<QString> &interfaces);