From fcb16100b5aa80934c90ddd4a386acb14317f460 Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 27 Sep 2011 17:03:35 +0200 Subject: manual config gui added. put the interfaceconfig map into networkDiscovery and adopted the signals. --- LogReceiver/networkdiscovery.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'LogReceiver/networkdiscovery.h') 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 #include + + #include "interfaceconfiguration.h" #include "networkmanager.h" -//#include -//#include #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 clientProcessToIfNameMap; QString pathToDhcpcdExe; QStringList dhcpcdArguments; - QNetworkConfigurationManager configurationManager; - QNetworkAccessManager *accessManager; int numberOfProcesses; NetworkManager networkManager; bool _userChoice; bool _blocked; + QMap _ifcMap; + void handleNewInput(QLocalSocket * client); void runDHCPCD(QList &interfaces); -- cgit v1.2.3-55-g7522