Index: sources/wifi/WifiInterface.h =================================================================== diff -u -r081df84b4b81ab39296f42c3c7e91deb021b8979 -ra39588d07df5f8723abc79115c974965d0cad1e4 --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 081df84b4b81ab39296f42c3c7e91deb021b8979) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision a39588d07df5f8723abc79115c974965d0cad1e4) @@ -68,6 +68,7 @@ QProcess _processSetStaticGateway; QProcess _processSetStaticSubnetMask; QProcess _processSetDNS; + QProcess _processReadNetworkInfo; WifiNetworkData _network; const QString _scriptsFolder = Storage::Scripts_Path_Name; @@ -86,11 +87,12 @@ QString parseSubnetMask(const QString &vOutput); QString parseGateway(const QString &vOutput); QString parseDNS(const QString &vOutput); + QString parseNetworkMacAddress(const QString &vOutput); + QString parseNetworkSSID(const QString &vOutput); void initConnections(); void initThread(QThread &vThread); void quitThread(); bool hasConnectedToWifi(); - WifiNetworkData getLastWifiNetworkConnectedTo(); void rejoinLastWifiNetwork(); QStringList securityTypesToStringList(const QList &securityTypes); QList variantListToSecurityTypes(const QList &securityTypesVar); @@ -104,6 +106,7 @@ void doJoinNetwork (const WifiNetworkData &vNetwork, const QString &vPassword); void doDisconnectNetwork (const WifiNetworkData &vNetwork); void doRequestIPSettings (); + void doRequestNetworkInfo (); // static IP address assignment void doRequestSetIPAddress (const QString &vIPAddress ); @@ -145,6 +148,7 @@ void onProcessFinishedSetGateway (int vExitCode, QProcess::ExitStatus vExitStatus); void onProcessFinishedSetSubnetMask (int vExitCode, QProcess::ExitStatus vExitStatus); void onProcessFinishedSetDNS (int vExitCode, QProcess::ExitStatus vExitStatus); + void onProcessFinishedReadNetworkInfo (int vExitCode, QProcess::ExitStatus vExitStatus); SAFE_CALL(doStart) };