Skip to content

Fixed comparison function for non-network address families #557

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed comparison function for non-network address families #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe0a68
Fixed comparison function for non-network address families
keith-horton Nov 2, 2025
c55c119
Merge branch 'master' into master
dunhor Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/wil/network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,8 @@ namespace network
default:
// if not AF_INET or AF_INET6, and families don't match
// then just raw memcmp the largest field of the union (v6)
return ::memcmp(&lhs.m_sockaddr.Ipv6, &rhs.m_sockaddr.Ipv6, sizeof(SOCKADDR_IN6)) < 0;
const auto comparison{::memcmp(&lhs.m_sockaddr.Ipv6, &rhs.m_sockaddr.Ipv6, sizeof(SOCKADDR_IN6))};
return comparison < 0 ? -1 : (comparison > 0 ? 1 : 0);
Comment on lines +795 to +796
Copy link
Member

@dunhor dunhor Nov 3, 2025

Choose a reason for hiding this comment

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

Does anything take a dependency on this returning exactly -1, 0, or 1? Seems easier and more efficient to just return ::memcmp(...)

Copy link
Member Author

@keith-horton keith-horton Nov 3, 2025

Choose a reason for hiding this comment

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

yeah. I thought about making it do just that. I'm going to add tests for this oddball scenario. I might change to just return what memcmp returns then.

}
}

Expand Down