diff options
author | Niklas | 2011-10-21 13:11:40 +0200 |
---|---|---|
committer | Niklas | 2011-10-21 13:11:40 +0200 |
commit | 951db8ebf3f95ec6252f170bef7d3294b7bd6bc8 (patch) | |
tree | 5ee65f0cc4bf16470f32121b819ff1db96182b33 /src/networkdiscovery.h | |
parent | put the NetworkDiscovery code into the src folder of the fbgui. made some tes... (diff) | |
download | fbgui-951db8ebf3f95ec6252f170bef7d3294b7bd6bc8.tar.gz fbgui-951db8ebf3f95ec6252f170bef7d3294b7bd6bc8.tar.xz fbgui-951db8ebf3f95ec6252f170bef7d3294b7bd6bc8.zip |
now the two versions of the NetworkDiscovery code should be the same (except for the qDebug...)
Diffstat (limited to 'src/networkdiscovery.h')
-rw-r--r-- | src/networkdiscovery.h | 45 |
1 files changed, 25 insertions, 20 deletions
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<QLocalSocket *, QLocalSocket *> _clients; - QLocalSocket * _client; - QMap<QString, QLocalSocket*> _ifNameToClient; - QMap<QProcess*, QString> _clientProcessToIfNameMap; - 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; - - QMap<QString, interfaceconfiguration*> _ifcMap; + QLocalServer *_server; + QMap<QLocalSocket*,QLocalSocket*> _clients; + QLocalSocket *_client; + QMap<QString,QLocalSocket*> _ifNameToClient; + QMap<QProcess*,QString> _clientProcessToIfNameMap; + 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; + QMap<QString,interfaceconfiguration*> _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(); |