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

Add DHCP netmask field and nicely format API errors #2805

Merged
merged 3 commits into from
Nov 15, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 4, 2023

What does this implement/fix?

This PR accompanies pi-hole/FTL#1731. It adds a new DHCP netmask field and furthermore improve error displaying for settings changes.

Examples:

image

image

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team November 4, 2023 12:11
@rdwebdesign
Copy link
Member

rdwebdesign commented Nov 7, 2023

The API uses dhcp.start and dhcp.end. These property names will be shown in docs and error messages.

Should we change the field names to Start and End?

image

@DL6ER DL6ER merged commit 5cd1b2e into development-v6 Nov 15, 2023
7 checks passed
@DL6ER DL6ER deleted the new/dhcp-netmask branch November 15, 2023 10:09
@sy-be
Copy link

sy-be commented May 5, 2024

Thank you! Looking forward to v6.0. Atm netmask field is incorrectly generated in /etc/dnsmasq.d/02-pihole-dhcp.conf - it doesn't add netmask and inferred value isn't always correct.

@DL6ER
Copy link
Member Author

DL6ER commented May 6, 2024

@sy-bee Can you be a bit more specific about what is wrong and how the inferred value is not correct? It'd be great if you could open an issue in the FTL repository so we have a place where we can discuss things properly: https://github.com/pi-hole/FTL/issues/new

This PR added only displaying, the real work happens in FTL.

@sy-be
Copy link

sy-be commented May 6, 2024

Thanks @DL6ER , I have created an issue here with details: pi-hole/FTL#1947

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants