From 951db8ebf3f95ec6252f170bef7d3294b7bd6bc8 Mon Sep 17 00:00:00 2001 From: Niklas Date: Fri, 21 Oct 2011 13:11:40 +0200 Subject: now the two versions of the NetworkDiscovery code should be the same (except for the qDebug...) --- src/networkdiscovery.h | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'src/networkdiscovery.h') diff --git a/src/networkdiscovery.h b/src/networkdiscovery.h index c45b5aa..1f7bd9d 100644 --- a/src/networkdiscovery.h +++ b/src/networkdiscovery.h @@ -21,6 +21,7 @@ #include "dhcp.h" + #define DEFAULT_QTSOCKETADDRESS "/var/tmp/qt_c_socket_default" //#define DEFAULT_PATHTODHCPCDEXE "/home/niklas/fbgui/customdhcpcd/src/build/cdhcpcd" #define DEFAULT_PATHTODHCPCDEXE "/bin/cdhcpcd" @@ -44,6 +45,8 @@ public: int ip4_setManualConfiguration(QVariantMap result); QString readLogFile(); void tryAgain(); + bool checkConnectivityViaTcp(); + QVariantMap getInterfaceConfig(QString ifName); private slots: void handleNewConnection(); @@ -72,26 +75,27 @@ signals: private: QString _tag; - QLocalServer *_server; - QMap _clients; - QLocalSocket * _client; - QMap _ifNameToClient; - QMap _clientProcessToIfNameMap; - QString _pathToDhcpcdExe; - QStringList _dhcpcdArguments; - int _numberOfProcesses; - NetworkManager _networkManager; - bool _userChoice; - bool _blocked; - bool _autoUp; - QString _serverIp; - QString _pathToLogFile; - QList _ifUpList; - QList _ifDownList; - int _ifUpCountdown; - QTimer* _timer; - - QMap _ifcMap; + QLocalServer *_server; + QMap _clients; + QLocalSocket *_client; + QMap _ifNameToClient; + QMap _clientProcessToIfNameMap; + QString _pathToDhcpcdExe; + QStringList _dhcpcdArguments; + int _numberOfProcesses; + NetworkManager _networkManager; + bool _userChoice; + bool _blocked; + bool _autoUp; + QString _serverIp; + QString _pathToLogFile; + QList _ifUpList; + QList _ifDownList; + int _ifUpCountdown; + QTimer *_timer; + QList _pidsList; + QMap _ifcMap; + void mainWork(); void handleNewInput(QLocalSocket * client); @@ -101,6 +105,7 @@ private: bool checkCarrierState(QString interface); bool checkConnectivity(QString ifName); bool checkConnectivityViaTcp(QString server); + bool checkBlackList(QString i); void getListOfNetworkInterfaces(); -- cgit v1.2.3-55-g7522