Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dhcp server): only hand out DNS if explicitly specified (IDFGH-13195) #14132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

showier-drastic
Copy link
Contributor

By default there isn't any dns server running on the ESP32, and it does not make sense to hand out DNS config here. On the other hand, handing out DNS config will affect the client machine if we don't want DNS traffic to go through ESP32, and there's no way to disable it. So only hand it out if explicitly enabled.

@CLAassistant
Copy link

CLAassistant commented Jul 4, 2024

CLA assistant check
All committers have signed the CLA.

Copy link

github-actions bot commented Jul 4, 2024

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello showier-drastic, we appreciate your contribution to this project!


📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.

🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.

Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests via this public GitHub repository.

This GitHub project is public mirror of our internal git repository

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved, we synchronize it into our internal git repository.
4. In the internal git repository we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
5. If the change is approved and passes the tests it is merged into the default branch.
5. On next sync from the internal git repository merged change will appear in this public GitHub repository.

Generated by 🚫 dangerJS against c4e2274

@espressif-bot espressif-bot added the Status: Opened Issue is new label Jul 4, 2024
@github-actions github-actions bot changed the title feat(dhcp server): only hand out DNS if explicitly specified feat(dhcp server): only hand out DNS if explicitly specified (IDFGH-13195) Jul 4, 2024
@KisonHe
Copy link

KisonHe commented Aug 30, 2024

Any update on this? I am also running into this problem. I plan to make my product communicate with PC using usb ncm. And I just find the dns server on esp is jamming net traffic on my client's PC.

By applying changes here the problem is then gone.

@espressif-abhikroy
Copy link
Collaborator

sha=c4e2274e058a82bf1ff9da29fe84cb66b1fc3442

@espressif-abhikroy espressif-abhikroy added the PR-Sync-Merge Pull request sync as merge commit label Sep 20, 2024
Copy link
Collaborator

@david-cermak david-cermak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR, LGTM!

Could you please check that the captive portal example still works with this change? Just to be sure if we need a compatibility config option?

@showier-drastic
Copy link
Contributor Author

Hi @david-cermak , thanks for your reply!

This does break the captive portal example. How would you suggest adding a fix?

@david-cermak
Copy link
Collaborator

Hi @david-cermak , thanks for your reply!

This does break the captive portal example. How would you suggest adding a fix?

Thanks for checking. I suggest introducing a Kconfig option (enabled by default) which would keep the IP address as the DNS server, unless configured (current behaviour). If disabled, it would set the DNS option only if it's configured (behaviour after your change).
We'll remove this Kconfig (altering the behavior) in IDF v6.0 (when we're allowed to make breaking changes).

PS: If you'd prefer, the ESP-IDF team can handle the backward compatibility changes on top of your commit. Let me know if you'd like us to take care of this!

@showier-drastic
Copy link
Contributor Author

Hi @david-cermak , thanks for your reply!
This does break the captive portal example. How would you suggest adding a fix?

Thanks for checking. I suggest introducing a Kconfig option (enabled by default) which would keep the IP address as the DNS server, unless configured (current behaviour). If disabled, it would set the DNS option only if it's configured (behaviour after your change). We'll remove this Kconfig (altering the behavior) in IDF v6.0 (when we're allowed to make breaking changes).

Understood, thanks for explanations!

PS: If you'd prefer, the ESP-IDF team can handle the backward compatibility changes on top of your commit. Let me know if you'd like us to take care of this!

Yes, that would be very nice.

@david-cermak
Copy link
Collaborator

Great, we've accepted your commit internally -- please wait while we handle the backward compatibility layer and merge it at once.

@tonyjackson-srt
Copy link

tonyjackson-srt commented Oct 2, 2024

Great, we've accepted your commit internally -- please wait while we handle the backward compatibility layer and merge it at once.

@david-cermak, will this be back-ported to ESP-IDF v4.4.x?

@espressif-bot espressif-bot added Status: Done Issue is done internally Resolution: NA Issue resolution is unavailable and removed Status: Opened Issue is new labels Oct 14, 2024
espressif-bot pushed a commit that referenced this pull request Oct 28, 2024
Adds backward compatibity option CONFIG_LWIP_DHCPS_ADD_DNS, which
prevents breaking changes.
This option should be removed in IDF v6.0

Merges #14132
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Sync-Merge Pull request sync as merge commit Resolution: NA Issue resolution is unavailable Status: Done Issue is done internally
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants