spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui/networking: combine connect functions into one (#23522)

pull/23532/head
Dean Lee 2022-01-15 00:42:29 +08:00 committed by GitHub
parent 75be1223f8
commit 39d904d2aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
selfdrive/ui/qt/offroad/wifiManager.cc
View File

@ -164,32 +164,20 @@ SecurityType WifiManager::getSecurityType(const QString &path) {
}
}
void WifiManager::connect(const Network &n) {
return connect(n, "", "");
}
void WifiManager::connect(const Network &n, const QString &password) {
return connect(n, "", password);
}
void WifiManager::connect(const Network &n, const QString &username, const QString &password) {
void WifiManager::connect(const Network &n, const QString &password, const QString &username) {
connecting_to_network = n.ssid;
// disconnect();
forgetConnection(n.ssid); //Clear all connections that may already exist to the network we are connecting
connect(n.ssid, username, password, n.security_type);
}
void WifiManager::connect(const QByteArray &ssid, const QString &username, const QString &password, SecurityType security_type) {
seenNetworks[n.ssid].connected = ConnectedType::CONNECTING;
forgetConnection(n.ssid); // Clear all connections that may already exist to the network we are connecting
Connection connection;
connection["connection"]["type"] = "802-11-wireless";
connection["connection"]["uuid"] = QUuid::createUuid().toString().remove('{').remove('}');
connection["connection"]["id"] = "openpilot connection "+QString::fromStdString(ssid.toStdString());
connection["connection"]["id"] = "openpilot connection " + QString::fromStdString(n.ssid.toStdString());
connection["connection"]["autoconnect-retries"] = 0;
connection["802-11-wireless"]["ssid"] = ssid;
connection["802-11-wireless"]["ssid"] = n.ssid;
connection["802-11-wireless"]["mode"] = "infrastructure";
if (security_type == SecurityType::WPA) {
if (n.security_type == SecurityType::WPA) {
connection["802-11-wireless-security"]["key-mgmt"] = "wpa-psk";
connection["802-11-wireless-security"]["auth-alg"] = "open";
connection["802-11-wireless-security"]["psk"] = password;

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

@ -53,10 +53,7 @@ public:
void activateModemConnection(const QDBusObjectPath &path);
NetworkType currentNetworkType();
void updateGsmSettings(bool roaming, QString apn);
void connect(const Network &ssid);
void connect(const Network &ssid, const QString &password);
void connect(const Network &ssid, const QString &username, const QString &password);
void connect(const Network &ssid, const QString &password = {}, const QString &username = {});
void disconnect();
// Tethering functions