wifi: no NetworkManager

common/utils.py

@@ -48,7 +48,7 @@ def sudo_write(val: str, path: str) -> None:
 
 def sudo_read(path: str) -> str:
   try:
-    return subprocess.check_output(f"sudo cat {path}", shell=True, encoding='utf8').strip()
+    return subprocess.check_output(["sudo", "cat", path], encoding='utf8').strip()
   except Exception:
     return ""
 

pyproject.toml

@@ -147,7 +147,7 @@ testpaths = [
 [tool.codespell]
 quiet-level = 3
 # if you've got a short variable name that's getting flagged, add it here
-ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite,ser"
+ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite,ser,caf"
 builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
 skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.po, uv.lock, *.onnx, *.pem, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*, selfdrive/assets/offroad/mici_fcc.html"
 

selfdrive/ui/layouts/settings/settings.py

@@ -53,7 +53,6 @@ def __init__(self):
 
     # Panel configuration
     wifi_manager = WifiManager()
-    wifi_manager.set_active(False)
 
     self._panels = {
       PanelType.DEVICE: PanelInfo(tr_noop("Device"), DeviceLayout()),

selfdrive/ui/mici/layouts/settings/network/__init__.py

@@ -3,7 +3,8 @@
 from openpilot.selfdrive.ui.mici.layouts.settings.network.wifi_ui import WifiIcon
 from openpilot.selfdrive.ui.mici.widgets.button import BigButton
 from openpilot.system.ui.lib.application import gui_app
-from openpilot.system.ui.lib.wifi_manager import WifiManager, ConnectStatus, SecurityType, normalize_ssid
+from openpilot.system.ui.lib.wifi_manager import WifiManager, ConnectStatus, SecurityType
+from openpilot.system.ui.lib.wpa_ctrl import normalize_ssid
 
 
 class WifiNetworkButton(BigButton):

selfdrive/ui/mici/layouts/settings/network/network_layout.py

@@ -14,11 +14,12 @@ def __init__(self):
     super().__init__()
 
     self._wifi_manager = WifiManager()
-    self._wifi_manager.set_active(False)
     self._wifi_ui = WifiUIMici(self._wifi_manager)
 
     self._wifi_manager.add_callbacks(
       networks_updated=self._on_network_updated,
+      activated=lambda: self._on_tethering_finished(),
+      disconnected=lambda: self._on_tethering_finished(),
     )
 
     # ******** Tethering ********
@@ -32,9 +33,13 @@ def tethering_toggle_callback(checked: bool):
 
     def tethering_password_callback(password: str):
       if password:
-        self._tethering_toggle_btn.set_enabled(False)
-        self._tethering_password_btn.set_enabled(False)
         self._wifi_manager.set_tethering_password(password)
+        if self._wifi_manager.is_tethering_active():
+          self._tethering_toggle_btn.set_enabled(False)
+          self._tethering_password_btn.set_enabled(False)
+        else:
+          self._tethering_toggle_btn.set_enabled(True)
+          self._tethering_password_btn.set_enabled(True)
 
     def tethering_password_clicked():
       tethering_password = self._wifi_manager.tethering_password
@@ -105,14 +110,12 @@ def _update_state(self):
 
   def show_event(self):
     super().show_event()
-    self._wifi_manager.set_active(True)
 
     # Process wifi callbacks while at any point in the nav stack
     gui_app.add_nav_stack_tick(self._wifi_manager.process_callbacks)
 
   def hide_event(self):
     super().hide_event()
-    self._wifi_manager.set_active(False)
 
     gui_app.remove_nav_stack_tick(self._wifi_manager.process_callbacks)
 
@@ -136,14 +139,16 @@ def update_apn(apn: str):
   def _toggle_cellular_metered(self, checked: bool):
     self._wifi_manager.update_gsm_settings(ui_state.params.get_bool("GsmRoaming"), ui_state.params.get("GsmApn") or "", checked)
 
-  def _on_network_updated(self, networks: list[Network]):
-    # Update tethering state
+  def _on_tethering_finished(self):
     tethering_active = self._wifi_manager.is_tethering_active()
-    # TODO: use real signals (like activated/settings changed, etc.) to speed up re-enabling buttons
     self._tethering_toggle_btn.set_enabled(True)
     self._tethering_password_btn.set_enabled(True)
-    self._network_metered_btn.set_enabled(lambda: not tethering_active and bool(self._wifi_manager.ipv4_address))
     self._tethering_toggle_btn.set_checked(tethering_active)
+    self._on_network_updated(self._wifi_manager.networks)
+
+  def _on_network_updated(self, networks: list[Network]):
+    tethering_active = self._wifi_manager.is_tethering_active()
+    self._network_metered_btn.set_enabled(lambda: not tethering_active and bool(self._wifi_manager.ipv4_address))
 
     # Update network metered
     self._network_metered_btn.set_value(

selfdrive/ui/mici/layouts/settings/network/wifi_ui.py

@@ -9,7 +9,8 @@
 from openpilot.system.ui.lib.application import gui_app, MousePos, FontWeight
 from openpilot.system.ui.widgets import Widget
 from openpilot.system.ui.widgets.scroller import NavScroller
-from openpilot.system.ui.lib.wifi_manager import WifiManager, Network, SecurityType, normalize_ssid
+from openpilot.system.ui.lib.wifi_manager import WifiManager, Network, SecurityType
+from openpilot.system.ui.lib.wpa_ctrl import normalize_ssid
 
 
 class LoadingAnimation(Widget):
@@ -220,7 +221,7 @@ def _update_state(self):
       elif self._is_connected:
         self.set_value("tethering" if self._network.is_tethering else "connected")
       elif self._network_missing:
-        # after connecting/connected since NM will still attempt to connect/stay connected for a while
+        # after connecting/connected since wpa_supplicant will still attempt to connect/stay connected for a while
         self.set_value("not in range")
       else:
         self.set_value("unsupported")
@@ -297,7 +298,6 @@ def any_network_forgetting(self) -> bool:
   def show_event(self):
     # Re-sort scroller items and update from latest scan results
     super().show_event()
-    self._wifi_manager.set_active(True)
     self._networks = {n.ssid: n for n in self._wifi_manager.networks}
     self._update_buttons(re_sort=True)
 
@@ -339,6 +339,9 @@ def _connect_with_password(self, ssid: str, password: str):
     self._move_network_to_front(ssid, scroll=True)
 
   def _connect_to_network(self, ssid: str):
+    if self._wifi_manager.is_tethering_active():
+      return
+
     network = self._networks.get(ssid)
     if network is None:
       cloudlog.warning(f"Trying to connect to unknown network: {ssid}")
@@ -356,11 +359,14 @@ def _connect_to_network(self, ssid: str):
 
   def _on_need_auth(self, ssid, incorrect_password=True):
     if incorrect_password:
+      found = False
       for btn in self._scroller.items:
         if isinstance(btn, WifiButton) and btn.network.ssid == ssid:
           btn.set_wrong_password()
+          found = True
           break
-      return
+      if found:
+        return
 
     dlg = BigInputDialog("enter password...", "", minimum_length=8,
                          confirm_callback=lambda _password: self._connect_with_password(ssid, _password))

system/hardware/tici/hardware.py

@@ -1,3 +1,4 @@
+import configparser
 import math
 import os
 import subprocess
@@ -15,13 +16,14 @@
 from openpilot.system.hardware.tici.lpa import TiciLPA
 from openpilot.system.hardware.tici.pins import GPIO
 from openpilot.system.hardware.tici.amplifier import Amplifier
+from openpilot.system.ui.lib.wpa_ctrl import parse_status, dbm_to_percent
+
+NM_CONNECTIONS_DIR = "/data/etc/NetworkManager/system-connections"
 
 NM = 'org.freedesktop.NetworkManager'
 NM_CON_ACT = NM + '.Connection.Active'
 NM_DEV = NM + '.Device'
-NM_DEV_WL = NM + '.Device.Wireless'
 NM_DEV_STATS = NM + '.Device.Statistics'
-NM_AP = NM + '.AccessPoint'
 DBUS_PROPS = 'org.freedesktop.DBus.Properties'
 
 MM = 'org.freedesktop.ModemManager1'
@@ -138,28 +140,26 @@ def set_ir_power(self, percent: int):
 
   def get_network_type(self):
     try:
-      primary_connection = self.nm.Get(NM, 'PrimaryConnection', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-      primary_connection = self.bus.get_object(NM, primary_connection)
-      primary_type = primary_connection.Get(NM_CON_ACT, 'Type', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-
-      if primary_type == '802-3-ethernet':
-        return NetworkType.ethernet
-      elif primary_type == '802-11-wireless':
-        return NetworkType.wifi
-      else:
-        active_connections = self.nm.Get(NM, 'ActiveConnections', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-        for conn in active_connections:
-          c = self.bus.get_object(NM, conn)
-          tp = c.Get(NM_CON_ACT, 'Type', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-          if tp == 'gsm':
-            modem = self.get_modem()
-            access_t = modem.Get(MM_MODEM, 'AccessTechnologies', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-            if access_t >= MM_MODEM_ACCESS_TECHNOLOGY_LTE:
-              return NetworkType.cell4G
-            elif access_t >= MM_MODEM_ACCESS_TECHNOLOGY_UMTS:
-              return NetworkType.cell3G
-            else:
-              return NetworkType.cell2G
+      result = subprocess.run(["ip", "route", "show", "default"], capture_output=True, text=True, timeout=2)
+      for line in result.stdout.strip().split("\n"):
+        if "dev" not in line:
+          continue
+        parts = line.split()
+        dev_idx = parts.index("dev")
+        dev = parts[dev_idx + 1]
+        if dev == "wlan0":
+          return NetworkType.wifi
+        elif dev in ("eth0", "usb0"):
+          return NetworkType.ethernet
+        elif dev in ("wwan0", "rmnet_data0"):
+          modem = self.get_modem()
+          access_t = modem.Get(MM_MODEM, 'AccessTechnologies', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
+          if access_t >= MM_MODEM_ACCESS_TECHNOLOGY_LTE:
+            return NetworkType.cell4G
+          elif access_t >= MM_MODEM_ACCESS_TECHNOLOGY_UMTS:
+            return NetworkType.cell3G
+          else:
+            return NetworkType.cell2G
     except Exception:
       pass
 
@@ -170,10 +170,6 @@ def get_modem(self):
     modem_path = list(objects.keys())[0]
     return self.bus.get_object(MM, modem_path)
 
-  def get_wlan(self):
-    wlan_path = self.nm.GetDeviceByIpIface('wlan0', dbus_interface=NM, timeout=TIMEOUT)
-    return self.bus.get_object(NM, wlan_path)
-
   def get_wwan(self):
     wwan_path = self.nm.GetDeviceByIpIface('wwan0', dbus_interface=NM, timeout=TIMEOUT)
     return self.bus.get_object(NM, wwan_path)
@@ -258,12 +254,11 @@ def get_network_strength(self, network_type):
       if network_type == NetworkType.none:
         pass
       elif network_type == NetworkType.wifi:
-        wlan = self.get_wlan()
-        active_ap_path = wlan.Get(NM_DEV_WL, 'ActiveAccessPoint', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-        if active_ap_path != "/":
-          active_ap = self.bus.get_object(NM, active_ap_path)
-          strength = int(active_ap.Get(NM_AP, 'Strength', dbus_interface=DBUS_PROPS, timeout=TIMEOUT))
-          network_strength = self.parse_strength(strength)
+        result = subprocess.run(["wpa_cli", "-i", "wlan0", "signal_poll"],
+                                capture_output=True, text=True, timeout=2)
+        status = parse_status(result.stdout)
+        if "RSSI" in status:
+          network_strength = self.parse_strength(dbm_to_percent(int(status["RSSI"])))
       else:  # Cellular
         modem = self.get_modem()
         strength = int(modem.Get(MM_MODEM, 'SignalQuality', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)[0])
@@ -275,18 +270,47 @@ def get_network_strength(self, network_type):
 
   def get_network_metered(self, network_type) -> bool:
     try:
-      primary_connection = self.nm.Get(NM, 'PrimaryConnection', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-      primary_connection = self.bus.get_object(NM, primary_connection)
-      primary_devices = primary_connection.Get(NM_CON_ACT, 'Devices', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-
-      for dev in primary_devices:
-        dev_obj = self.bus.get_object(NM, str(dev))
-        metered_prop = dev_obj.Get(NM_DEV, 'Metered', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
-
-        if network_type == NetworkType.wifi:
-          if metered_prop in [NMMetered.NM_METERED_YES, NMMetered.NM_METERED_GUESS_YES]:
-            return True
-        elif network_type in [NetworkType.cell2G, NetworkType.cell3G, NetworkType.cell4G, NetworkType.cell5G]:
+      if network_type == NetworkType.wifi:
+        result = subprocess.run(["wpa_cli", "-i", "wlan0", "status"],
+                                capture_output=True, text=True, timeout=2)
+        ssid = parse_status(result.stdout).get("ssid")
+        if ssid:
+          # NetworkStore in wifi_manager.py owns the SSID-to-filename
+          # encoding (percent-encoded, lossless). Rather than duplicating
+          # that encoding here (and drifting out of sync again), match by
+          # the ssid field inside each .nmconnection file.
+          try:
+            filenames = os.listdir(NM_CONNECTIONS_DIR)
+          except OSError:
+            filenames = []
+          for fname in filenames:
+            if not fname.endswith(".nmconnection"):
+              continue
+            fpath = os.path.join(NM_CONNECTIONS_DIR, fname)
+            raw = sudo_read(fpath)
+            if not raw:
+              continue
+            cp = configparser.ConfigParser(interpolation=None)
+            try:
+              cp.read_string(raw)
+              if cp.get("wifi", "ssid", fallback="") != ssid:
+                continue
+              metered = cp.getint("connection", "metered", fallback=0)
+            except (configparser.Error, ValueError):
+              continue
+            if metered == 1:  # YES
+              return True
+            if metered == 2:  # NO
+              return False
+            break
+      elif network_type in [NetworkType.cell2G, NetworkType.cell3G, NetworkType.cell4G, NetworkType.cell5G]:
+        # Cellular metered check still via NM (NM still manages cellular)
+        primary_connection = self.nm.Get(NM, 'PrimaryConnection', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
+        primary_connection = self.bus.get_object(NM, primary_connection)
+        primary_devices = primary_connection.Get(NM_CON_ACT, 'Devices', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
+        for dev in primary_devices:
+          dev_obj = self.bus.get_object(NM, str(dev))
+          metered_prop = dev_obj.Get(NM_DEV, 'Metered', dbus_interface=DBUS_PROPS, timeout=TIMEOUT)
           if metered_prop == NMMetered.NM_METERED_NO:
             return False
     except Exception: