-
Notifications
You must be signed in to change notification settings - Fork 14
firewall: dedicated address types and debug printouts thereof #122
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
Open
nwf
wants to merge
5
commits into
main
Choose a base branch
from
nwf/202609-address_types_and_debug
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
075e15e
tcpip/startup: remove extraneous debug newlines
nwf ba5bfe8
firewall: NFC: wrap Ethernet MAC & IPv4 addresses
nwf e64cd78
firewall: NFC: dedicated header for address types
nwf 9b5fef9
firewall: add debug adaptors for address types
nwf 30bb4df
firewall API: speak in IPv4Address-es
nwf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| #pragma once | ||
|
|
||
| #include "protocol-headers.hh" | ||
| #include <debug.hh> | ||
|
|
||
| /** | ||
| * Pretty-print a MACAddress. | ||
| * | ||
| * This relies on the address being valid across the duration of the call. | ||
| */ | ||
| template<> | ||
| struct DebugFormatArgumentAdaptor<MACAddress> | ||
| { | ||
| __always_inline static DebugFormatArgument construct(MACAddress &address) | ||
| { | ||
| return {reinterpret_cast<uintptr_t>(&address), | ||
| reinterpret_cast<uintptr_t>(&print)}; | ||
| } | ||
|
|
||
| private: | ||
| static void print(uintptr_t value, DebugWriter &writer) | ||
| { | ||
| auto *address = reinterpret_cast<MACAddress *>(value); | ||
| writer.write_hex_byte((*address)[0]); | ||
| for (size_t ix = 1; ix < sizeof(*address); ix++) | ||
| { | ||
| writer.write(':'); | ||
| writer.write_hex_byte((*address)[ix]); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Pretty-print an IPv4Address. | ||
| */ | ||
| template<> | ||
| struct DebugFormatArgumentAdaptor<IPv4Address> | ||
| { | ||
| __always_inline static DebugFormatArgument construct(IPv4Address &address) | ||
| { | ||
| return {static_cast<uintptr_t>(address.raw), | ||
| reinterpret_cast<uintptr_t>(&print)}; | ||
| } | ||
|
|
||
| private: | ||
| static void print(uintptr_t value, DebugWriter &writer) | ||
| { | ||
| auto address = static_cast<uint32_t>(value); | ||
| writer.write(static_cast<int32_t>((address >> 0) & 0xFF)); | ||
| writer.write('.'); | ||
| writer.write(static_cast<int32_t>((address >> 8) & 0xFF)); | ||
| writer.write('.'); | ||
| writer.write(static_cast<int32_t>((address >> 16) & 0xFF)); | ||
| writer.write('.'); | ||
| writer.write(static_cast<int32_t>((address >> 24) & 0xFF)); | ||
| } | ||
| }; |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we have a type for port numbers too? What is going on with the namespace prefixes here?!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those are pointers to data members.
I'm generally in favor of more types...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL!