Skip to content

[CODE HEALTH] Use uint16_t for port numbers in ext/http/server #4500

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

Merged
marcalff merged 4 commits into from
Aug 31, 2026
+8 −8
Merged

[CODE HEALTH] Use uint16_t for port numbers in ext/http/server #4500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5dd0e1
[CODE HEALTH] Use uint16_t for port numbers in ext/http/server
marcalff Aug 29, 2026
c190646
Fix msvc warnings
marcalff Aug 29, 2026
551efa2
Merge branch 'main' into fix_port
marcalff Aug 30, 2026
5aafe79
Merge branch 'main' into fix_port
marcalff Aug 31, 2026
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
4 changes: 2 additions & 2 deletions ext/include/opentelemetry/ext/http/server/http_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback
m_maxRequestContentSize(2 * 1024 * 1024)
{}

HttpServer(const std::string &serverHost, int port = 30000) : HttpServer()
HttpServer(const std::string &serverHost, uint16_t port = 30000) : HttpServer()
{
std::ostringstream os;
os << serverHost << ":" << port;
Expand Down Expand Up @@ -202,7 +202,7 @@ class HttpServer : private SocketTools::Reactor::SocketCallback

void setServerName(std::string const &name) { m_serverHost = name; }

int addListeningPort(int port)
int addListeningPort(uint16_t port)
{
SocketTools::Socket socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
socket.setNonBlocking();
Expand Down
12 changes: 6 additions & 6 deletions ext/include/opentelemetry/ext/http/server/socket_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ struct SocketAddr
/// <returns>SocketAddr</returns>
SocketAddr() {}

SocketAddr(u_long addr, int port)
SocketAddr(u_long addr, uint16_t port)
{
sockaddr_in &inet4 = reinterpret_cast<sockaddr_in &>(m_data);
inet4.sin_family = AF_INET;
inet4.sin_port = htons(static_cast<uint16_t>(port));
inet4.sin_port = htons(port);
inet4.sin_addr.s_addr = htonl(addr);
}

Expand Down Expand Up @@ -223,8 +223,8 @@ struct SocketAddr
// accept a leading sign or whitespace and depend on the locale.
if (ok && colon)
{
char const *p = colon + 1;
unsigned int port = 0;
char const *p = colon + 1;
uint16_t port = 0;
if (*p == '\0')
{
ok = false; // empty port, e.g. "127.0.0.1:"
Expand All @@ -236,7 +236,7 @@ struct SocketAddr
ok = false;
break;
}
unsigned int const digit = static_cast<unsigned int>(*p - '0');
const uint16_t digit = static_cast<uint16_t>(*p - '0');
if (port > (65535u - digit) / 10u)
{
ok = false; // would exceed 65535
Expand All @@ -247,7 +247,7 @@ struct SocketAddr
}
if (ok)
{
parsed.sin_port = htons(static_cast<uint16_t>(port));
parsed.sin_port = htons(port);
}
}

Expand Down
Loading