Fix ESPHome unnecessary probing on DHCP discovery #149713
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hey there @jesserockz, @kbx81, mind taking a look at this pull request as it has been labeled with an integration ( Code owner commandsCode owners of
|
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where the ESPHome integration was unnecessarily probing devices during DHCP discovery events, even when the IP address hadn't changed. The problem occurred because DHCP discovery passes port=None, but the code was comparing this against the configured port (e.g., 6053 == None), which always failed and triggered unnecessary device probing.
Key changes:
- Modified the host/port comparison logic to handle
Noneport values from DHCP discovery - Added a test case to verify the fix prevents unnecessary probing
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| homeassistant/components/esphome/config_flow.py | Updated comparison logic to skip port matching when port is None from DHCP discovery |
| tests/components/esphome/test_config_flow.py | Added test case to verify DHCP discovery doesn't probe when host matches and port is None |
joostlek
approved these changes
Jul 30, 2025
|
Thanks |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed change
Fix ESPHome integration unnecessarily probing devices on DHCP discovery events.
When ESPHome devices renew their DHCP lease or reconnect to the network, the integration was probing them even when the IP address hadn't changed. This was causing rapid connect/disconnect cycles visible in ESPHome logs:
The issue occurred because DHCP discovery passes
port=None, but the code was comparingconfigured_port == port(e.g.,6053 == None), which always failed and triggered unnecessary probing.Type of change
Additional information
Checklist
ruff format homeassistant tests)If user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
Updated and included derived files by running:
python3 -m script.hassfest.requirements_all.txt.Updated by running
python3 -m script.gen_requirements_all.To help with the load of incoming pull requests: