From a8087a7c1b83ae7770f2b1c278d0eb5318b7e33e Mon Sep 17 00:00:00 2001 From: Niklas Date: Wed, 28 Sep 2011 17:44:42 +0200 Subject: added a select field to the manual conf gui. also fixed some bugs in the ip4_manualConf function --- LogReceiver/networkdiscovery.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'LogReceiver/networkdiscovery.h') diff --git a/LogReceiver/networkdiscovery.h b/LogReceiver/networkdiscovery.h index 48a6a7e..5e79887 100644 --- a/LogReceiver/networkdiscovery.h +++ b/LogReceiver/networkdiscovery.h @@ -48,8 +48,9 @@ public: QStringList* args = NULL); int replaceDefaultRoute(QString &ifName, QString &gateway, int af, int mss); int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss); + QString getGatewayForInterface(QString ifName); + int ip4_setManualConfiguration(QVariantMap result); - QString getGatewayForInterface(QString); private slots: void handleNewConnection(); @@ -67,6 +68,7 @@ signals: void updateStatusLabel(QString ifName, QString status); void allProcessesFinished(); void continueBoot(QString ifName, int userChoice); + void setManualConfInterfaces(QString jsonArr); private: QLocalServer *server; @@ -93,6 +95,7 @@ private: QListcheckCarrierState(QList &interfaces); bool checkCarrierState(QString interface); bool checkConnectivity(QString ifName); + bool checkConnectivityViaTcp(QString server); QList getListOfNetworkInterfaces(); bool checkBlackList(QString i); -- cgit v1.2.3-55-g7522