sadmen
/
dragonpilot
mirror of https://github.com/dragonpilot-community/dragonpilot.git
1
0
Fork 0
Code Issues 6 Packages Projects Releases Wiki Activity

Wait for adapter to setup WifiManager (#21432)

Browse Source 
* wait for adapter to initialize wifimanager

* clean up

* formatting

* don't try to use adapter when not available

* Revert "don't try to use adapter when not available"

This reverts commit 3887fc87ebfea2e8acc6b440b4c7a49b0feb1975.

* only tetheringEnabled for now

* request scan once adapter is up (prev behavior)

* populate introspection cache when we need it

populate introspection cache when we need it
pull/214/head
sshane 4 years ago committed by GitHub
parent 9b9a2d7b89
commit 924e8d5c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      selfdrive/ui/qt/offroad/networking.cc
  2. 4
      selfdrive/ui/qt/offroad/networking.h
  3. 99
      selfdrive/ui/qt/offroad/wifiManager.cc
  4. 5
      selfdrive/ui/qt/offroad/wifiManager.h

44
selfdrive/ui/qt/offroad/networking.cc
Unescape View File

@ -26,26 +26,7 @@ void NetworkStrengthWidget::paintEvent(QPaintEvent* event) {
Networking::Networking(QWidget* parent, bool show_advanced) : QWidget(parent), show_advanced(show_advanced) { Networking::Networking(QWidget* parent, bool show_advanced) : QWidget(parent), show_advanced(show_advanced) {
main_layout = new QStackedLayout(this); main_layout = new QStackedLayout(this);
QLabel* warning = new QLabel("Network manager is inactive!"); wifi = new WifiManager(this);
warning->setAlignment(Qt::AlignCenter);
warning->setStyleSheet(R"(font-size: 65px;)");
main_layout->addWidget(warning);
QTimer* timer = new QTimer(this);
QObject::connect(timer, &QTimer::timeout, this, &Networking::requestScan);
timer->start(5000);
attemptInitialization();
}
void Networking::attemptInitialization() {
// Checks if network manager is active
try {
wifi = new WifiManager(this);
} catch (std::exception &e) {
return;
}
connect(wifi, &WifiManager::wrongPassword, this, &Networking::wrongPassword); connect(wifi, &WifiManager::wrongPassword, this, &Networking::wrongPassword);
connect(wifi, &WifiManager::refreshSignal, this, &Networking::refresh); connect(wifi, &WifiManager::refreshSignal, this, &Networking::refresh);
@ -66,7 +47,6 @@ void Networking::attemptInitialization() {
wifiWidget->setObjectName("wifiWidget"); wifiWidget->setObjectName("wifiWidget");
connect(wifiWidget, &WifiUI::connectToNetwork, this, &Networking::connectToNetwork); connect(wifiWidget, &WifiUI::connectToNetwork, this, &Networking::connectToNetwork);
vlayout->addWidget(new ScrollView(wifiWidget, this), 1); vlayout->addWidget(new ScrollView(wifiWidget, this), 1);
main_layout->addWidget(wifiScreen); main_layout->addWidget(wifiScreen);
an = new AdvancedNetworking(this, wifi); an = new AdvancedNetworking(this, wifi);
@ -89,29 +69,11 @@ void Networking::attemptInitialization() {
} }
)"); )");
main_layout->setCurrentWidget(wifiScreen); main_layout->setCurrentWidget(wifiScreen);
ui_setup_complete = true;
wifi->requestScan();
}
void Networking::requestScan() {
if (!this->isVisible()) {
return;
}
if (!ui_setup_complete) {
attemptInitialization();
if (!ui_setup_complete) {
return;
}
}
wifi->requestScan();
} }
void Networking::refresh() { void Networking::refresh() {
if (this->isVisible() || firstRefresh) { wifiWidget->refresh();
wifiWidget->refresh(); an->refresh();
an->refresh();
firstRefresh = false;
}
} }
void Networking::connectToNetwork(const Network &n) { void Networking::connectToNetwork(const Network &n) {

4
selfdrive/ui/qt/offroad/networking.h
Unescape View File

@ -67,14 +67,10 @@ private:
QStackedLayout* main_layout = nullptr; // nm_warning, wifiScreen, advanced QStackedLayout* main_layout = nullptr; // nm_warning, wifiScreen, advanced
QWidget* wifiScreen = nullptr; QWidget* wifiScreen = nullptr;
AdvancedNetworking* an = nullptr; AdvancedNetworking* an = nullptr;
bool ui_setup_complete = false;
bool show_advanced; bool show_advanced;
bool firstRefresh = true;
WifiUI* wifiWidget; WifiUI* wifiWidget;
WifiManager* wifi = nullptr; WifiManager* wifi = nullptr;
void attemptInitialization();
void requestScan();
public slots: public slots:
void refresh(); void refresh();

99
selfdrive/ui/qt/offroad/wifiManager.cc
Unescape View File

@ -41,6 +41,7 @@ const QString nm_service = "org.freedesktop.NetworkManager";
const int state_connected = 100; const int state_connected = 100;
const int state_need_auth = 60; const int state_need_auth = 60;
const int device_type_wifi = 2;
const int reason_wrong_password = 8; const int reason_wrong_password = 8;
const int dbus_timeout = 100; const int dbus_timeout = 100;
@ -69,13 +70,31 @@ WifiManager::WifiManager(QWidget* parent) : QWidget(parent) {
qDBusRegisterMetaType<Connection>(); qDBusRegisterMetaType<Connection>();
qDBusRegisterMetaType<IpConfig>(); qDBusRegisterMetaType<IpConfig>();
connecting_to_network = ""; connecting_to_network = "";
adapter = get_adapter();
bool has_adapter = adapter != ""; // Set tethering ssid as "weedle" + first 4 characters of a dongle id
if (!has_adapter) { tethering_ssid = "weedle";
throw std::runtime_error("Error connecting to NetworkManager"); std::string bytes = Params().get("DongleId");
if (bytes.length() >= 4) {
tethering_ssid += "-" + QString::fromStdString(bytes.substr(0,4));
} }
adapter = getAdapter();
if (!adapter.isEmpty()) {
setup();
} else {
bus.connect(nm_service, nm_path, nm_iface, "DeviceAdded", this, SLOT(deviceAdded(QDBusObjectPath)));
}
QTimer* timer = new QTimer(this);
QObject::connect(timer, &QTimer::timeout, this, [=]() {
if (!adapter.isEmpty() && this->isVisible()) {
requestScan();
}
});
timer->start(5000);
}
void WifiManager::setup() {
QDBusInterface nm(nm_service, adapter, device_iface, bus); QDBusInterface nm(nm_service, adapter, device_iface, bus);
bus.connect(nm_service, adapter, device_iface, "StateChanged", this, SLOT(stateChange(unsigned int, unsigned int, unsigned int))); bus.connect(nm_service, adapter, device_iface, "StateChanged", this, SLOT(stateChange(unsigned int, unsigned int, unsigned int)));
bus.connect(nm_service, adapter, props_iface, "PropertiesChanged", this, SLOT(propertyChange(QString, QVariantMap, QStringList))); bus.connect(nm_service, adapter, props_iface, "PropertiesChanged", this, SLOT(propertyChange(QString, QVariantMap, QStringList)));
@ -87,18 +106,7 @@ WifiManager::WifiManager(QWidget* parent) : QWidget(parent) {
device_props.setTimeout(dbus_timeout); device_props.setTimeout(dbus_timeout);
QDBusMessage response = device_props.call("Get", device_iface, "State"); QDBusMessage response = device_props.call("Get", device_iface, "State");
raw_adapter_state = get_response<uint>(response); raw_adapter_state = get_response<uint>(response);
requestScan();
// Set tethering ssid as "weedle" + first 4 characters of a dongle id
tethering_ssid = "weedle";
std::string bytes = Params().get("DongleId");
if (bytes.length() >= 4) {
tethering_ssid+="-"+QString::fromStdString(bytes.substr(0,4));
}
// Create dbus interface for tethering button. This populates the introspection cache,
// making sure all future creations are non-blocking
// https://bugreports.qt.io/browse/QTBUG-14485
QDBusInterface(nm_service, nm_settings_path, nm_settings_iface, bus);
} }
void WifiManager::refreshNetworks() { void WifiManager::refreshNetworks() {
@ -295,6 +303,13 @@ void WifiManager::forgetConnection(const QString &ssid) {
} }
} }
bool WifiManager::isWirelessAdapter(const QDBusObjectPath &path) {
QDBusInterface device_props(nm_service, path.path(), props_iface, bus);
device_props.setTimeout(dbus_timeout);
const uint deviceType = get_response<uint>(device_props.call("Get", device_iface, "DeviceType"));
return deviceType == device_type_wifi;
}
void WifiManager::requestScan() { void WifiManager::requestScan() {
QDBusInterface nm(nm_service, adapter, wireless_device_iface, bus); QDBusInterface nm(nm_service, adapter, wireless_device_iface, bus);
nm.setTimeout(dbus_timeout); nm.setTimeout(dbus_timeout);
@ -335,36 +350,17 @@ unsigned int WifiManager::get_ap_strength(const QString &network_path) {
return get_response<unsigned int>(response); return get_response<unsigned int>(response);
} }
QString WifiManager::get_adapter() { QString WifiManager::getAdapter() {
QDBusInterface nm(nm_service, nm_path, nm_iface, bus); QDBusInterface nm(nm_service, nm_path, nm_iface, bus);
nm.setTimeout(dbus_timeout); nm.setTimeout(dbus_timeout);
QDBusMessage response = nm.call("GetDevices"); const QDBusReply<QList<QDBusObjectPath>> &response = nm.call("GetDevices");
QVariant first = response.arguments().at(0); for (const QDBusObjectPath &path : response.value()) {
if (isWirelessAdapter(path)) {
QString adapter_path = ""; return path.path();
const QDBusArgument &args = first.value<QDBusArgument>();
args.beginArray();
while (!args.atEnd()) {
QDBusObjectPath path;
args >> path;
// Get device type
QDBusInterface device_props(nm_service, path.path(), props_iface, bus);
device_props.setTimeout(dbus_timeout);
QDBusMessage response = device_props.call("Get", device_iface, "DeviceType");
uint device_type = get_response<uint>(response);
if (device_type == 2) { // Wireless
adapter_path = path.path();
break;
} }
} }
args.endArray(); return "";
return adapter_path;
} }
void WifiManager::stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason) { void WifiManager::stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason) {
@ -388,12 +384,19 @@ void WifiManager::propertyChange(const QString &interface, const QVariantMap &pr
knownConnections = listConnections(); knownConnections = listConnections();
} }
if (this->isVisible()) { if (this->isVisible()) {
refreshNetworks(); // TODO: only refresh on first scan, then use AccessPointAdded and Removed signals refreshNetworks();
emit refreshSignal(); emit refreshSignal();
} }
} }
} }
void WifiManager::deviceAdded(const QDBusObjectPath &path) {
if (isWirelessAdapter(path) && (adapter.isEmpty() || adapter == "/")) {
adapter = path.path();
setup();
}
}
void WifiManager::connectionRemoved(const QDBusObjectPath &path) { void WifiManager::connectionRemoved(const QDBusObjectPath &path) {
knownConnections.remove(path); knownConnections.remove(path);
} }
@ -442,10 +445,9 @@ void WifiManager::activateWifiConnection(const QString &ssid) {
const QDBusObjectPath &path = getConnectionPath(ssid); const QDBusObjectPath &path = getConnectionPath(ssid);
if (!path.path().isEmpty()) { if (!path.path().isEmpty()) {
connecting_to_network = ssid; connecting_to_network = ssid;
QString devicePath = get_adapter();
QDBusInterface nm3(nm_service, nm_path, nm_iface, bus); QDBusInterface nm3(nm_service, nm_path, nm_iface, bus);
nm3.setTimeout(dbus_timeout); nm3.setTimeout(dbus_timeout);
nm3.call("ActivateConnection", QVariant::fromValue(path), QVariant::fromValue(QDBusObjectPath(devicePath)), QVariant::fromValue(QDBusObjectPath("/"))); nm3.call("ActivateConnection", QVariant::fromValue(path), QVariant::fromValue(QDBusObjectPath(adapter)), QVariant::fromValue(QDBusObjectPath("/")));
} }
} }
@ -494,8 +496,13 @@ void WifiManager::disableTethering() {
} }
bool WifiManager::tetheringEnabled() { bool WifiManager::tetheringEnabled() {
QString active_ap = get_active_ap(); if (adapter != "" && adapter != "/") {
return get_property(active_ap, "Ssid") == tethering_ssid; QString active_ap = get_active_ap();
if (active_ap != "" && active_ap != "/") {
return get_property(active_ap, "Ssid") == tethering_ssid;
}
}
return false;
} }
void WifiManager::changeTetheringPassword(const QString &newPassword) { void WifiManager::changeTetheringPassword(const QString &newPassword) {

5
selfdrive/ui/qt/offroad/wifiManager.h
Unescape View File

@ -62,7 +62,8 @@ private:
QString tethering_ssid; QString tethering_ssid;
QString tetheringPassword = "swagswagcommma"; QString tetheringPassword = "swagswagcommma";
QString get_adapter(); QString getAdapter();
bool isWirelessAdapter(const QDBusObjectPath &path);
QString get_ipv4_address(); QString get_ipv4_address();
QList<Network> get_networks(); QList<Network> get_networks();
void connect(const QByteArray &ssid, const QString &username, const QString &password, SecurityType security_type); void connect(const QByteArray &ssid, const QString &username, const QString &password, SecurityType security_type);
@ -76,6 +77,7 @@ private:
QDBusObjectPath getConnectionPath(const QString &ssid); QDBusObjectPath getConnectionPath(const QString &ssid);
QMap<QDBusObjectPath, QString> listConnections(); QMap<QDBusObjectPath, QString> listConnections();
QString getConnectionSsid(const QDBusObjectPath &path); QString getConnectionSsid(const QDBusObjectPath &path);
void setup();
signals: signals:
void wrongPassword(const QString &ssid); void wrongPassword(const QString &ssid);
@ -84,6 +86,7 @@ signals:
private slots: private slots:
void stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason); void stateChange(unsigned int new_state, unsigned int previous_state, unsigned int change_reason);
void propertyChange(const QString &interface, const QVariantMap &props, const QStringList &invalidated_props); void propertyChange(const QString &interface, const QVariantMap &props, const QStringList &invalidated_props);
void deviceAdded(const QDBusObjectPath &path);
void connectionRemoved(const QDBusObjectPath &path); void connectionRemoved(const QDBusObjectPath &path);
void newConnection(const QDBusObjectPath &path); void newConnection(const QDBusObjectPath &path);
}; };

Write Preview
Loading…
Cancel
Save