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

DHCPv6 leases status: Display manufacturer info #4527

Merged
merged 4 commits into from
May 29, 2021
Merged

DHCPv6 leases status: Display manufacturer info #4527

merged 4 commits into from
May 29, 2021

Conversation

vnxme
Copy link
Contributor

@vnxme vnxme commented Dec 14, 2020

Issues in status_dhcpv6_leases.php for which this PR suggests a solution:

  • No manufacturer information is displayed though $mac_man is defined;
  • MAC addresses are only imported from NDP which is not always full enough (e.g. when DHCPv6+SLAAC option is used, a machine may have two or more IPv6 addresses assigned, then NDP database will have only the one this client machine prefers, unless you ping the others).

Other:
This PR is a part of changes proposed by #4514.

Display info about manufacturers of devices based on their MAC addresses.
Get MAC addresses not only from NDP, but also from DUID of certain types.
@vnxme
Copy link
Contributor Author

vnxme commented Dec 14, 2020

For discussion: what if we put MAC and manufacturer information into a separate column like it is done on DHCPv4 leases status page?

@fichtner fichtner self-assigned this Dec 14, 2020
@fichtner
Copy link
Member

fichtner commented Apr 6, 2021

Can you revisit your code on top of the latest code? The page was refactored. I also removed the unused MAC database setup but that doesn't mean it can't be added back :) For details see #4642

@vnxme
Copy link
Contributor Author

vnxme commented Apr 6, 2021

@fichtner No problem, but I'm not sure how to work on the code when the changes you have already merged are not released yet. Although I know it's generally discouraged, I use a real device to make and test some changes and I prefer it being equipped with a stable version.

@fichtner
Copy link
Member

fichtner commented Apr 6, 2021

I'll let you know when these are shipped. Most likely it will indeed be 21.1.5.

@fichtner
Copy link
Member

@vnxme did you take a look at this in 21.1.4 yet? :)

@fichtner
Copy link
Member

Sorry I meant 21.1.5 of course.

@vnxme
Copy link
Contributor Author

vnxme commented Apr 30, 2021

@fichtner As agreed, I revisited the code and implemented a more creative idea: underline the MAC part of each applicable DUID, add vendor data (if any) below, add an NDP MAC and the corresponding vendor data (if any) further below (when using CARP, DUID MACs are not equal to NDP MACs), remove MAC/vendor data from the hostname column. Now the DUID column may look like that:
image

@vnxme
Copy link
Contributor Author

vnxme commented Apr 30, 2021

@fichtner I understand you're busy enough with other important things, but may be you could also take a look at #4524 and #4525 which deal with sorting of DHCPv4/6 leases. Thank you in advance.

@fichtner
Copy link
Member

Merged #4524 and #4525 as requested. These will be released in 21.1.7 most likely.

@vnxme
Copy link
Contributor Author

vnxme commented May 28, 2021

@fichtner Great, thank you! Resolved a conflict for this PR to be mergeable.

@fichtner fichtner merged commit d24b2e7 into opnsense:master May 29, 2021
@fichtner
Copy link
Member

merged, thanks!

@fichtner
Copy link
Member

@vnxme nice work, this is great :)

AdSchellevis pushed a commit that referenced this pull request Aug 15, 2021
o Display info about manufacturers of devices based on their MAC addresses.
o Get MAC addresses not only from NDP, but also from DUID of certain types.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants