+ add CurrentWiFi method

+ add support of pid files with interface name to provide compability
with netctl module
* change default wpa_sup ctrl paths
* optimization of wifi calls
This commit is contained in:
arcan1s
2015-03-10 00:52:45 +03:00
parent 362a11f0bc
commit 19976819a1
16 changed files with 183 additions and 76 deletions

View File

@ -42,6 +42,10 @@ class NetctlProfile;
* profile description
* @var netctlProfileInfo::essid
* ESSID if any
* @var netctlProfileInfo::interface
* profile interface
* @var netctlProfileInfo::type
* profile type
* @var netctlProfileInfo::active
* whether profile is active
* @var netctlProfileInfo::enabled
@ -52,8 +56,10 @@ typedef struct
QString name;
QString description;
QString essid;
bool active;
bool enabled;
QString interface;
QString type;
bool active = false;
bool enabled = false;
} netctlProfileInfo;
/**

View File

@ -81,8 +81,8 @@ typedef struct
QString security;
int signal;
PointType type = PointType::None;
bool active;
bool exists;
bool active = false;
bool exists = false;
} netctlWifiInfo;
/**
@ -141,6 +141,11 @@ public:
public slots:
// functions
/**
* @brief method which returns active point information
* @return current point information
*/
netctlWifiInfo current();
/**
* @brief method which scans WiFi networks
* @return list of essids
@ -177,17 +182,17 @@ private:
*/
bool useSuid = true;
/**
* @brief path to ctrl_directory. Defaults is "/run/wpa_supplicant_netctl-gui"
* @brief path to ctrl_directory. Defaults is "/run/wpa_supplicant"
*/
QString ctrlDir = QString("/run/wpa_supplicant_netctl-gui");
QString ctrlDir = QString("/run/wpa_supplicant");
/**
* @brief group which is owner of CTRL_DIR. Default is "users"
*/
QString ctrlGroup = QString("users");
/**
* @brief wpa_supplicant PID file. Default is "/run/wpa_supplicant_netctl-gui.pid"
* @brief wpa_supplicant PID file. $i is interface. Default is "/run/wpa_supplicant_$i.pid"
*/
QString pidFile = QString("/run/wpa_supplicant_netctl-gui.pid");
QString pidFile = QString("/run/wpa_supplicant_$i.pid");
/**
* @brief path to sudo command. Default is "/usr/bin/kdesu"
*/