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 DHCPv6 probing to dhcp-discover tool #2128

Merged
merged 12 commits into from
Jan 29, 2025
Merged

Add DHCPv6 probing to dhcp-discover tool #2128

merged 12 commits into from
Jan 29, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 5, 2024

What does this implement/fix?

This PR extends the embedded dhcp-discover to also scan for IPv6 routers possibly broadcasting DNS configuration.


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.

@DL6ER DL6ER requested review from a team and Copilot December 5, 2024 19:40

Choose a reason for hiding this comment

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

Copilot reviewed 1 out of 8 changed files in this pull request and generated no suggestions.

Files not reviewed (7)
  • src/capabilities.h: Language not supported
  • src/config/dnsmasq_config.c: Language not supported
  • src/tools/CMakeLists.txt: Language not supported
  • src/tools/dhcp-discover.c: Language not supported
  • src/tools/dhcp-discover.h: Language not supported
  • src/tools/dhcpv6-discover.h: Language not supported
  • test/run.sh: Language not supported
Signed-off-by: DL6ER <[email protected]>
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Noticed three things:

Sending ICMPv6 packet: Network unreachable
RAs received on docker0: -1
DHCP packets received on docker0: 0
DHCP packets received on end0: 1
RAs received on end0: 0
Speicherzugriffsfehler
  1. Docker receiving -1?
  2. Order of reported RA and DHCP could be better (grouped)
  3. Memory error. (Does not happen on development)

@DL6ER
Copy link
Member Author

DL6ER commented Dec 9, 2024

  1. You are not using the latest version as negative displays are not possible with the latest commit (87a2ad5).
  2. Not possible without much overhead. All the scanning threads are running parallel and don't sync, but I will try something.
  3. Hmm, interesting, this probably has to do with the interface error "network unreachable". For me, probing docker works.

@DL6ER
Copy link
Member Author

DL6ER commented Dec 9, 2024

Squashed a few insignificant commits

@yubiuser
Copy link
Member

You are not using the latest version as negative displays are not possible with the latest commit

Interesting, because it was a fresh checkout. Maybe one of the builders failed at some point?


Looks good now. Code review will follow.

Error while sending Router Solicitation on docker0: Network unreachable
No answer on docker0
Received 1 DHCP (IPv4) and 0 RA (IPv6) answers on end0

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Can you please rebase/merge development - I get SQL database errors due to changed database column number.


There is a small indention error after an error


   broadcast: 10.0.1.255
   ntp-server: 10.0.1.1
   Error while sending Router Solicitation on docker0: Network unreachable
Port Control Protocol (PCP) server: 10.0.1.1

@DL6ER DL6ER enabled auto-merge January 28, 2025 19:13
@DL6ER DL6ER requested a review from yubiuser January 28, 2025 19:13
@DL6ER
Copy link
Member Author

DL6ER commented Jan 28, 2025

Both should be addressed now.

@DL6ER DL6ER merged commit cbd5344 into development Jan 29, 2025
19 checks passed
@DL6ER DL6ER deleted the new/dhcpv6 branch January 29, 2025 20:24
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.

2 participants