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.

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

Jump to bottom

IPEndpoint: make ::port robust for invalid addresses #87

Merged
merged 1 commit into from
Sep 10, 2023
Merged

IPEndpoint: make ::port robust for invalid addresses #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions code/include/swoc/IPEndpoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ union IPEndpoint {
/// Port in host horder.
in_port_t host_order_port() const;

/// Test for valid IP address from @a sockaddr.
static bool is_valid(sockaddr const *sa);

/// Port in network order from @a sockaddr.
static in_port_t &port(sockaddr *sa);

Expand Down Expand Up @@ -348,6 +351,11 @@ IPEndpoint::host_order_port() const {
return ntohs(this->network_order_port());
}

inline bool
IPEndpoint::is_valid(sockaddr const *sa) {
return sa && (sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
}

inline in_port_t &
IPEndpoint::port(sockaddr *sa) {
switch (sa->sa_family) {
Expand All @@ -362,12 +370,12 @@ IPEndpoint::port(sockaddr *sa) {

inline in_port_t
IPEndpoint::port(sockaddr const *sa) {
return self_type::port(const_cast<sockaddr *>(sa));
return self_type::is_valid(sa) ? self_type::port(const_cast<sockaddr *>(sa)) : 0;
}

inline in_port_t
IPEndpoint::host_order_port(sockaddr const *sa) {
return ntohs(self_type::port(sa));
return self_type::is_valid(sa) ? ntohs(self_type::port(sa)) : 0;
}

inline swoc::MemSpan<void const>
Expand Down