Skip to content

Commit

Permalink
server: support dual-stack server socket (#450)
Browse files Browse the repository at this point in the history
According to RFC 3493 the socket option IPV6_V6ONLY
should be off by default, see
https://tools.ietf.org/html/rfc3493#page-22 (chapter 5.3).

However this does not seem to be the case on all systems.
For instance on any Windows OS, the option is on by default.

Therefore clear this option in order to allow
an server socket which can support IPv6 and IPv4 at the same time.
  • Loading branch information
ottigeda authored May 5, 2020
1 parent d45250f commit b2203bb
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 0 deletions.
5 changes: 5 additions & 0 deletions httplib.h
Original file line number Diff line number Diff line change
Expand Up @@ -1469,6 +1469,11 @@ socket_t create_socket(const char *host, int port, Fn fn,
int yes = 1;
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char *>(&yes),
sizeof(yes));

int no = 0;
setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<char *>(&no),
sizeof(no));

#ifdef SO_REUSEPORT
setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, reinterpret_cast<char *>(&yes),
sizeof(yes));
Expand Down
33 changes: 33 additions & 0 deletions test/test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,39 @@ TEST(RedirectToDifferentPort, Redirect) {
}
#endif

TEST(Server, BindDualStack) {
Server svr;

svr.Get("/1", [&](const Request & /*req*/, Response &res) {
res.set_content("Hello World!", "text/plain");
});

auto thread = std::thread([&]() { svr.listen("::", PORT); });

// Give GET time to get a few messages.
std::this_thread::sleep_for(std::chrono::seconds(1));

{
Client cli("127.0.0.1", PORT);

auto res = cli.Get("/1");
ASSERT_TRUE(res != nullptr);
EXPECT_EQ(200, res->status);
EXPECT_EQ(res->body, "Hello World!");
}
{
Client cli("::1", PORT);

auto res = cli.Get("/1");
ASSERT_TRUE(res != nullptr);
EXPECT_EQ(200, res->status);
EXPECT_EQ(res->body, "Hello World!");
}
svr.stop();
thread.join();
ASSERT_FALSE(svr.is_running());
}

TEST(Server, BindAndListenSeparately) {
Server svr;
int port = svr.bind_to_any_port("0.0.0.0");
Expand Down

0 comments on commit b2203bb

Please sign in to comment.