From 21f94c284d9e08de9bb9de275bd4afd5b4ecbc4a Mon Sep 17 00:00:00 2001 From: grekiki Date: Fri, 29 Jan 2021 16:22:35 +0100 Subject: [PATCH] Wifi correct ip (#19961) old-commit-hash: 82b894c645471a409dbb5b76562edc59b0cb62b9 --- selfdrive/ui/qt/offroad/wifiManager.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/selfdrive/ui/qt/offroad/wifiManager.cc b/selfdrive/ui/qt/offroad/wifiManager.cc index 46454470ac..5161d532b3 100644 --- a/selfdrive/ui/qt/offroad/wifiManager.cc +++ b/selfdrive/ui/qt/offroad/wifiManager.cc @@ -110,17 +110,21 @@ QString WifiManager::get_ipv4_address(){ QDBusObjectPath pth = get_response(nm.call("Get", connection_iface, "Ip4Config")); QString ip4config = pth.path(); - QDBusInterface nm2(nm_service, ip4config, props_iface, bus); - const QDBusArgument &arr = get_response(nm2.call("Get", ipv4config_iface, "AddressData")); - QMap pth2; - arr.beginArray(); - while (!arr.atEnd()){ - arr >> pth2; - QString ipv4 = pth2.value("address").value(); + QString type = get_response(nm.call("Get", connection_iface, "Type")); + + if (type == "802-11-wireless") { + QDBusInterface nm2(nm_service, ip4config, props_iface, bus); + const QDBusArgument &arr = get_response(nm2.call("Get", ipv4config_iface, "AddressData")); + QMap pth2; + arr.beginArray(); + while (!arr.atEnd()){ + arr >> pth2; + QString ipv4 = pth2.value("address").value(); + arr.endArray(); + return ipv4; + } arr.endArray(); - return ipv4; } - arr.endArray(); } return ""; }