wip

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Author: patrickelectric

core/services/wifi/wifi_handlers/networkmanager/networkmanager.py

@@ -173,8 +173,9 @@ async def _request_scan(self) -> None:
             return
         try:
             device = NetworkDeviceWireless(self._device_path, self._bus)
+            interface_name = await device.interface
+            logger.info(f"Requesting WiFi scan on {interface_name}")
             await device.request_scan({})
-            logger.info("Requested WiFi scan on new interface")
         except Exception as e:
             logger.warning(f"Failed to request scan: {e}")
 
@@ -190,13 +191,16 @@ async def _autoscan(self) -> None:
 
     async def get_wifi_available(self) -> List[ScannedWifiNetwork]:
         if not self._device_path or not self._nm:
+            logger.warning("get_wifi_available: No device path or NetworkManager")
             return []
 
         try:
             device = NetworkDeviceWireless(self._device_path, bus=self._bus)
+            interface_name = await device.interface
             networks: List[ScannedWifiNetwork] = []
 
             ap_paths = await device.get_all_access_points()
+            logger.info(f"Scanning on {interface_name}: found {len(ap_paths)} access points")
             for ap_path in ap_paths:
                 ap = AccessPoint(ap_path, self._bus)
                 freq = await ap.frequency.get_async()
@@ -312,11 +316,17 @@ async def wait_for_connection(timeout: int = 30) -> bool:
             await self.enable_hotspot()
 
     async def _find_existing_connection(self, credentials: WifiCredentials) -> Optional[str]:
-        """Find existing connection for given SSID, checking password if provided"""
+        """Find existing connection for given SSID, checking password and interface compatibility"""
         try:
             if not self._nm_settings:
                 return None
 
+            # Get current interface name to check compatibility
+            current_interface = None
+            if self._device_path:
+                current_device = NetworkDeviceWireless(self._device_path, self._bus)
+                current_interface = await current_device.interface
+
             for conn_path in await self._nm_settings.connections:
                 try:
                     settings = NetworkConnectionSettings(conn_path, self._bus)
@@ -328,6 +338,15 @@ async def _find_existing_connection(self, credentials: WifiCredentials) -> Optio
                     if profile.wireless.ssid.decode("utf-8") != credentials.ssid:
                         continue
 
+                    # Check if connection has interface-name constraint that doesn't match current interface
+                    if profile.connection.interface_name and current_interface:
+                        if profile.connection.interface_name != current_interface:
+                            logger.info(
+                                f"Skipping connection for {credentials.ssid}: "
+                                f"bound to {profile.connection.interface_name}, current is {current_interface}"
+                            )
+                            continue
+
                     # If no password provided, we can use any existing connection
                     if not credentials.password:
                         logger.info(f"Found existing connection for {credentials.ssid} (no password check)")