Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions ext/include/opentelemetry/ext/http/server/http_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,20 @@ 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::SocketAddr addr(0, port);
if (addr.port() == -1)
{
return -1;
}

SocketTools::Socket socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
socket.setNonBlocking();
socket.setReuseAddr();

SocketTools::SocketAddr addr(0, port);
socket.bind(addr);
socket.getsockname(addr);

Expand Down
3 changes: 2 additions & 1 deletion ext/include/opentelemetry/ext/http/server/socket_tools.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ struct SocketAddr
/// <returns>SocketAddr</returns>
SocketAddr() {}

SocketAddr(u_long addr, int port)
SocketAddr(u_long addr, u_int16_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));
Expand Down
7 changes: 7 additions & 0 deletions ext/test/http/socket_tools_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ TEST(SocketAddrTest, AcceptsLeadingZeroPort)
EXPECT_EQ(addr.port(), 80);
}

TEST(SocketAddrTest, RejectsOutOfRangeIntegerPorts)
{
ExpectInvalid(SocketTools::SocketAddr(0, -1));
ExpectInvalid(SocketTools::SocketAddr(0, 65536));
ExpectInvalid(SocketTools::SocketAddr(0, 99999));
}

TEST(SocketAddrTest, RejectsOutOfRangePort)
{
SocketTools::SocketAddr addr("127.0.0.1:99999");
Expand Down
Loading