Index: sources/wifi/WifiInterface.h =================================================================== diff -u -rf35b360054e1e2fa81bf107427fe2d50d78e9e8a -r3403122944ec8f31dfd33b387e21204783579f60 --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision f35b360054e1e2fa81bf107427fe2d50d78e9e8a) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 3403122944ec8f31dfd33b387e21204783579f60) @@ -32,6 +32,13 @@ int _scanTimeout = 30000; int _processCounter = 0; QProcess _processScan; + QProcess _processReadIPSettings; + QProcess _processReadGateway; + QProcess _processReadDNS; + QProcess _processGenerateWPASupplicant; + QProcess _processStartWPASupplicant; + QProcess _processRequestAutoAssignedIP; + Network _network; const QString _iface = "wlan0"; const QString _wpaSupplicantConfPath = "/etc/wpa_supplicant.conf"; @@ -41,15 +48,9 @@ SINGLETON(WifiInterface) private: -// QFutureWatcher _scanWatcher; - bool generateWPASupplicant(const Network &vNetwork, const QString &vPassword); bool startWPASupplicant(); bool requestAutoAssignedIP(int vTries = 4); - Network::IPSettings getIPSettings(); - QString readIPSettings(); - QString readGateway(); - QString readDNS(); QString parseIP(const QString &vOutput); QString parseBroadcast(const QString &vOutput); QString parseSubnetMask(const QString &vOutput); @@ -77,7 +78,6 @@ void didDisconnectNetwork(const Network); void didGetIPSettings(const Network::IPSettings); void didRequestScan(); - void didScan(); // emitted from separate threads void didScanStatusChanged(const bool); @@ -88,6 +88,12 @@ void onQuit(); void onParseWifiScan(const QString &vOutput); void onLogFailure(const QString &vMessage); - void onScanFinished(int vExitCode, QProcess::ExitStatus vExitStatus); - void onScan(); + void onProcessFinishedScan(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedReadIP(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedReadGateway(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedReadDNS(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedGenerateWPASupplicant(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedStartWPASupplicant(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedRequestAutoAssignedIP(int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedDisconnectNetwork(int vExitCode, QProcess::ExitStatus vExitStatus); };